Jackie-Jiang commented on code in PR #10043:
URL: https://github.com/apache/pinot/pull/10043#discussion_r1065196146
##########
pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java:
##########
@@ -44,44 +53,74 @@ public class RangeIndexBasedFilterOperator extends
BaseFilterOperator {
private static final String EXPLAIN_NAME = "FILTER_RANGE_INDEX";
- private final RangeEvaluator _rangeEvaluator;
- private final PredicateEvaluator _rangePredicateEvaluator;
+ static final Set<FieldSpec.DataType> SUPPORTED_RAW_DATA_TYPES =
+ EnumSet.of(FieldSpec.DataType.INT, FieldSpec.DataType.LONG,
FieldSpec.DataType.FLOAT, FieldSpec.DataType.DOUBLE);
+
+ private final RangeIndexReader<ImmutableRoaringBitmap> _rangeIndexReader;
+ private final PredicateEvaluator _predicateEvaluator;
private final DataSource _dataSource;
+ private final FieldSpec.DataType _parameterType;
+ private final Object _parameters;
private final int _numDocs;
+ static boolean canEvaluate(PredicateEvaluator predicateEvaluator, DataSource
dataSource) {
+ if (dataSource.getRangeIndex() != null) {
+ boolean datatypeSupported = (predicateEvaluator.isDictionaryBased() ||
SUPPORTED_RAW_DATA_TYPES.contains(
+ predicateEvaluator.getDataType()));
+ switch (predicateEvaluator.getPredicateType()) {
+ case EQ:
+ return datatypeSupported && dataSource.getRangeIndex().isExact() &&
dataSource.getRangeIndex().isExact() && (
+ predicateEvaluator instanceof DictionaryBasedEqPredicateEvaluator
+ || predicateEvaluator instanceof
IntRawValueBasedEqPredicateEvaluator
+ || predicateEvaluator instanceof
LongRawValueBasedEqPredicateEvaluator
+ || predicateEvaluator instanceof
FloatRawValueBasedEqPredicateEvaluator
+ || predicateEvaluator instanceof
DoubleRawValueBasedEqPredicateEvaluator);
+ case RANGE:
+ return datatypeSupported && (predicateEvaluator instanceof
SortedDictionaryBasedRangePredicateEvaluator
+ || predicateEvaluator instanceof
IntRawValueBasedRangePredicateEvaluator
+ || predicateEvaluator instanceof
LongRawValueBasedRangePredicateEvaluator
+ || predicateEvaluator instanceof
FloatRawValueBasedRangePredicateEvaluator
+ || predicateEvaluator instanceof
DoubleRawValueBasedRangePredicateEvaluator);
+ default:
Review Comment:
(minor) add a `return false` for readability
##########
pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java:
##########
@@ -44,44 +53,74 @@ public class RangeIndexBasedFilterOperator extends
BaseFilterOperator {
private static final String EXPLAIN_NAME = "FILTER_RANGE_INDEX";
- private final RangeEvaluator _rangeEvaluator;
- private final PredicateEvaluator _rangePredicateEvaluator;
+ static final Set<FieldSpec.DataType> SUPPORTED_RAW_DATA_TYPES =
+ EnumSet.of(FieldSpec.DataType.INT, FieldSpec.DataType.LONG,
FieldSpec.DataType.FLOAT, FieldSpec.DataType.DOUBLE);
+
+ private final RangeIndexReader<ImmutableRoaringBitmap> _rangeIndexReader;
+ private final PredicateEvaluator _predicateEvaluator;
private final DataSource _dataSource;
+ private final FieldSpec.DataType _parameterType;
+ private final Object _parameters;
private final int _numDocs;
+ static boolean canEvaluate(PredicateEvaluator predicateEvaluator, DataSource
dataSource) {
+ if (dataSource.getRangeIndex() != null) {
+ boolean datatypeSupported = (predicateEvaluator.isDictionaryBased() ||
SUPPORTED_RAW_DATA_TYPES.contains(
+ predicateEvaluator.getDataType()));
+ switch (predicateEvaluator.getPredicateType()) {
+ case EQ:
+ return datatypeSupported && dataSource.getRangeIndex().isExact() &&
dataSource.getRangeIndex().isExact() && (
Review Comment:
`dataSource.getRangeIndex().isExact()` is repeated
##########
pinot-core/src/main/java/org/apache/pinot/core/operator/filter/RangeIndexBasedFilterOperator.java:
##########
@@ -44,44 +53,74 @@ public class RangeIndexBasedFilterOperator extends
BaseFilterOperator {
private static final String EXPLAIN_NAME = "FILTER_RANGE_INDEX";
- private final RangeEvaluator _rangeEvaluator;
- private final PredicateEvaluator _rangePredicateEvaluator;
+ static final Set<FieldSpec.DataType> SUPPORTED_RAW_DATA_TYPES =
+ EnumSet.of(FieldSpec.DataType.INT, FieldSpec.DataType.LONG,
FieldSpec.DataType.FLOAT, FieldSpec.DataType.DOUBLE);
+
+ private final RangeIndexReader<ImmutableRoaringBitmap> _rangeIndexReader;
+ private final PredicateEvaluator _predicateEvaluator;
private final DataSource _dataSource;
+ private final FieldSpec.DataType _parameterType;
+ private final Object _parameters;
private final int _numDocs;
+ static boolean canEvaluate(PredicateEvaluator predicateEvaluator, DataSource
dataSource) {
+ if (dataSource.getRangeIndex() != null) {
+ boolean datatypeSupported = (predicateEvaluator.isDictionaryBased() ||
SUPPORTED_RAW_DATA_TYPES.contains(
Review Comment:
After a second thought, I feel we can remove most of the checks here. When
range index exists, it implies that the column is either dictionary encoded, or
has supported data types. All we need to check is for EQ the range index should
be exact.
Although this introduce some assumptions to this module, it reduces the
per-segment check overhead at query time.
##########
pinot-core/src/main/java/org/apache/pinot/core/operator/filter/predicate/EqualsPredicateEvaluatorFactory.java:
##########
@@ -82,202 +82,6 @@ public static BaseRawValueBasedPredicateEvaluator
newRawValueBasedEvaluator(EqPr
}
}
- private static final class DictionaryBasedEqPredicateEvaluator extends
BaseDictionaryBasedPredicateEvaluator {
Review Comment:
Suggest keeping them as inner class and changing them to `public` access
(same as range predicate). All of them are under the scope of EQ predicate
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
