This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 62699481f8a04f02f213c9871c96b8c94d5ed450 Author: Ali Alsuliman <[email protected]> AuthorDate: Sat Feb 4 14:55:36 2023 -0800 [NO ISSUE][FUN] Move spatial-intersect() to asterix-runtime module - user model changes: no - storage format changes: no - interface changes: no Change-Id: If6ef297f1f903bade07c248c0bf21dcea3cc76fb Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17362 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Ali Alsuliman <[email protected]> Reviewed-by: Wail Alkowaileet <[email protected]> --- .../java/org/apache/asterix/runtime/FuzzyJoinFunctionRegistrant.java | 4 ---- .../asterix/runtime/evaluators/functions/SimilarityDescriptor.java | 2 +- .../java/org/apache/asterix/runtime/evaluators/common}/IntArray.java | 2 +- .../runtime/evaluators/functions/SpatialIntersectDescriptor.java | 2 +- .../java/org/apache/asterix/runtime/functions/FunctionCollection.java | 2 ++ 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/FuzzyJoinFunctionRegistrant.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/FuzzyJoinFunctionRegistrant.java index 83ebc986c7..c21ac5890f 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/FuzzyJoinFunctionRegistrant.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/FuzzyJoinFunctionRegistrant.java @@ -37,7 +37,6 @@ import org.apache.asterix.runtime.evaluators.functions.SimilarityJaccardPrefixCh import org.apache.asterix.runtime.evaluators.functions.SimilarityJaccardPrefixDescriptor; import org.apache.asterix.runtime.evaluators.functions.SimilarityJaccardSortedCheckDescriptor; import org.apache.asterix.runtime.evaluators.functions.SimilarityJaccardSortedDescriptor; -import org.apache.asterix.runtime.evaluators.functions.SpatialIntersectDescriptor; import org.apache.asterix.runtime.evaluators.functions.WordTokensDescriptor; public class FuzzyJoinFunctionRegistrant implements IFunctionRegistrant { @@ -48,9 +47,6 @@ public class FuzzyJoinFunctionRegistrant implements IFunctionRegistrant { fc.add(SimilarityJaccardPrefixDescriptor.FACTORY); fc.add(SimilarityJaccardPrefixCheckDescriptor.FACTORY); - // Spatial - fc.add(SpatialIntersectDescriptor.FACTORY); - // fuzzyjoin function fc.add(PrefixLenJaccardDescriptor.FACTORY); fc.add(WordTokensDescriptor.FACTORY); diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java index 95fd5bf95b..341dfe8ea8 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java +++ b/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/SimilarityDescriptor.java @@ -26,7 +26,6 @@ import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeseria import org.apache.asterix.dataflow.data.nontagged.serde.AOrderedListSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.AUnorderedListSerializerDeserializer; import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider; -import org.apache.asterix.fuzzyjoin.IntArray; import org.apache.asterix.fuzzyjoin.similarity.PartialIntersect; import org.apache.asterix.fuzzyjoin.similarity.SimilarityFilters; import org.apache.asterix.fuzzyjoin.similarity.SimilarityMetric; @@ -36,6 +35,7 @@ import org.apache.asterix.om.functions.IFunctionDescriptorFactory; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.BuiltinType; import org.apache.asterix.runtime.evaluators.base.AbstractScalarFunctionDynamicDescriptor; +import org.apache.asterix.runtime.evaluators.common.IntArray; import org.apache.asterix.runtime.evaluators.common.SimilarityFiltersCache; import org.apache.asterix.runtime.exceptions.TypeMismatchException; import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/IntArray.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/IntArray.java similarity index 97% rename from asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/IntArray.java rename to asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/IntArray.java index 91fb8b43a8..627ed89c1a 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/IntArray.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/IntArray.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.asterix.fuzzyjoin; +package org.apache.asterix.runtime.evaluators.common; import java.util.Arrays; diff --git a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java similarity index 99% rename from asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java rename to asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java index 5a01007567..4e69b43f4a 100644 --- a/asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/SpatialIntersectDescriptor.java @@ -31,7 +31,6 @@ import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserial import org.apache.asterix.dataflow.data.nontagged.serde.APolygonSerializerDeserializer; import org.apache.asterix.dataflow.data.nontagged.serde.ARectangleSerializerDeserializer; import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; -import org.apache.asterix.fuzzyjoin.IntArray; import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.functions.BuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptorFactory; @@ -39,6 +38,7 @@ import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.EnumDeserializer; import org.apache.asterix.runtime.evaluators.base.AbstractScalarFunctionDynamicDescriptor; import org.apache.asterix.runtime.evaluators.common.DoubleArray; +import org.apache.asterix.runtime.evaluators.common.IntArray; import org.apache.asterix.runtime.evaluators.common.SpatialUtils; import org.apache.asterix.runtime.exceptions.InvalidDataFormatException; import org.apache.asterix.runtime.exceptions.TypeMismatchException; diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java index 867a8d0c4c..4b418b65c5 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java @@ -451,6 +451,7 @@ import org.apache.asterix.runtime.evaluators.functions.SleepDescriptor; import org.apache.asterix.runtime.evaluators.functions.SpatialAreaDescriptor; import org.apache.asterix.runtime.evaluators.functions.SpatialCellDescriptor; import org.apache.asterix.runtime.evaluators.functions.SpatialDistanceDescriptor; +import org.apache.asterix.runtime.evaluators.functions.SpatialIntersectDescriptor; import org.apache.asterix.runtime.evaluators.functions.StringConcatDescriptor; import org.apache.asterix.runtime.evaluators.functions.StringContainsDescriptor; import org.apache.asterix.runtime.evaluators.functions.StringEndsWithDescriptor; @@ -1170,6 +1171,7 @@ public final class FunctionCollection implements IFunctionCollection { fc.add(LineRectanglePolygonAccessor.FACTORY); fc.add(ReferenceTileDescriptor.FACTORY); fc.add(GetIntersectionDescriptor.FACTORY); + fc.add(SpatialIntersectDescriptor.FACTORY); // full-text function fc.add(FullTextContainsFunctionDescriptor.FACTORY);
