[dataprovider] Renaming parameter keys to be more consistent Renaming follow the TSP definition for keys Change-Id: Ia44b514b8c2e811864497b2476841e45e2efff41 Signed-off-by: Simon Delisle <simon.delisle@ericsson.com> Reviewed-on: https://git.eclipse.org/r/143076 Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Tested-by: CI Bot
diff --git a/analysis/org.eclipse.tracecompass.analysis.counters.core/src/org/eclipse/tracecompass/internal/analysis/counters/core/CounterDataProvider.java b/analysis/org.eclipse.tracecompass.analysis.counters.core/src/org/eclipse/tracecompass/internal/analysis/counters/core/CounterDataProvider.java index 2ae9453..dba882a 100644 --- a/analysis/org.eclipse.tracecompass.analysis.counters.core/src/org/eclipse/tracecompass/internal/analysis/counters/core/CounterDataProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.counters.core/src/org/eclipse/tracecompass/internal/analysis/counters/core/CounterDataProvider.java
@@ -61,7 +61,7 @@ /** * Cumulative key to extract isCumulative from parameters map */ - public static final String CUMULATIVE_PARAMETER_KEY = "isCumulative"; //$NON-NLS-1$ + public static final String CUMULATIVE_COUNTER_KEY = "isCumulative"; //$NON-NLS-1$ /** * Chart's title @@ -193,7 +193,7 @@ return null; } - Boolean isCumulativeParameter = DataProviderParameterUtils.extractBoolean(parameters, CUMULATIVE_PARAMETER_KEY); + Boolean isCumulativeParameter = DataProviderParameterUtils.extractBoolean(parameters, CUMULATIVE_COUNTER_KEY); // If the cumulative parameter is not present in the parameters use // "false" as default value boolean isCumulative = isCumulativeParameter != null && isCumulativeParameter;
diff --git a/analysis/org.eclipse.tracecompass.analysis.counters.ui/src/org/eclipse/tracecompass/analysis/counters/ui/CounterChartViewer.java b/analysis/org.eclipse.tracecompass.analysis.counters.ui/src/org/eclipse/tracecompass/analysis/counters/ui/CounterChartViewer.java index ffb94a7..c7dc0f3 100644 --- a/analysis/org.eclipse.tracecompass.analysis.counters.ui/src/org/eclipse/tracecompass/analysis/counters/ui/CounterChartViewer.java +++ b/analysis/org.eclipse.tracecompass.analysis.counters.ui/src/org/eclipse/tracecompass/analysis/counters/ui/CounterChartViewer.java
@@ -62,7 +62,7 @@ @Override protected @NonNull Map<String, Object> createQueryParameters(long start, long end, int nb) { Map<@NonNull String, @NonNull Object> parameters = FetchParametersUtils.selectionTimeQueryToMap(new SelectionTimeQueryFilter(start, end, nb, getSelected())); - parameters.put(CounterDataProvider.CUMULATIVE_PARAMETER_KEY, fIsCumulative); + parameters.put(CounterDataProvider.CUMULATIVE_COUNTER_KEY, fIsCumulative); return parameters; } }
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/cpuusage/CpuUsageDataProviderTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/cpuusage/CpuUsageDataProviderTest.java index 67cd549..92d5873 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/cpuusage/CpuUsageDataProviderTest.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/cpuusage/CpuUsageDataProviderTest.java
@@ -140,8 +140,8 @@ /* This range should query the total range */ TimeQueryFilter filter = new SelectedCpuQueryFilter(0L, 30L, 2, Collections.emptyList(), Collections.emptySet()); @NonNull Map<@NonNull String, @NonNull Object> parameters = new HashMap<>(); - parameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, getTimeRequested(filter)); - parameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, Collections.emptyList()); + parameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, getTimeRequested(filter)); + parameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, Collections.emptyList()); parameters.put("cpus", Collections.emptySet()); TmfModelResponse<@NonNull TmfTreeModel<@NonNull CpuUsageEntryModel>> response = dataProvider.fetchTree(parameters, monitor); @@ -160,7 +160,7 @@ /* Verify a range when a process runs at the start */ filter = new SelectedCpuQueryFilter(22L, 25L, 2, Collections.emptyList(), Collections.emptySet()); - parameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, getTimeRequested(filter)); + parameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, getTimeRequested(filter)); response = dataProvider.fetchTree(parameters, monitor); assertTrue(response.getStatus() == Status.COMPLETED); @@ -175,7 +175,7 @@ /* Verify a range when a process runs at the end */ filter = new SelectedCpuQueryFilter(1L, 4L, 2, Collections.emptyList(), Collections.emptySet()); - parameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, getTimeRequested(filter)); + parameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, getTimeRequested(filter)); response = dataProvider.fetchTree(parameters, monitor); assertTrue(response.getStatus() == Status.COMPLETED); @@ -191,7 +191,7 @@ /* Verify a range when a process runs at start and at the end */ filter = new SelectedCpuQueryFilter(4L, 13L, 2, Collections.emptyList(), Collections.emptySet()); - parameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, getTimeRequested(filter)); + parameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, getTimeRequested(filter)); response = dataProvider.fetchTree(parameters, monitor); assertTrue(response.getStatus() == Status.COMPLETED);
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/stubs/org/eclipse/tracecompass/analysis/os/linux/core/tests/stubs/inputoutput/IoTestCase.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/stubs/org/eclipse/tracecompass/analysis/os/linux/core/tests/stubs/inputoutput/IoTestCase.java index 8506906..2ed8604 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/stubs/org/eclipse/tracecompass/analysis/os/linux/core/tests/stubs/inputoutput/IoTestCase.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/stubs/org/eclipse/tracecompass/analysis/os/linux/core/tests/stubs/inputoutput/IoTestCase.java
@@ -195,7 +195,7 @@ public Map<String, Object> getTimeQuery() { TimeQueryFilter filter = new TimeQueryFilter(fStartTime, fEndTime, fResolution); Map<String, Object> parameters = new HashMap<>(); - parameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, getTimeRequested(filter)); + parameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, getTimeRequested(filter)); return parameters; } @@ -233,7 +233,7 @@ throw new NoSuchElementException("Requested entry not found for " + fDiskName + ' ' + fType); } Map<String, Object> parameters = getTimeQuery(); - parameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, Collections.singletonList(selectionId)); + parameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, Collections.singletonList(selectionId)); return parameters; }
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/cpuusage/CpuUsageDataProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/cpuusage/CpuUsageDataProvider.java index 5e12078..869d657 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/cpuusage/CpuUsageDataProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/cpuusage/CpuUsageDataProvider.java
@@ -68,7 +68,7 @@ /** * Parameter key to extract cpus from the parameters map */ - public static final String CPUS_PARAMETER_KEY = "cpus"; //$NON-NLS-1$ + public static final String REQUESTED_CPUS_KEY = "requested_cpus"; //$NON-NLS-1$ /** * The Fake Tid to identify the total entry. @@ -273,7 +273,7 @@ } private static Set<Integer> extractCpuSet(Map<String, Object> parameters) { - Object cpus = parameters.get(CPUS_PARAMETER_KEY); + Object cpus = parameters.get(REQUESTED_CPUS_KEY); if (cpus instanceof Collection<?>) { return ((Collection<?>) cpus).stream().filter(cpu -> cpu instanceof Integer) .map(cpu -> (Integer) cpu)
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java index 4c7a90a..0221a0e 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java
@@ -93,7 +93,7 @@ * Parameter key used when the thread tree should be filtered by active * thread */ - public static final @NonNull String ACTIVE_THREAD_FILTER_KEY = "active_thread_filter_key"; //$NON-NLS-1$ + public static final @NonNull String ACTIVE_THREAD_FILTER_KEY = "active_thread_filter"; //$NON-NLS-1$ private static final String WILDCARD = "*"; //$NON-NLS-1$ private static final Set<Integer> ACTIVE_STATES = ImmutableSet.of(StateValues.PROCESS_STATUS_RUN_USERMODE,
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageTreeViewer.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageTreeViewer.java index 3b30389..5968f76 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageTreeViewer.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageTreeViewer.java
@@ -140,7 +140,7 @@ } Map<@NonNull String, @NonNull Object> parameters = FetchParametersUtils.selectionTimeQueryToMap(new SelectionTimeQueryFilter(start, end, 2, Collections.emptyList())); - parameters.put(CpuUsageDataProvider.CPUS_PARAMETER_KEY, CpuUsageView.getCpus(getTrace())); + parameters.put(CpuUsageDataProvider.REQUESTED_CPUS_KEY, CpuUsageView.getCpus(getTrace())); return parameters; }
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageXYViewer.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageXYViewer.java index 23b4f6b..f6e6bbe 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageXYViewer.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageXYViewer.java
@@ -62,7 +62,7 @@ @Override protected @NonNull Map<String, Object> createQueryParameters(long start, long end, int nb) { Map<@NonNull String, @NonNull Object> parameters = FetchParametersUtils.selectionTimeQueryToMap(new SelectionTimeQueryFilter(start, end, nb, getSelected())); - parameters.put(CpuUsageDataProvider.CPUS_PARAMETER_KEY, CpuUsageView.getCpus(getTrace())); + parameters.put(CpuUsageDataProvider.REQUESTED_CPUS_KEY, CpuUsageView.getCpus(getTrace())); return parameters; }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/analysis/cpu/CPUAnalysisBenchmark.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/analysis/cpu/CPUAnalysisBenchmark.java index 75152af..fa6b70d 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/analysis/cpu/CPUAnalysisBenchmark.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/analysis/cpu/CPUAnalysisBenchmark.java
@@ -204,8 +204,8 @@ TimeQueryFilter filter = new SelectedCpuQueryFilter(startTime, endTime, 2, Collections.emptyList(), Collections.emptySet()); @NonNull Map<@NonNull String, @NonNull Object> parameters = new HashMap<>(); - parameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, getTimeRequested(filter)); - parameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, Collections.emptyList()); + parameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, getTimeRequested(filter)); + parameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, Collections.emptyList()); parameters.put("cpus", Collections.emptySet()); TmfModelResponse<@NonNull TmfTreeModel<@NonNull CpuUsageEntryModel>> response = dataProvider.fetchTree(parameters, NULL_MONITOR); TmfTreeModel<@NonNull CpuUsageEntryModel> model = response.getModel(); @@ -223,8 +223,8 @@ // Get the usage for all threads filter = new SelectedCpuQueryFilter(startTime, endTime, resolution, selected, Collections.emptySet()); parameters = new HashMap<>(); - parameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, getTimeRequested(filter)); - parameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, selected); + parameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, getTimeRequested(filter)); + parameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, selected); parameters.put("cpus", Collections.emptySet()); TmfModelResponse<@NonNull ITmfXyModel> fetchXY = dataProvider.fetchXY(parameters, NULL_MONITOR); ITmfXyModel model2 = fetchXY.getModel();
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/DataProviderParameterTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/DataProviderParameterTest.java index f7b6230..d260328 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/DataProviderParameterTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/DataProviderParameterTest.java
@@ -47,8 +47,8 @@ */ @BeforeClass public static void setUp() { - fParameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, Collections.emptyList()); - fParameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, Collections.emptyList()); + fParameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, Collections.emptyList()); + fParameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, Collections.emptyList()); } /** @@ -57,22 +57,22 @@ */ @Test public void testExtractTimeRequested() { - fParameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, fLongList); + fParameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, fLongList); List<@NonNull Long> timeRequested = DataProviderParameterUtils.extractTimeRequested(fParameters); assertNotNull(timeRequested); testLongList(timeRequested); - fParameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, fIntList); + fParameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, fIntList); timeRequested = DataProviderParameterUtils.extractTimeRequested(fParameters); assertNotNull(timeRequested); testLongList(timeRequested); - fParameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, fMixedList); + fParameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, fMixedList); timeRequested = DataProviderParameterUtils.extractTimeRequested(fParameters); assertNotNull(timeRequested); testLongList(timeRequested); - fParameters.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, fWrongParameter); + fParameters.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, fWrongParameter); timeRequested = DataProviderParameterUtils.extractTimeRequested(fParameters); assertNull(timeRequested); } @@ -83,22 +83,22 @@ */ @Test public void testExtractSelectedItems() { - fParameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, fLongList); + fParameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, fLongList); List<@NonNull Long> items = DataProviderParameterUtils.extractSelectedItems(fParameters); assertNotNull(items); testLongList(items); - fParameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, fIntList); + fParameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, fIntList); items = DataProviderParameterUtils.extractSelectedItems(fParameters); assertNotNull(items); testLongList(items); - fParameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, fMixedList); + fParameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, fMixedList); items = DataProviderParameterUtils.extractSelectedItems(fParameters); assertNotNull(items); testLongList(items); - fParameters.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, fWrongParameter); + fParameters.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, fWrongParameter); items = DataProviderParameterUtils.extractSelectedItems(fParameters); assertNull(items); }
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/FetchParametersTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/FetchParametersTest.java index 1590d98..b5c5660 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/FetchParametersTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/dataprovider/FetchParametersTest.java
@@ -53,14 +53,14 @@ */ @BeforeClass public static void setUp() { - fExpectedTimeQueryMap.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, fTimeList); + fExpectedTimeQueryMap.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, fTimeList); - fExpectedSelectionTimeQueryMap.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, fTimeList); - fExpectedSelectionTimeQueryMap.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, fItemList); + fExpectedSelectionTimeQueryMap.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, fTimeList); + fExpectedSelectionTimeQueryMap.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, fItemList); - fExpectedVirtualTableQueryMap.put(DataProviderParameterUtils.COLUMN_ID_KEY, fItemList); - fExpectedVirtualTableQueryMap.put(DataProviderParameterUtils.TABLE_INDEX, TABLE_INDEX); - fExpectedVirtualTableQueryMap.put(DataProviderParameterUtils.TABLE_COUNT, TABLE_COUNT); + fExpectedVirtualTableQueryMap.put(DataProviderParameterUtils.REQUESTED_COLUMN_IDS_KEY, fItemList); + fExpectedVirtualTableQueryMap.put(DataProviderParameterUtils.REQUESTED_TABLE_INDEX_KEY, TABLE_INDEX); + fExpectedVirtualTableQueryMap.put(DataProviderParameterUtils.REQUESTED_TABLE_COUNT_KEY, TABLE_COUNT); } /** @@ -107,9 +107,9 @@ Map<String, Object> virtualTableQueryMap = FetchParametersUtils.virtualTableQueryToMap(fExpectedVirtualTableQuery); assertFalse(virtualTableQueryMap.isEmpty()); - assertEquals(fExpectedVirtualTableQueryMap.get(DataProviderParameterUtils.COLUMN_ID_KEY), virtualTableQueryMap.get(DataProviderParameterUtils.COLUMN_ID_KEY)); - assertEquals(fExpectedVirtualTableQueryMap.get(DataProviderParameterUtils.TABLE_INDEX), virtualTableQueryMap.get(DataProviderParameterUtils.TABLE_INDEX)); - assertEquals(fExpectedVirtualTableQueryMap.get(DataProviderParameterUtils.TABLE_COUNT), virtualTableQueryMap.get(DataProviderParameterUtils.TABLE_COUNT)); + assertEquals(fExpectedVirtualTableQueryMap.get(DataProviderParameterUtils.REQUESTED_COLUMN_IDS_KEY), virtualTableQueryMap.get(DataProviderParameterUtils.REQUESTED_COLUMN_IDS_KEY)); + assertEquals(fExpectedVirtualTableQueryMap.get(DataProviderParameterUtils.REQUESTED_TABLE_INDEX_KEY), virtualTableQueryMap.get(DataProviderParameterUtils.REQUESTED_TABLE_INDEX_KEY)); + assertEquals(fExpectedVirtualTableQueryMap.get(DataProviderParameterUtils.REQUESTED_TABLE_COUNT_KEY), virtualTableQueryMap.get(DataProviderParameterUtils.REQUESTED_TABLE_COUNT_KEY)); } }
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTableDataProviderTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTableDataProviderTest.java index d0ee682..ec1eb7e 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTableDataProviderTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTableDataProviderTest.java
@@ -255,7 +255,7 @@ TmfEventTableFilterModel filterModel = new TmfEventTableFilterModel(tableFilter, null, false); VirtualTableQueryFilter queryFilter = new EventTableQueryFilter(Arrays.asList(eventTypeColumnId, timestampColumnId), 0, 5, filterModel); Map<String, Object> parameters = FetchParametersUtils.virtualTableQueryToMap(queryFilter); - parameters.put("tableFilters", filterModel); + parameters.put(TmfEventTableDataProvider.TABLE_FILTERS_KEY, filterModel); List<Long> expectedColumnsId = Arrays.asList(eventTypeColumnId, timestampColumnId); TmfTimestampFormat.getDefaulTimeFormat().format(TmfTimestamp.fromMillis(2).toNanos()); @@ -290,7 +290,7 @@ TmfEventTableFilterModel filterModel = new TmfEventTableFilterModel(tableFilter, null, false); VirtualTableQueryFilter queryFilter = new EventTableQueryFilter(Arrays.asList(1L, 0L), 0, 5, filterModel); Map<String, Object> parameters = FetchParametersUtils.virtualTableQueryToMap(queryFilter); - parameters.put("tableFilters", filterModel); + parameters.put(TmfEventTableDataProvider.TABLE_FILTERS_KEY, filterModel); List<Long> expectedColumnsId = Arrays.asList(eventTypeColumnId, timestampColumnId); List<EventTableLine> expectedData = Arrays.asList(
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/events/TmfEventTableDataProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/events/TmfEventTableDataProvider.java index 5a9aef2..31f9838 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/events/TmfEventTableDataProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/events/TmfEventTableDataProvider.java
@@ -67,9 +67,15 @@ */ public class TmfEventTableDataProvider extends AbstractTmfTraceDataProvider implements ITmfVirtualTableDataProvider<TmfEventTableColumnDataModel, EventTableLine> { - private static final String TABLE_SEARCH_FILTERS_PARAMETER_KEY = "tableSearchFilters"; //$NON-NLS-1$ + /** + * Key for table search + */ + public static final String TABLE_SEARCH_KEY = "table_search"; //$NON-NLS-1$ - private static final String TABLE_FILTERS_PARAMETER_KEY = "tableFilters"; //$NON-NLS-1$ + /** + * Key for table filters + */ + public static final String TABLE_FILTERS_KEY = "table_filters"; //$NON-NLS-1$ /** * Extension point ID. @@ -471,7 +477,7 @@ } private static @Nullable ITmfFilter extractFilter(Map<String, Object> fetchParameters) { - Object filtersObject = fetchParameters.get(TABLE_FILTERS_PARAMETER_KEY); + Object filtersObject = fetchParameters.get(TABLE_FILTERS_KEY); if (filtersObject instanceof ITmfFilterModel) { ITmfFilterModel filters = (ITmfFilterModel) filtersObject; Map<Long, String> filterMap = filters.getTableFilter(); @@ -514,7 +520,7 @@ } private static @Nullable ITmfFilter extractSearchFilter(Map<String, Object> fetchParameters) { - Object searchFilterObject = fetchParameters.get(TABLE_SEARCH_FILTERS_PARAMETER_KEY); + Object searchFilterObject = fetchParameters.get(TABLE_SEARCH_KEY); if (searchFilterObject instanceof Map<?, ?>) { Map<Long, String> searchMap = (Map<Long, String>) searchFilterObject; if (searchMap.isEmpty()) { @@ -537,7 +543,7 @@ } private static @Nullable TmfCollapseFilter extractCollapseFilter(Map<String, Object> fetchParameters) { - Object filtersObject = fetchParameters.get(TABLE_FILTERS_PARAMETER_KEY); + Object filtersObject = fetchParameters.get(TABLE_FILTERS_KEY); if (filtersObject instanceof ITmfFilterModel) { ITmfFilterModel filters = (ITmfFilterModel) filtersObject; if (filters.isCollapseFilter()) {
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/model/filters/FetchParametersUtils.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/model/filters/FetchParametersUtils.java index f21b418..ac39a08 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/model/filters/FetchParametersUtils.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/model/filters/FetchParametersUtils.java
@@ -67,19 +67,19 @@ * @return A {@link VirtualTableQueryFilter} or null if the parameters are invalid */ public static @Nullable VirtualTableQueryFilter createVirtualTableQueryFilter(Map<String, Object> parameters) { - List<Long> columnRequested = DataProviderParameterUtils.extractLongList(parameters, DataProviderParameterUtils.COLUMN_ID_KEY); + List<Long> columnRequested = DataProviderParameterUtils.extractLongList(parameters, DataProviderParameterUtils.REQUESTED_COLUMN_IDS_KEY); if(columnRequested == null) { return null; } - Object indexObject = parameters.get(DataProviderParameterUtils.TABLE_INDEX); + Object indexObject = parameters.get(DataProviderParameterUtils.REQUESTED_TABLE_INDEX_KEY); if (!(indexObject instanceof Long) && !(indexObject instanceof Integer)) { return null; } long index = indexObject instanceof Long ? (long) indexObject : ((Integer) indexObject).longValue(); - Object countObject = parameters.get(DataProviderParameterUtils.TABLE_COUNT); + Object countObject = parameters.get(DataProviderParameterUtils.REQUESTED_TABLE_COUNT_KEY); if (!(countObject instanceof Integer)) { return null; } @@ -101,7 +101,7 @@ for (long time : timesRequested) { longList.add(time); } - map.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, longList); + map.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, longList); return map; } @@ -120,8 +120,8 @@ for (long time : timesRequested) { longList.add(time); } - map.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, longList); - map.put(DataProviderParameterUtils.SELECTED_ITEMS_KEY, selectedItems); + map.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, longList); + map.put(DataProviderParameterUtils.REQUESTED_ITEMS_KEY, selectedItems); return map; } @@ -137,9 +137,9 @@ List<Long> columnsId = queryFilter.getColumnsId(); long index = queryFilter.getIndex(); int count = queryFilter.getCount(); - map.put(DataProviderParameterUtils.COLUMN_ID_KEY, columnsId); - map.put(DataProviderParameterUtils.TABLE_INDEX, index); - map.put(DataProviderParameterUtils.TABLE_COUNT, count); + map.put(DataProviderParameterUtils.REQUESTED_COLUMN_IDS_KEY, columnsId); + map.put(DataProviderParameterUtils.REQUESTED_TABLE_INDEX_KEY, index); + map.put(DataProviderParameterUtils.REQUESTED_TABLE_COUNT_KEY, count); return map; } @@ -158,8 +158,8 @@ for (long time : timesRequested) { longList.add(time); } - map.put(DataProviderParameterUtils.TIME_REQUESTED_KEY, longList); - map.put(DataProviderParameterUtils.FILTERED_PARAMETER_KEY, filtered); + map.put(DataProviderParameterUtils.REQUESTED_TIME_KEY, longList); + map.put(DataProviderParameterUtils.FILTERED_KEY, filtered); return map; } }
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/dataprovider/DataProviderParameterUtils.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/dataprovider/DataProviderParameterUtils.java index b06f3b8..8021bc2 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/dataprovider/DataProviderParameterUtils.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/dataprovider/DataProviderParameterUtils.java
@@ -35,37 +35,37 @@ /** * Time requested key */ - public static final String TIME_REQUESTED_KEY = "timeRequested"; //$NON-NLS-1$ + public static final String REQUESTED_TIME_KEY = "requested_times"; //$NON-NLS-1$ /** * Selected items key */ - public static final String SELECTED_ITEMS_KEY = "items"; //$NON-NLS-1$ - - /** - * Key to extract isFiltered from parameters map - */ - public static final String FILTERED_PARAMETER_KEY = "isFiltered"; //$NON-NLS-1$ + public static final String REQUESTED_ITEMS_KEY = "requested_items"; //$NON-NLS-1$ /** * Virtual table count key */ - public static final String TABLE_COUNT = "count"; //$NON-NLS-1$ + public static final String REQUESTED_TABLE_COUNT_KEY = "requested_table_count"; //$NON-NLS-1$ /** * Virtual table starting index key */ - public static final String TABLE_INDEX = "index"; //$NON-NLS-1$ + public static final String REQUESTED_TABLE_INDEX_KEY = "requested_table_index"; //$NON-NLS-1$ /** * Table column IDs key */ - public static final String COLUMN_ID_KEY = "columnId"; //$NON-NLS-1$ + public static final String REQUESTED_COLUMN_IDS_KEY = "requested_table_column_ids"; //$NON-NLS-1$ + + /** + * Key to extract isFiltered from parameters map + */ + public static final String FILTERED_KEY = "isFiltered"; //$NON-NLS-1$ /** * Regex filter key */ - public static final String REGEX_FILTER_KEY = "regexFilter"; //$NON-NLS-1$ + public static final String REGEX_MAP_FILTERS_KEY = "regex_map_filters"; //$NON-NLS-1$ private DataProviderParameterUtils() { // Private constructor @@ -113,7 +113,7 @@ * @return List of times or null if no time requested in the map */ public static @Nullable List<Long> extractTimeRequested(Map<String, Object> parameters) { - return extractLongList(parameters, TIME_REQUESTED_KEY); + return extractLongList(parameters, REQUESTED_TIME_KEY); } /** @@ -124,7 +124,7 @@ * @return List of selected items or null if no selected items in the map */ public static @Nullable List<Long> extractSelectedItems(Map<String, Object> parameters) { - return extractLongList(parameters, SELECTED_ITEMS_KEY); + return extractLongList(parameters, REQUESTED_ITEMS_KEY); } /** @@ -136,7 +136,7 @@ * parameter */ public static @Nullable Boolean extractIsFiltered(Map<String, Object> parameters) { - return extractBoolean(parameters, FILTERED_PARAMETER_KEY); + return extractBoolean(parameters, FILTERED_KEY); } /** @@ -148,7 +148,7 @@ * of parameters */ public static @Nullable Multimap<Integer, String> extractRegexFilter(Map<String, Object> parameters) { - Object regexesObject = parameters.get(REGEX_FILTER_KEY); + Object regexesObject = parameters.get(REGEX_MAP_FILTERS_KEY); if (!(regexesObject instanceof Map<?, ?>)) { return null; }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXAxisChartViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXAxisChartViewer.java index e790936..fd247c0 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXAxisChartViewer.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXAxisChartViewer.java
@@ -235,7 +235,7 @@ Map<@NonNull String, @NonNull Object> parameters = FetchParametersUtils.timeQueryToMap(new TimeQueryFilter(start, end, nb)); Multimap<@NonNull Integer, @NonNull String> regexesMap = getRegexes(); if (!regexesMap.isEmpty()) { - parameters.put(DataProviderParameterUtils.REGEX_FILTER_KEY, regexesMap.asMap()); + parameters.put(DataProviderParameterUtils.REGEX_MAP_FILTERS_KEY, regexesMap.asMap()); } return parameters; }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfFilteredXYChartViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfFilteredXYChartViewer.java index 57c1aea..19a29ee 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfFilteredXYChartViewer.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfFilteredXYChartViewer.java
@@ -117,7 +117,7 @@ Map<@NonNull String, @NonNull Object> parameters = FetchParametersUtils.selectionTimeQueryToMap(new SelectionTimeQueryFilter(start, end, nb, fSelectedIds)); Multimap<@NonNull Integer, @NonNull String> regexesMap = getRegexes(); if (!regexesMap.isEmpty()) { - parameters.put(DataProviderParameterUtils.REGEX_FILTER_KEY, regexesMap.asMap()); + parameters.put(DataProviderParameterUtils.REGEX_MAP_FILTERS_KEY, regexesMap.asMap()); } return parameters; }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java index d409a44..c5177ea 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java
@@ -291,7 +291,7 @@ Map<@NonNull String, @NonNull Object> parameters = FetchParametersUtils.selectionTimeQueryToMap(filter); Multimap<@NonNull Integer, @NonNull String> regexesMap = getRegexes(); if (!regexesMap.isEmpty()) { - parameters.put(DataProviderParameterUtils.REGEX_FILTER_KEY, regexesMap.asMap()); + parameters.put(DataProviderParameterUtils.REGEX_MAP_FILTERS_KEY, regexesMap.asMap()); } TmfModelResponse<TimeGraphModel> response = dataProvider.fetchRowModel(parameters, monitor);