tmf: use 'isFiltered' instead of 'table_search_index' in event table DP
It fits the use case and less fetch parameters to maintain.
[Changed] 'table_search_index' to 'isFiltered' in event table DP
Change-Id: I31f00cf72aecb6f5de6d54aa672aba87768633f0
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/181841
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
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 cade60f..5999606 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
@@ -36,6 +36,7 @@
import org.eclipse.tracecompass.internal.provisional.tmf.core.model.table.TmfVirtualTableModel;
import org.eclipse.tracecompass.internal.provisional.tmf.core.model.table.VirtualTableCell;
import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils;
+import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils;
import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException;
import org.eclipse.tracecompass.tmf.core.model.CoreFilterProperty;
import org.eclipse.tracecompass.tmf.core.model.filters.TimeQueryFilter;
@@ -339,7 +340,7 @@
searchExpressions.put(eventTypeColumnId, "Type-2");
parameters.put(TmfEventTableDataProvider.TABLE_SEARCH_EXPRESSION_KEY, searchExpressions);
- parameters.put(TmfEventTableDataProvider.TABLE_SEARCH_INDEX_KEY, true);
+ parameters.put(DataProviderParameterUtils.FILTERED_KEY, true);
List<Long> expectedColumnsId = Arrays.asList(eventTypeColumnId, timestampColumnId);
TmfTimestampFormat.getDefaulTimeFormat().format(TmfTimestamp.fromMillis(2).toNanos());
@@ -395,7 +396,7 @@
searchExpressions.put(timestampColumnId, "\\d*4\\d*s*");
parameters.put(TmfEventTableDataProvider.TABLE_SEARCH_EXPRESSION_KEY, searchExpressions);
- parameters.put(TmfEventTableDataProvider.TABLE_SEARCH_INDEX_KEY, true);
+ parameters.put(DataProviderParameterUtils.FILTERED_KEY, true);
List<Long> expectedColumnsId = new ArrayList<>(fColumns.values());
TmfTimestampFormat.getDefaulTimeFormat().format(TmfTimestamp.fromMillis(2).toNanos());
@@ -450,7 +451,7 @@
searchExpressions.put(eventTypeColumnId, "\""+EVENT_TYPE_COLUMN_NAME+"\"" + " matches " + "Type-2");
parameters.put(TmfEventTableDataProvider.TABLE_SEARCH_COMPLEX_EXPRESSION_KEY, searchExpressions);
- parameters.put(TmfEventTableDataProvider.TABLE_SEARCH_INDEX_KEY, true);
+ parameters.put(DataProviderParameterUtils.FILTERED_KEY, true);
List<Long> expectedColumnsId = Arrays.asList(eventTypeColumnId, timestampColumnId);
TmfTimestampFormat.getDefaulTimeFormat().format(TmfTimestamp.fromMillis(2).toNanos());
@@ -506,7 +507,7 @@
searchExpressions.put(timestampColumnId, "\""+TIMESTAMP_COLUMN_NAME+"\"" + " contains " + "4");
parameters.put(TmfEventTableDataProvider.TABLE_SEARCH_COMPLEX_EXPRESSION_KEY, searchExpressions);
- parameters.put(TmfEventTableDataProvider.TABLE_SEARCH_INDEX_KEY, true);
+ parameters.put(DataProviderParameterUtils.FILTERED_KEY, true);
List<Long> expectedColumnsId = new ArrayList<>(fColumns.values());
TmfTimestampFormat.getDefaulTimeFormat().format(TmfTimestamp.fromMillis(2).toNanos());
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 059e3eb..4c9494f 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
@@ -81,10 +81,6 @@
* Key for table search simple filter expressions (regex only)
*/
public static final String TABLE_SEARCH_EXPRESSION_KEY = "table_search_simple_expressions"; //$NON-NLS-1$
- /**
- * Key for table search to get index of search
- */
- public static final String TABLE_SEARCH_INDEX_KEY = "table_search_index"; //$NON-NLS-1$
/**
* Key for table filters
@@ -190,11 +186,8 @@
@Nullable TmfCollapseFilter collapseFilter = extractCollapseFilter(fetchParameters);
Map<Long, ITmfEventAspect<?>> aspects = getAspectsFromColumnsId(queryFilter.getColumnsId());
- Object isIndexRequestObj = fetchParameters.get(TABLE_SEARCH_INDEX_KEY);
- boolean isIndexRequest = false;
- if (isIndexRequestObj instanceof Boolean) {
- isIndexRequest = (Boolean) isIndexRequestObj;
- }
+ Boolean isFiltered = DataProviderParameterUtils.extractIsFiltered(fetchParameters);
+ boolean isIndexRequest = isFiltered != null && isFiltered;
if (aspects.isEmpty()) {
return new TmfModelResponse<>(new TmfVirtualTableModel<EventTableLine>(Collections.emptyList(), Collections.emptyList(), queryFilter.getIndex(), 0), ITmfResponse.Status.COMPLETED, CommonStatusMessage.COMPLETED);
