yupeng9 commented on code in PR #8498:
URL: https://github.com/apache/pinot/pull/8498#discussion_r849035448
##########
pinot-core/src/main/java/org/apache/pinot/core/plan/FilterPlanNode.java:
##########
@@ -207,20 +219,20 @@ private BaseFilterOperator
constructPhysicalOperator(FilterContext filter, int n
// Consuming segments: When FST is enabled, use
AutomatonBasedEvaluator so that regexp matching logic is
// similar to that of FSTBasedEvaluator, else use regular flow
of getting predicate evaluator.
if (dataSource.getFSTIndex() != null) {
- predicateEvaluator =
-
FSTBasedRegexpPredicateEvaluatorFactory.newFSTBasedEvaluator((RegexpLikePredicate)
predicate,
- dataSource.getFSTIndex(), dataSource.getDictionary());
+ predicateEvaluator = FSTBasedRegexpPredicateEvaluatorFactory
+ .newFSTBasedEvaluator((RegexpLikePredicate) predicate,
dataSource.getFSTIndex(),
Review Comment:
we dont need to change the format, right?
##########
pinot-core/src/main/java/org/apache/pinot/core/operator/filter/H3InclusionIndexFilterOperator.java:
##########
@@ -0,0 +1,128 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.operator.filter;
+
+import it.unimi.dsi.fastutil.longs.LongSet;
+import java.util.Collections;
+import java.util.List;
+import org.apache.pinot.common.request.context.ExpressionContext;
+import org.apache.pinot.common.request.context.ExpressionContext.Type;
+import org.apache.pinot.common.request.context.predicate.Predicate;
+import org.apache.pinot.core.common.Operator;
+import org.apache.pinot.core.operator.blocks.FilterBlock;
+import org.apache.pinot.core.operator.dociditerators.ScanBasedDocIdIterator;
+import org.apache.pinot.core.operator.docidsets.BitmapDocIdSet;
+import org.apache.pinot.segment.local.utils.GeometrySerializer;
+import org.apache.pinot.segment.local.utils.H3Utils;
+import org.apache.pinot.segment.spi.IndexSegment;
+import org.apache.pinot.segment.spi.index.reader.H3IndexReader;
+import org.apache.pinot.spi.utils.BytesUtils;
+import org.locationtech.jts.geom.Geometry;
+import org.roaringbitmap.buffer.BufferFastAggregation;
+import org.roaringbitmap.buffer.ImmutableRoaringBitmap;
+import org.roaringbitmap.buffer.MutableRoaringBitmap;
+
+
+/**
+ * A filter operator that uses H3 index for geospatial data inclusion
+ */
+public class H3InclusionIndexFilterOperator extends BaseFilterOperator {
+
+ private static final String EXPLAIN_NAME = "INCLUSION_FILTER_H3_INDEX";
+
+ private static final String OPERATOR_NAME = "H3InclusionIndexFilterOperator";
+
+ private final IndexSegment _segment;
+ private final Predicate _predicate;
+ private final int _numDocs;
+ private final H3IndexReader _h3IndexReader;
+ private final LongSet _h3Ids;
+
+ public H3InclusionIndexFilterOperator(IndexSegment segment, Predicate
predicate, int numDocs) {
+ _segment = segment;
+ _predicate = predicate;
+ _numDocs = numDocs;
+
+ List<ExpressionContext> arguments =
predicate.getLhs().getFunction().getArguments();
+ Geometry geometry;
+ // Assume first argument is Literal, and second argument is IDENTIFIER for
St_Contains.
+ assert arguments.get(1).getType() == Type.IDENTIFIER;
+ assert arguments.get(0).getType() == Type.LITERAL;
+ // look up arg1's h3 indices
+ _h3IndexReader =
segment.getDataSource(arguments.get(1).getIdentifier()).getH3Index();
+ // arg0 is the literal
+ geometry =
GeometrySerializer.deserialize(BytesUtils.toBytes(arguments.get(0).getLiteral()));
+ // must be some h3 index
+ assert _h3IndexReader != null;
+
+ // get the set of H3 cells at the specified resolution which completely
cover the input shape.
+ _h3Ids = H3Utils.coverGeometryInH3(geometry,
_h3IndexReader.getH3IndexResolution().getLowestResolution());
+ }
+
+ @Override
+ protected FilterBlock getNextBlock() {
+ // have list of h3 cell ids for polygon provided
+ // return filtered num_docs
+ ImmutableRoaringBitmap[] partialMatchDocIds = new
ImmutableRoaringBitmap[_h3Ids.size()];
+ int i = 0;
+ for (long h3IndexId : _h3Ids) {
+ partialMatchDocIds[i++] = _h3IndexReader.getDocIds(h3IndexId);
+ }
+ MutableRoaringBitmap mutableRoaringBitmap =
BufferFastAggregation.or(partialMatchDocIds);
Review Comment:
I think this is just approximation, but it doesn't return same result of
`ST_Contains`, right?
##########
pinot-core/src/main/java/org/apache/pinot/core/plan/FilterPlanNode.java:
##########
@@ -182,7 +189,12 @@ private BaseFilterOperator
constructPhysicalOperator(FilterContext filter, int n
ExpressionContext lhs = predicate.getLhs();
if (lhs.getType() == ExpressionContext.Type.FUNCTION) {
if (canApplyH3Index(predicate, lhs.getFunction())) {
- return new H3IndexFilterOperator(_indexSegment, predicate,
numDocs);
+ String functionName = lhs.getFunction().getFunctionName();
+ if (functionName.equals("st_distance") ||
functionName.equals("stdistance")) {
+ return new H3IndexFilterOperator(_indexSegment, predicate,
numDocs);
+ } else {
Review Comment:
nit: better to make condition explicit, and throw exception in else
condition
##########
pinot-core/src/test/java/org/apache/pinot/queries/H3IndexQueriesTest.java:
##########
@@ -210,11 +226,47 @@ public void testH3Index()
Assert.assertNotNull(aggregationResult);
Assert.assertEquals((long) aggregationResult.get(0), NUM_RECORDS);
}
+
+ // Test st contains in polygon
+ testQueryStContain("SELECT COUNT(*) FROM testTable WHERE
ST_Contains(ST_GeomFromText('POLYGON ((\n"
Review Comment:
shall we add some tests of the corner cases, such as on the line/vertex of
the polygon?
--
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: commits-unsubscr...@pinot.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
