You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by si...@apache.org on 2022/04/13 15:38:02 UTC
[pinot] branch master updated: remove redundant operator names (#8528)
This is an automated email from the ASF dual-hosted git repository.
siddteotia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e594388c20 remove redundant operator names (#8528)
e594388c20 is described below
commit e594388c20823d3b02efbec878855b8b2dfe9d51
Author: Richard Startin <ri...@startree.ai>
AuthorDate: Wed Apr 13 16:37:55 2022 +0100
remove redundant operator names (#8528)
---
.../src/main/java/org/apache/pinot/core/common/Operator.java | 7 -------
.../pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java | 5 -----
.../org/apache/pinot/core/operator/BitmapDocIdSetOperator.java | 6 +-----
.../main/java/org/apache/pinot/core/operator/DocIdSetOperator.java | 5 -----
.../org/apache/pinot/core/operator/InstanceResponseOperator.java | 6 +-----
.../java/org/apache/pinot/core/operator/ProjectionOperator.java | 6 +-----
.../pinot/core/operator/StreamingInstanceResponseOperator.java | 2 +-
.../core/operator/combine/AggregationOnlyCombineOperator.java | 6 ------
.../pinot/core/operator/combine/DistinctCombineOperator.java | 5 -----
.../apache/pinot/core/operator/combine/GroupByCombineOperator.java | 5 -----
.../pinot/core/operator/combine/GroupByOrderByCombineOperator.java | 6 +-----
.../combine/MinMaxValueBasedSelectionOrderByCombineOperator.java | 6 +-----
.../pinot/core/operator/combine/SelectionOnlyCombineOperator.java | 6 +-----
.../core/operator/combine/SelectionOrderByCombineOperator.java | 6 +-----
.../core/operator/dociditerators/ExpressionScanDocIdIterator.java | 6 ------
.../org/apache/pinot/core/operator/filter/AndFilterOperator.java | 5 -----
.../pinot/core/operator/filter/BitmapBasedFilterOperator.java | 5 -----
.../apache/pinot/core/operator/filter/CombinedFilterOperator.java | 6 ------
.../org/apache/pinot/core/operator/filter/EmptyFilterOperator.java | 6 +-----
.../pinot/core/operator/filter/ExpressionFilterOperator.java | 5 -----
.../apache/pinot/core/operator/filter/H3IndexFilterOperator.java | 6 +-----
.../apache/pinot/core/operator/filter/JsonMatchFilterOperator.java | 6 ------
.../apache/pinot/core/operator/filter/MatchAllFilterOperator.java | 5 -----
.../org/apache/pinot/core/operator/filter/NotFilterOperator.java | 6 +-----
.../org/apache/pinot/core/operator/filter/OrFilterOperator.java | 6 +-----
.../pinot/core/operator/filter/RangeIndexBasedFilterOperator.java | 6 +-----
.../apache/pinot/core/operator/filter/ScanBasedFilterOperator.java | 5 -----
.../pinot/core/operator/filter/SortedIndexBasedFilterOperator.java | 5 -----
.../apache/pinot/core/operator/filter/TextMatchFilterOperator.java | 6 +-----
.../pinot/core/operator/query/AggregationGroupByOperator.java | 6 ------
.../core/operator/query/AggregationGroupByOrderByOperator.java | 6 ------
.../org/apache/pinot/core/operator/query/AggregationOperator.java | 6 ------
.../pinot/core/operator/query/DictionaryBasedDistinctOperator.java | 5 -----
.../org/apache/pinot/core/operator/query/DistinctOperator.java | 5 -----
.../apache/pinot/core/operator/query/EmptySelectionOperator.java | 6 +-----
.../pinot/core/operator/query/FastFilteredCountOperator.java | 5 -----
.../pinot/core/operator/query/FilteredAggregationOperator.java | 6 +-----
.../pinot/core/operator/query/NonScanBasedAggregationOperator.java | 6 +-----
.../apache/pinot/core/operator/query/SelectionOnlyOperator.java | 6 +-----
.../apache/pinot/core/operator/query/SelectionOrderByOperator.java | 6 +-----
.../operator/streaming/StreamingSelectionOnlyCombineOperator.java | 6 +-----
.../core/operator/streaming/StreamingSelectionOnlyOperator.java | 6 +-----
.../core/operator/transform/PassThroughTransformOperator.java | 6 +-----
.../apache/pinot/core/operator/transform/TransformOperator.java | 5 -----
.../pinot/core/startree/operator/StarTreeFilterOperator.java | 6 ------
.../pinot/core/operator/combine/CombineSlowOperatorsTest.java | 5 -----
.../org/apache/pinot/core/operator/filter/TestFilterOperator.java | 5 -----
47 files changed, 22 insertions(+), 241 deletions(-)
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/common/Operator.java b/pinot-core/src/main/java/org/apache/pinot/core/common/Operator.java
index 6ad51648dd..5926805c6a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/common/Operator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/common/Operator.java
@@ -41,13 +41,6 @@ public interface Operator<T extends Block> {
*/
T nextBlock();
- /**
- * Returns the name of the operator.
- * NOTE: This method is called for tracing purpose. The sub-class should try to return a constant to avoid the
- * unnecessary overhead.
- */
- String getOperatorName();
-
/** @return List of {@link Operator}s that this operator depends upon. */
List<Operator> getChildOperators();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java
index 5509aa9be6..c18aa21056 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/AcquireReleaseColumnsSegmentOperator.java
@@ -40,7 +40,6 @@ import org.apache.pinot.spi.exception.EarlyTerminationException;
*/
@SuppressWarnings("unchecked")
public class AcquireReleaseColumnsSegmentOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "AcquireReleaseColumnsSegmentOperator";
private static final String EXPLAIN_NAME = "ACQUIRE_RELEASE_COLUMNS_SEGMENT";
private final PlanNode _planNode;
@@ -82,10 +81,6 @@ public class AcquireReleaseColumnsSegmentOperator extends BaseOperator<Intermedi
_indexSegment.release(_fetchContext);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/BitmapDocIdSetOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/BitmapDocIdSetOperator.java
index 5f301c974f..b251c552d8 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/BitmapDocIdSetOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/BitmapDocIdSetOperator.java
@@ -33,7 +33,7 @@ import org.roaringbitmap.IntIterator;
* documents) or already gathered enough documents (for selection queries).
*/
public class BitmapDocIdSetOperator extends BaseOperator<DocIdSetBlock> {
- private static final String OPERATOR_NAME = "BitmapDocIdSetOperator";
+
private static final String EXPLAIN_NAME = "DOC_ID_SET_BITMAP";
// TODO: Consider using BatchIterator to fill the document ids. Currently BatchIterator only reads bits for one
@@ -71,10 +71,6 @@ public class BitmapDocIdSetOperator extends BaseOperator<DocIdSetBlock> {
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/DocIdSetOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/DocIdSetOperator.java
index 84657f17d3..c013b893b1 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/DocIdSetOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/DocIdSetOperator.java
@@ -36,7 +36,6 @@ import org.apache.pinot.segment.spi.Constants;
* matched documents) or already gathered enough documents (for selection queries).
*/
public class DocIdSetOperator extends BaseOperator<DocIdSetBlock> {
- private static final String OPERATOR_NAME = "DocIdSetOperator";
private static final String EXPLAIN_NAME = "DOC_ID_SET";
private static final ThreadLocal<int[]> THREAD_LOCAL_DOC_IDS =
@@ -83,10 +82,6 @@ public class DocIdSetOperator extends BaseOperator<DocIdSetBlock> {
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/InstanceResponseOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/InstanceResponseOperator.java
index 1106094fb9..096726dedf 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/InstanceResponseOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/InstanceResponseOperator.java
@@ -32,7 +32,7 @@ import org.apache.pinot.segment.spi.IndexSegment;
public class InstanceResponseOperator extends BaseOperator<InstanceResponseBlock> {
- private static final String OPERATOR_NAME = "InstanceResponseOperator";
+
private static final String EXPLAIN_NAME = "INSTANCE_RESPONSE";
private final BaseCombineOperator _combineOperator;
@@ -128,10 +128,6 @@ public class InstanceResponseOperator extends BaseOperator<InstanceResponseBlock
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/ProjectionOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/ProjectionOperator.java
index b5438858ca..fb3c26df75 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/ProjectionOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/ProjectionOperator.java
@@ -32,7 +32,7 @@ import org.apache.pinot.spi.trace.Tracing;
public class ProjectionOperator extends BaseOperator<ProjectionBlock> {
- private static final String OPERATOR_NAME = "ProjectionOperator";
+
private static final String EXPLAIN_NAME = "PROJECT";
private final Map<String, DataSource> _dataSourceMap;
@@ -69,10 +69,6 @@ public class ProjectionOperator extends BaseOperator<ProjectionBlock> {
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/StreamingInstanceResponseOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/StreamingInstanceResponseOperator.java
index 374b3c5f24..a2976eb2c1 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/StreamingInstanceResponseOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/StreamingInstanceResponseOperator.java
@@ -33,7 +33,7 @@ import org.apache.pinot.segment.spi.IndexSegment;
public class StreamingInstanceResponseOperator extends InstanceResponseOperator {
- private static final String OPERATOR_NAME = "StreamingInstanceResponseOperator";
+
private final StreamObserver<Server.ServerResponse> _streamObserver;
public StreamingInstanceResponseOperator(BaseCombineOperator combinedOperator, List<IndexSegment> indexSegments,
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/AggregationOnlyCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/AggregationOnlyCombineOperator.java
index bdf085ccfc..3e146ce1b4 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/AggregationOnlyCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/AggregationOnlyCombineOperator.java
@@ -31,7 +31,6 @@ import org.apache.pinot.core.query.request.context.QueryContext;
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public class AggregationOnlyCombineOperator extends BaseCombineOperator {
- private static final String OPERATOR_NAME = "AggregationOnlyCombineOperator";
private static final String EXPLAIN_NAME = "COMBINE_AGGREGATE";
public AggregationOnlyCombineOperator(List<Operator> operators, QueryContext queryContext,
@@ -39,11 +38,6 @@ public class AggregationOnlyCombineOperator extends BaseCombineOperator {
super(operators, queryContext, executorService);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public String toExplainString() {
return EXPLAIN_NAME;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/DistinctCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/DistinctCombineOperator.java
index 195879de46..1ce54fae59 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/DistinctCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/DistinctCombineOperator.java
@@ -32,7 +32,6 @@ import org.apache.pinot.core.query.request.context.QueryContext;
*/
@SuppressWarnings("rawtypes")
public class DistinctCombineOperator extends BaseCombineOperator {
- private static final String OPERATOR_NAME = "DistinctCombineOperator";
private static final String EXPLAIN_NAME = "COMBINE_DISTINCT";
private final boolean _hasOrderBy;
@@ -42,10 +41,6 @@ public class DistinctCombineOperator extends BaseCombineOperator {
_hasOrderBy = queryContext.getOrderByExpressions() != null;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByCombineOperator.java
index 7a6ae6927c..43e673f948 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByCombineOperator.java
@@ -51,7 +51,6 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings({"rawtypes", "unchecked"})
public class GroupByCombineOperator extends BaseCombineOperator {
private static final Logger LOGGER = LoggerFactory.getLogger(GroupByCombineOperator.class);
- private static final String OPERATOR_NAME = "GroupByCombineOperator";
private static final String EXPLAIN_NAME = "COMBINE_GROUPBY";
// Use a higher limit for groups stored across segments. For most cases, most groups from each segment should be the
@@ -96,10 +95,6 @@ public class GroupByCombineOperator extends BaseCombineOperator {
return queryContext;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByOrderByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByOrderByCombineOperator.java
index 83f1e7b185..330cade4ed 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByOrderByCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/GroupByOrderByCombineOperator.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
public class GroupByOrderByCombineOperator extends BaseCombineOperator {
public static final int MAX_TRIM_THRESHOLD = 1_000_000_000;
private static final Logger LOGGER = LoggerFactory.getLogger(GroupByOrderByCombineOperator.class);
- private static final String OPERATOR_NAME = "GroupByOrderByCombineOperator";
+
private static final String EXPLAIN_NAME = "COMBINE_GROUPBY_ORDERBY";
private final int _trimSize;
private final int _trimThreshold;
@@ -114,10 +114,6 @@ public class GroupByOrderByCombineOperator extends BaseCombineOperator {
return queryContext;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/MinMaxValueBasedSelectionOrderByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/MinMaxValueBasedSelectionOrderByCombineOperator.java
index dc18b422aa..40fd7f393f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/MinMaxValueBasedSelectionOrderByCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/MinMaxValueBasedSelectionOrderByCombineOperator.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings({"rawtypes", "unchecked"})
public class MinMaxValueBasedSelectionOrderByCombineOperator extends BaseCombineOperator {
private static final Logger LOGGER = LoggerFactory.getLogger(MinMaxValueBasedSelectionOrderByCombineOperator.class);
- private static final String OPERATOR_NAME = "MinMaxValueBasedSelectionOrderByCombineOperator";
+
private static final String EXPLAIN_NAME = "COMBINE_SELECT_ORDERBY_MINMAX";
// For min/max value based combine, when a thread detects that no more segments need to be processed, it inserts this
@@ -114,10 +114,6 @@ public class MinMaxValueBasedSelectionOrderByCombineOperator extends BaseCombine
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOnlyCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOnlyCombineOperator.java
index afb3d8b1b6..49eeec64be 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOnlyCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOnlyCombineOperator.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("rawtypes")
public class SelectionOnlyCombineOperator extends BaseCombineOperator {
private static final Logger LOGGER = LoggerFactory.getLogger(SelectionOnlyCombineOperator.class);
- private static final String OPERATOR_NAME = "SelectionOnlyCombineOperator";
+
private static final String EXPLAIN_NAME = "COMBINE_SELECT";
private final int _numRowsToKeep;
@@ -51,10 +51,6 @@ public class SelectionOnlyCombineOperator extends BaseCombineOperator {
_numRowsToKeep = queryContext.getLimit();
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java
index 6231167816..39e6cf72f1 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/combine/SelectionOrderByCombineOperator.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("rawtypes")
public class SelectionOrderByCombineOperator extends BaseCombineOperator {
private static final Logger LOGGER = LoggerFactory.getLogger(SelectionOrderByCombineOperator.class);
- private static final String OPERATOR_NAME = "SelectionOrderByCombineOperator";
+
private static final String EXPLAIN_NAME = "COMBINE_SELECT_ORDERBY";
private final int _numRowsToKeep;
@@ -55,10 +55,6 @@ public class SelectionOrderByCombineOperator extends BaseCombineOperator {
_numRowsToKeep = queryContext.getLimit() + queryContext.getOffset();
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ExpressionScanDocIdIterator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ExpressionScanDocIdIterator.java
index 6aff45c9c0..64987293bc 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ExpressionScanDocIdIterator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/dociditerators/ExpressionScanDocIdIterator.java
@@ -272,7 +272,6 @@ public final class ExpressionScanDocIdIterator implements ScanBasedDocIdIterator
* NOTE: This operator contains only one block.
*/
private class RangeDocIdSetOperator extends BaseOperator<DocIdSetBlock> {
- static final String OPERATOR_NAME = "RangeDocIdSetOperator";
static final String EXPLAIN_NAME = "DOC_ID_SET_RANGE";
DocIdSetBlock _docIdSetBlock;
@@ -292,11 +291,6 @@ public final class ExpressionScanDocIdIterator implements ScanBasedDocIdIterator
return docIdSetBlock;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public String toExplainString() {
return EXPLAIN_NAME;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/AndFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/AndFilterOperator.java
index e181fe5788..8b819c41e7 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/AndFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/AndFilterOperator.java
@@ -30,7 +30,6 @@ import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
public class AndFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "AndFilterOperator";
private static final String EXPLAIN_NAME = "FILTER_AND";
private final List<BaseFilterOperator> _filterOperators;
@@ -71,10 +70,6 @@ public class AndFilterOperator extends BaseFilterOperator {
return BufferFastAggregation.and(bitmaps).getCardinality();
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/BitmapBasedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/BitmapBasedFilterOperator.java
index 594307a964..bd8fb41ce1 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/BitmapBasedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/BitmapBasedFilterOperator.java
@@ -37,7 +37,6 @@ import org.roaringbitmap.buffer.MutableRoaringBitmap;
@SuppressWarnings("rawtypes")
public class BitmapBasedFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "BitmapBasedFilterOperator";
private static final String EXPLAIN_NAME = "FILTER_INVERTED_INDEX";
private final PredicateEvaluator _predicateEvaluator;
@@ -171,10 +170,6 @@ public class BitmapBasedFilterOperator extends BaseFilterOperator {
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/CombinedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/CombinedFilterOperator.java
index e6b96da6e4..068ec7cc1f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/CombinedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/CombinedFilterOperator.java
@@ -32,7 +32,6 @@ import org.apache.pinot.spi.trace.Tracing;
* the AND result of the main and sub filter.
*/
public class CombinedFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "CombinedFilterOperator";
private static final String EXPLAIN_NAME = "FILTER_COMBINED";
private final BaseFilterOperator _mainFilterOperator;
@@ -43,11 +42,6 @@ public class CombinedFilterOperator extends BaseFilterOperator {
_subFilterOperator = subFilterOperator;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public List<Operator> getChildOperators() {
return Arrays.asList(_mainFilterOperator, _subFilterOperator);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/EmptyFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/EmptyFilterOperator.java
index 18dbd953c7..c7177a6567 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/EmptyFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/EmptyFilterOperator.java
@@ -32,7 +32,7 @@ public final class EmptyFilterOperator extends BaseFilterOperator {
private EmptyFilterOperator() {
}
- private static final String OPERATOR_NAME = "EmptyFilterOperator";
+
private static final String EXPLAIN_NAME = "FILTER_EMPTY";
private static final EmptyFilterOperator INSTANCE = new EmptyFilterOperator();
@@ -61,10 +61,6 @@ public final class EmptyFilterOperator extends BaseFilterOperator {
return EmptyFilterBlock.getInstance();
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ExpressionFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ExpressionFilterOperator.java
index 50cd1a2562..9342dc8047 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ExpressionFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ExpressionFilterOperator.java
@@ -38,7 +38,6 @@ import org.apache.pinot.segment.spi.datasource.DataSource;
public class ExpressionFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "ExpressionFilterOperator";
private static final String EXPLAIN_NAME = "FILTER_EXPRESSION";
private final int _numDocs;
@@ -69,10 +68,6 @@ public class ExpressionFilterOperator extends BaseFilterOperator {
new ExpressionFilterDocIdSet(_transformFunction, _predicateEvaluator, _dataSourceMap, _numDocs));
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3IndexFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3IndexFilterOperator.java
index 19a2073dde..09ce51597b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3IndexFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3IndexFilterOperator.java
@@ -46,7 +46,7 @@ import org.roaringbitmap.buffer.MutableRoaringBitmap;
* A filter operator that uses H3 index for geospatial data retrieval
*/
public class H3IndexFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "H3IndexFilterOperator";
+
private static final String EXPLAIN_NAME = "FILTER_H3_INDEX";
private final IndexSegment _segment;
private final Predicate _predicate;
@@ -240,10 +240,6 @@ public class H3IndexFilterOperator extends BaseFilterOperator {
});
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/JsonMatchFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/JsonMatchFilterOperator.java
index f5c67468d7..75ebaa246c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/JsonMatchFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/JsonMatchFilterOperator.java
@@ -35,7 +35,6 @@ import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
* Filter operator for JSON_MATCH. E.g. SELECT ... WHERE JSON_MATCH(column_name, filter_string)
*/
public class JsonMatchFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "JsonMatchFilterOperator";
private static final String EXPLAIN_NAME = "FILTER_JSON_INDEX";
private final JsonIndexReader _jsonIndex;
@@ -76,11 +75,6 @@ public class JsonMatchFilterOperator extends BaseFilterOperator {
return new BitmapCollection(_numDocs, false, _jsonIndex.getMatchingDocIds(_predicate.getValue()));
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public List<Operator> getChildOperators() {
return Collections.emptyList();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/MatchAllFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/MatchAllFilterOperator.java
index 7694f0bea3..038c2f4adf 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/MatchAllFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/MatchAllFilterOperator.java
@@ -26,7 +26,6 @@ import org.apache.pinot.core.operator.docidsets.MatchAllDocIdSet;
public class MatchAllFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "MatchEntireSegmentOperator";
private static final String EXPLAIN_NAME = "FILTER_MATCH_ENTIRE_SEGMENT";
private final int _numDocs;
@@ -44,10 +43,6 @@ public class MatchAllFilterOperator extends BaseFilterOperator {
return new FilterBlock(new MatchAllDocIdSet(_numDocs));
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/NotFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/NotFilterOperator.java
index 044d2f62cf..ac3e2bb00b 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/NotFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/NotFilterOperator.java
@@ -27,7 +27,7 @@ import org.apache.pinot.core.operator.docidsets.NotDocIdSet;
public class NotFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "NotFilterOperator";
+
private static final String EXPLAIN_NAME = "FILTER_NOT";
private final BaseFilterOperator _filterOperator;
private final int _numDocs;
@@ -37,10 +37,6 @@ public class NotFilterOperator extends BaseFilterOperator {
_numDocs = numDocs;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/OrFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/OrFilterOperator.java
index 5904b7c963..e7daca46f0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/OrFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/OrFilterOperator.java
@@ -30,7 +30,7 @@ import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
public class OrFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "OrFilterOperator";
+
private static final String EXPLAIN_NAME = "FILTER_OR";
private final List<BaseFilterOperator> _filterOperators;
private final int _numDocs;
@@ -50,10 +50,6 @@ public class OrFilterOperator extends BaseFilterOperator {
return new FilterBlock(new OrDocIdSet(filterBlockDocIdSets, _numDocs));
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java
index 9f1ddb6c48..44f9d72fbd 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java
@@ -41,7 +41,7 @@ import org.roaringbitmap.buffer.MutableRoaringBitmap;
public class RangeIndexBasedFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "RangeFilterOperator";
+
private static final String EXPLAIN_NAME = "FILTER_RANGE_INDEX";
// NOTE: Range index can only apply to dictionary-encoded columns for now
@@ -133,10 +133,6 @@ public class RangeIndexBasedFilterOperator extends BaseFilterOperator {
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ScanBasedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ScanBasedFilterOperator.java
index 9cff1147be..ec7c0e2a8c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ScanBasedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/ScanBasedFilterOperator.java
@@ -30,7 +30,6 @@ import org.apache.pinot.segment.spi.datasource.DataSourceMetadata;
public class ScanBasedFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "ScanBasedFilterOperator";
private static final String EXPLAIN_NAME = "FILTER_FULL_SCAN";
private final PredicateEvaluator _predicateEvaluator;
@@ -54,10 +53,6 @@ public class ScanBasedFilterOperator extends BaseFilterOperator {
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/SortedIndexBasedFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/SortedIndexBasedFilterOperator.java
index 291f385119..cef4ef2ba0 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/SortedIndexBasedFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/SortedIndexBasedFilterOperator.java
@@ -35,7 +35,6 @@ import org.roaringbitmap.buffer.MutableRoaringBitmap;
public class SortedIndexBasedFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "SortedIndexBasedFilterOperator";
private static final String EXPLAIN_NAME = "FILTER_SORTED_INDEX";
private final PredicateEvaluator _predicateEvaluator;
@@ -219,10 +218,6 @@ public class SortedIndexBasedFilterOperator extends BaseFilterOperator {
return new BitmapCollection(_numDocs, exclusive, bitmap);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/TextMatchFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/TextMatchFilterOperator.java
index 641f3ce63b..84c6bfbb4f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/TextMatchFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/filter/TextMatchFilterOperator.java
@@ -36,7 +36,7 @@ import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
* queries: WHERE TEXT_MATCH(column_name, query_string....)
*/
public class TextMatchFilterOperator extends BaseFilterOperator {
- private static final String OPERATOR_NAME = "TextMatchFilterOperator";
+
private static final String EXPLAIN_NAME = "FILTER_TEXT_INDEX";
private final TextIndexReader _textIndexReader;
@@ -76,10 +76,6 @@ public class TextMatchFilterOperator extends BaseFilterOperator {
return new BitmapCollection(_numDocs, false, bitmap);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationGroupByOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationGroupByOperator.java
index 27b1d56164..b99c490318 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationGroupByOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationGroupByOperator.java
@@ -39,7 +39,6 @@ import org.apache.pinot.core.startree.executor.StarTreeGroupByExecutor;
* segment.
*/
public class AggregationGroupByOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "AggregationGroupByOperator";
private static final String EXPLAIN_NAME = "AGGREGATE_GROUPBY";
private final QueryContext _queryContext;
@@ -78,11 +77,6 @@ public class AggregationGroupByOperator extends BaseOperator<IntermediateResults
return new IntermediateResultsBlock(_queryContext.getAggregationFunctions(), groupByExecutor.getResult());
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public List<Operator> getChildOperators() {
return Collections.singletonList(_transformOperator);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationGroupByOrderByOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationGroupByOrderByOperator.java
index 7bfdb9c10c..7f61327675 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationGroupByOrderByOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationGroupByOrderByOperator.java
@@ -45,7 +45,6 @@ import org.apache.pinot.core.util.GroupByUtils;
*/
@SuppressWarnings("rawtypes")
public class AggregationGroupByOrderByOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "AggregationGroupByOrderByOperator";
private static final String EXPLAIN_NAME = "AGGREGATE_GROUPBY_ORDERBY";
private final AggregationFunction[] _aggregationFunctions;
@@ -137,11 +136,6 @@ public class AggregationGroupByOrderByOperator extends BaseOperator<Intermediate
return resultsBlock;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public List<Operator> getChildOperators() {
return Collections.singletonList(_transformOperator);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationOperator.java
index a21ac2315d..c50fcb101a 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/AggregationOperator.java
@@ -37,7 +37,6 @@ import org.apache.pinot.core.startree.executor.StarTreeAggregationExecutor;
*/
@SuppressWarnings("rawtypes")
public class AggregationOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "AggregationOperator";
private static final String EXPLAIN_NAME = "AGGREGATE";
private final AggregationFunction[] _aggregationFunctions;
@@ -74,11 +73,6 @@ public class AggregationOperator extends BaseOperator<IntermediateResultsBlock>
return new IntermediateResultsBlock(_aggregationFunctions, aggregationExecutor.getResult(), false);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
-
@Override
public List<Operator> getChildOperators() {
return Collections.singletonList(_transformOperator);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DictionaryBasedDistinctOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DictionaryBasedDistinctOperator.java
index c2d3b96da4..b5254c7654 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DictionaryBasedDistinctOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DictionaryBasedDistinctOperator.java
@@ -41,7 +41,6 @@ import org.apache.pinot.spi.data.FieldSpec;
* Operator which executes DISTINCT operation based on dictionary
*/
public class DictionaryBasedDistinctOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "DictionaryBasedDistinctOperator";
private static final String EXPLAIN_NAME = "DISTINCT_DICTIONARY";
private final DistinctAggregationFunction _distinctAggregationFunction;
@@ -137,10 +136,6 @@ public class DictionaryBasedDistinctOperator extends BaseOperator<IntermediateRe
return new DistinctTable(dataSchema, records);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DistinctOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DistinctOperator.java
index 8ea7e681e1..310375d8d1 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DistinctOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/DistinctOperator.java
@@ -38,7 +38,6 @@ import org.apache.pinot.segment.spi.IndexSegment;
* Operator for distinct queries on a single segment.
*/
public class DistinctOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "DistinctOperator";
private static final String EXPLAIN_NAME = "DISTINCT";
private final IndexSegment _indexSegment;
@@ -71,10 +70,6 @@ public class DistinctOperator extends BaseOperator<IntermediateResultsBlock> {
Collections.singletonList(distinctTable), false);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/EmptySelectionOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/EmptySelectionOperator.java
index 624212fb73..bffeb910f7 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/EmptySelectionOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/EmptySelectionOperator.java
@@ -37,7 +37,7 @@ import org.apache.pinot.segment.spi.IndexSegment;
* <p>NOTE: this operator short circuit underlying operators and directly returns the data schema without any rows.
*/
public class EmptySelectionOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "EmptySelectionOperator";
+
private static final String EXPLAIN_NAME = "SELECT_EMPTY";
private final DataSchema _dataSchema;
@@ -67,10 +67,6 @@ public class EmptySelectionOperator extends BaseOperator<IntermediateResultsBloc
return new IntermediateResultsBlock(_dataSchema, Collections.emptyList());
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FastFilteredCountOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FastFilteredCountOperator.java
index 33a1845345..97282f89df 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FastFilteredCountOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FastFilteredCountOperator.java
@@ -48,11 +48,6 @@ public class FastFilteredCountOperator extends BaseOperator<IntermediateResultsB
_aggregationFunctions = aggregationFunctions;
}
- @Override
- public String getOperatorName() {
- return getClass().getSimpleName();
- }
-
@Override
public String toExplainString() {
return EXPLAIN_NAME;
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredAggregationOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredAggregationOperator.java
index de9c380008..156398dff2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredAggregationOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/FilteredAggregationOperator.java
@@ -42,7 +42,7 @@ import org.apache.pinot.core.query.aggregation.function.AggregationFunction;
*/
@SuppressWarnings("rawtypes")
public class FilteredAggregationOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "FilteredAggregationOperator";
+
private static final String EXPLAIN_NAME = "AGGREGATE_FILTERED";
private final AggregationFunction[] _aggregationFunctions;
@@ -93,10 +93,6 @@ public class FilteredAggregationOperator extends BaseOperator<IntermediateResult
return new IntermediateResultsBlock(_aggregationFunctions, Arrays.asList(result), false);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/NonScanBasedAggregationOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/NonScanBasedAggregationOperator.java
index 6408a01fb5..c9bdf4dacf 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/NonScanBasedAggregationOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/NonScanBasedAggregationOperator.java
@@ -61,7 +61,7 @@ import org.apache.pinot.spi.utils.ByteArray;
*/
@SuppressWarnings("rawtypes")
public class NonScanBasedAggregationOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = NonScanBasedAggregationOperator.class.getSimpleName();
+
private static final String EXPLAIN_NAME = "AGGREGATE_NO_SCAN";
private final AggregationFunction[] _aggregationFunctions;
@@ -239,10 +239,6 @@ public class NonScanBasedAggregationOperator extends BaseOperator<IntermediateRe
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOnlyOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOnlyOperator.java
index 084a78d751..809746003f 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOnlyOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOnlyOperator.java
@@ -38,7 +38,7 @@ import org.apache.pinot.segment.spi.IndexSegment;
public class SelectionOnlyOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "SelectionOnlyOperator";
+
private static final String EXPLAIN_NAME = "SELECT";
private final IndexSegment _indexSegment;
@@ -109,10 +109,6 @@ public class SelectionOnlyOperator extends BaseOperator<IntermediateResultsBlock
return new IntermediateResultsBlock(_dataSchema, _rows);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOrderByOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOrderByOperator.java
index 2004bb2790..b6eeb82fec 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOrderByOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/query/SelectionOrderByOperator.java
@@ -69,7 +69,7 @@ import org.roaringbitmap.RoaringBitmap;
* </ul>
*/
public class SelectionOrderByOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "SelectionOrderByOperator";
+
private static final String EXPLAIN_NAME = "SELECT_ORDERBY";
private final IndexSegment _indexSegment;
@@ -365,10 +365,6 @@ public class SelectionOrderByOperator extends BaseOperator<IntermediateResultsBl
return new IntermediateResultsBlock(dataSchema, _rows);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public List<Operator> getChildOperators() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyCombineOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyCombineOperator.java
index ea55272e97..ff33cc0b87 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyCombineOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyCombineOperator.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings({"rawtypes", "unchecked"})
public class StreamingSelectionOnlyCombineOperator extends BaseCombineOperator {
private static final Logger LOGGER = LoggerFactory.getLogger(StreamingSelectionOnlyCombineOperator.class);
- private static final String OPERATOR_NAME = "StreamingSelectionOnlyCombineOperator";
+
private static final String EXPLAIN_NAME = "SELECT_STREAMING_COMBINE";
// Special IntermediateResultsBlock to indicate that this is the last results block for an operator
@@ -65,10 +65,6 @@ public class StreamingSelectionOnlyCombineOperator extends BaseCombineOperator {
_limit = queryContext.getLimit();
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperator.java
index 3bec701f7b..e78238e21c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/streaming/StreamingSelectionOnlyOperator.java
@@ -38,7 +38,7 @@ import org.apache.pinot.segment.spi.IndexSegment;
public class StreamingSelectionOnlyOperator extends BaseOperator<IntermediateResultsBlock> {
- private static final String OPERATOR_NAME = "StreamingSelectionOnlyOperator";
+
private static final String EXPLAIN_NAME = "SELECT_STREAMING";
private final IndexSegment _indexSegment;
@@ -98,10 +98,6 @@ public class StreamingSelectionOnlyOperator extends BaseOperator<IntermediateRes
return new IntermediateResultsBlock(_dataSchema, rows);
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/PassThroughTransformOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/PassThroughTransformOperator.java
index 2407eb2f11..75991bf7ea 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/PassThroughTransformOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/PassThroughTransformOperator.java
@@ -29,7 +29,7 @@ import org.apache.pinot.core.operator.blocks.ProjectionBlock;
* Class for evaluating pass through transform expressions.
*/
public class PassThroughTransformOperator extends TransformOperator {
- private static final String OPERATOR_NAME = "PassThroughTransformOperator";
+
private static final String EXPLAIN_NAME = "TRANSFORM_PASSTHROUGH";
/**
@@ -53,10 +53,6 @@ public class PassThroughTransformOperator extends TransformOperator {
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/TransformOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/TransformOperator.java
index ded21e302e..9f52fe839d 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/TransformOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/operator/transform/TransformOperator.java
@@ -45,7 +45,6 @@ import org.apache.pinot.spi.trace.Tracing;
* Class for evaluating transform expressions.
*/
public class TransformOperator extends BaseOperator<TransformBlock> {
- private static final String OPERATOR_NAME = "TransformOperator";
private static final String EXPLAIN_NAME = "TRANSFORM";
protected final ProjectionOperator _projectionOperator;
@@ -117,10 +116,6 @@ public class TransformOperator extends BaseOperator<TransformBlock> {
}
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/startree/operator/StarTreeFilterOperator.java b/pinot-core/src/main/java/org/apache/pinot/core/startree/operator/StarTreeFilterOperator.java
index 59b1206c8e..13dc4c1431 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/startree/operator/StarTreeFilterOperator.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/startree/operator/StarTreeFilterOperator.java
@@ -114,8 +114,6 @@ public class StarTreeFilterOperator extends BaseFilterOperator {
_remainingPredicateColumns = remainingPredicateColumns;
}
}
-
- private static final String OPERATOR_NAME = "StarTreeFilterOperator";
// If (number of matching dictionary ids * threshold) > (number of child nodes), use scan to traverse nodes instead of
// binary search on each dictionary id
private static final int USE_SCAN_TO_TRAVERSE_NODES_THRESHOLD = 10;
@@ -160,10 +158,6 @@ public class StarTreeFilterOperator extends BaseFilterOperator {
return _resultEmpty;
}
- @Override
- public String getOperatorName() {
- return OPERATOR_NAME;
- }
@Override
public String toExplainString() {
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/CombineSlowOperatorsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/CombineSlowOperatorsTest.java
index b4fc6b663d..3754f1547b 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/CombineSlowOperatorsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/combine/CombineSlowOperatorsTest.java
@@ -166,11 +166,6 @@ public class CombineSlowOperatorsTest {
return null;
}
- @Override
- public String getOperatorName() {
- return "SlowOperator";
- }
-
@Override
public String toExplainString() {
return EXPLAIN_NAME;
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/TestFilterOperator.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/TestFilterOperator.java
index 3c794b3d30..4bcc938118 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/TestFilterOperator.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/TestFilterOperator.java
@@ -74,11 +74,6 @@ public class TestFilterOperator extends BaseFilterOperator {
});
}
- @Override
- public String getOperatorName() {
- return "TestFilterOperator";
- }
-
@Override
public String toExplainString() {
return EXPLAIN_NAME;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org