Extend GIS Support to the Document and Graph Model #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

murermader wants to merge 323 commits into master from multimodel-gis2

.github/workflows/matrix.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,4 @@ jobs: @@
                     run: ./gradlew assemblePlugins -PwithoutpullingUi=true
                 -   name: Execute tests
                     timeout-minutes: 30
-                    run: ./gradlew check -PwithoutpullingUi=true
+                    run: ./gradlew platformTests -PwithoutpullingUi=true

build.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -112,6 +112,17 @@ allprojects { @@
         }
         integrationTests.dependsOn(testClasses)
+        // matrix tests exclude tests which rely on docker during testing due to different platform requirements
+        tasks.register('platformTests', Test) {
+            description = 'Runs platform tests.'
+            group = 'verification'
+            useJUnitPlatform {
+                excludeTags("docker")
+            }
+            shouldRunAfter(tasks.named('test'))
+        }
+        platformTests.dependsOn(testClasses)
         testlogger {
             theme 'standard'
             showExceptions true
@@ Expand Down @@

core/src/main/java/org/polypheny/db/algebra/constant/Kind.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -1322,6 +1322,19 @@ public enum Kind { @@
          * Document model {@code $exists} operator
          */
         MQL_EXISTS,
+        MQL_GEO_INTERSECTS,
+        MQL_GEO_WITHIN,
+        MQL_GEO_DISTANCE,
+        MQL_NEAR,
+        MQL_NEAR_SPHERE,
+        MQL_GEO_NEAR,
         /*
          * Deserialize operator
          */
@@ Expand Down @@

core/src/main/java/org/polypheny/db/algebra/core/Join.java

Original file line number	Diff line number	Diff line change
Expand Up		@@ -277,5 +277,4 @@ public PolyAlgArgs bindArguments() {
		return args;
		}


		}

core/src/main/java/org/polypheny/db/algebra/core/Sort.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -82,6 +82,8 @@ public abstract class Sort extends SingleAlg { @@
          */
         @Getter
         public final AlgCollation collation;
+        @Getter
         protected final ImmutableList<RexNode> fieldExps;
         public final RexNode offset;
         public final RexNode fetch;
@@ Expand Down @@

core/src/main/java/org/polypheny/db/algebra/core/document/DocumentProject.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ @@
     import java.util.ArrayList;
     import java.util.Arrays;
+    import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import java.util.Map.Entry;
@@ Expand Down Expand Up @@
         public Map<String, ? extends RexNode> includes;
         public List<String> excludes;
+        public Map<String, ? extends RexNode> adds;
         /**
          * Creates a {@link DocumentProject}.
          * {@link ModelTrait#DOCUMENT} native node of a project.
          */
-        protected DocumentProject( AlgCluster cluster, AlgTraitSet traits, AlgNode input, @NotNull Map<String, ? extends RexNode> includes, @NotNull List<String> excludes ) {
+        protected DocumentProject( AlgCluster cluster, AlgTraitSet traits, AlgNode input, @NotNull Map<String, ? extends RexNode> includes, @NotNull List<String> excludes, @NotNull Map<String, ? extends RexNode> adds ) {
             super( cluster, traits, input );
             this.includes = includes;
+            this.adds = adds;
             this.excludes = excludes;
-            this.rowType = DocumentType.ofIncludes( includes ).ofExcludes( excludes );
+            Map<String, RexNode> map = new HashMap<>();
+            map.putAll( adds );
+            map.putAll( includes );
+            this.rowType = DocumentType.ofIncludes( map ).ofExcludes( excludes );
         }
@@ Expand Down Expand Up / @@ -97,6 +103,20 @@ public RexNode asSingleProject() { @@
                             builder.getTypeFactory().createArrayType( builder.getTypeFactory().createPolyType( PolyType.CHAR, 255 ), -1 ), PolyType.ARRAY ) );
             nodes.addAll( includes.entrySet().stream().filter( o -> Objects.nonNull( o.getKey() ) ).map( Entry::getValue ).toList() );
+            if ( !adds.isEmpty() ) {
+                nodes.clear();
+                nodes.add( doc );
+                nodes.add(
+                        builder.makeLiteral(
+                                PolyList.copyOf( adds.keySet().stream().filter( Objects::nonNull ).map( v -> PolyList.copyOf( Arrays.stream( v.split( "\\." ) ).map( PolyString::of ).toList() ) )
+                                        .toList() ),
+                                builder.getTypeFactory().createArrayType( builder.getTypeFactory().createPolyType( PolyType.CHAR, 255 ), -1 ), PolyType.ARRAY ) );
+                nodes.addAll( adds.entrySet().stream().filter( o -> Objects.nonNull( o.getKey() ) ).map( Entry::getValue ).toList() );
+                doc = builder.makeCall( getTupleType(), OperatorRegistry.get( QueryLanguage.from( "mongo" ), OperatorName.MQL_MERGE_ADD ), nodes );
+                return doc;
+            }
             if ( !includes.isEmpty() ) {
                 doc = builder.makeCall( getTupleType(), OperatorRegistry.get( QueryLanguage.from( "mongo" ), OperatorName.MQL_MERGE ), nodes );
@@ Expand Down @@

core/src/main/java/org/polypheny/db/algebra/core/relational/RelModify.java

Original file line number	Diff line number	Diff line change
Expand Up		@@ -231,6 +231,5 @@ public PolyAlgArgs bindArguments() {
		.put( "flattened", new BooleanArg( isFlattened() ) );
		}


		}

core/src/main/java/org/polypheny/db/algebra/enumerable/EnumerableSortRule.java

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*
-     * Copyright 2019-2024 The Polypheny Project
+     * Copyright 2019-2025 The Polypheny Project
      *
      * Licensed under the Apache License, Version 2.0 (the "License");
      * you may not use this file except in compliance with the License.
@@ Expand Down @@

core/src/main/java/org/polypheny/db/algebra/enumerable/RexImpTable.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -476,6 +476,11 @@ private void defineCypherMethods() { @@
             defineMethod( OperatorRegistry.get( cypher, OperatorName.CYPHER_SET_LABELS ), BuiltInMethod.CYPHER_SET_LABELS.method, NullPolicy.NONE );
             defineMethod( OperatorRegistry.get( cypher, OperatorName.CYPHER_REMOVE_LABELS ), BuiltInMethod.CYPHER_REMOVE_LABELS.method, NullPolicy.NONE );
             defineMethod( OperatorRegistry.get( cypher, OperatorName.CYPHER_REMOVE_PROPERTY ), BuiltInMethod.CYPHER_REMOVE_PROPERTY.method, NullPolicy.NONE );
+            defineMethod( OperatorRegistry.get( cypher, OperatorName.CYPHER_POINT ), BuiltInMethod.CYPHER_POINT.method, NullPolicy.NONE );
+            defineMethod( OperatorRegistry.get( cypher, OperatorName.DISTANCE ), BuiltInMethod.CYPHER_DISTANCE.method, NullPolicy.NONE );
+            defineMethod( OperatorRegistry.get( cypher, OperatorName.DISTANCE_NEO4J ), BuiltInMethod.CYPHER_DISTANCE_NEO4J.method, NullPolicy.NONE );
+            defineMethod( OperatorRegistry.get( cypher, OperatorName.CYPHER_WITHIN_BBOX ), BuiltInMethod.CYPHER_WITHIN_BBOX.method, NullPolicy.NONE );
+            defineMethod( OperatorRegistry.get( cypher, OperatorName.CYPHER_WITHIN_GEOMETRY ), BuiltInMethod.CYPHER_WITHIN_GEOMETRY.method, NullPolicy.NONE );
         }
@@ Expand Down Expand Up / @@ -503,10 +508,13 @@ private void defineMongoMethods() { @@
             defineMethod( OperatorRegistry.get( mongo, OperatorName.MQL_REMOVE ), BuiltInMethod.MQL_REMOVE.method, NullPolicy.STRICT );
             defineMethod( OperatorRegistry.get( mongo, OperatorName.MQL_EXISTS ), BuiltInMethod.MQL_EXISTS.method, NullPolicy.STRICT );
             defineMethod( OperatorRegistry.get( mongo, OperatorName.MQL_MERGE ), BuiltInMethod.MQL_MERGE.method, NullPolicy.STRICT );
+            defineMethod( OperatorRegistry.get( mongo, OperatorName.MQL_MERGE_ADD ), BuiltInMethod.MQL_MERGE_ADD.method, NullPolicy.STRICT );
             defineMethod( OperatorRegistry.get( mongo, OperatorName.MQL_PROJECT_INCLUDES ), BuiltInMethod.MQL_PROJECT_INCLUDES.method, NullPolicy.STRICT );
             defineMethod( OperatorRegistry.get( mongo, OperatorName.MQL_REPLACE_ROOT ), BuiltInMethod.MQL_REPLACE_ROOT.method, NullPolicy.STRICT );
             defineMethod( OperatorRegistry.get( mongo, OperatorName.MQL_NOT_UNSET ), BuiltInMethod.MQL_NOT_UNSET.method, NullPolicy.STRICT );
+            defineImplementor( OperatorRegistry.get( mongo, OperatorName.MQL_GEO_INTERSECTS ), NullPolicy.NONE, new MethodImplementor( BuiltInMethod.MQL_GEO_INTERSECTS.method ), false );
+            defineImplementor( OperatorRegistry.get( mongo, OperatorName.MQL_GEO_WITHIN ), NullPolicy.NONE, new MethodImplementor( BuiltInMethod.MQL_GEO_WITHIN.method ), false );
+            defineImplementor( OperatorRegistry.get( mongo, OperatorName.MQL_GEO_DISTANCE ), NullPolicy.NONE, new MethodImplementor( BuiltInMethod.MQL_GEO_DISTANCE.method ), false );
             defineMqlMethod( OperatorName.PLUS, "plus", NullPolicy.STRICT );
             defineMqlMethod( OperatorName.MINUS, "minus", NullPolicy.STRICT );
             defineMqlMethod( OperatorName.MULTIPLY, "multiply", NullPolicy.STRICT );
@@ Expand Down @@

...n/java/org/polypheny/db/algebra/enumerable/document/DocumentAggregateToAggregateRule.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -127,7 +127,7 @@ public void onMatch( AlgOptRuleCall call ) { @@
             // RexNode doc = builder.getRexBuilder().makeCall( DocumentType.ofId(), OperatorRegistry.get( QueryLanguage.from( "mongo" ), OperatorName.MQL_MERGE ), nodes );
-            call.transformTo( LogicalDocumentProject.create( enumerableAggregate, docs, List.of() ) );
+            call.transformTo( LogicalDocumentProject.create( enumerableAggregate, docs, List.of(), Map.of() ) );
             // call.transformTo( LogicalAggregate.create( alg.getInput(), alg.groupSet, alg.groupSets, alg.aggCalls ) );*/
         }
@@ Expand Down @@

.../src/main/java/org/polypheny/db/algebra/enumerable/document/DocumentFilterToCalcRule.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,5 @@
  
    /*

     * Copyright 2019-2024 The Polypheny Project

     * Copyright 2019-2025 The Polypheny Project

     *

     * Licensed under the Apache License, Version 2.0 (the "License");

     * you may not use this file except in compliance with the License.

    @@ -22,10 +22,12 @@
  
    import org.polypheny.db.algebra.core.document.DocumentFilter;

    import org.polypheny.db.algebra.enumerable.EnumerableCalc;

    import org.polypheny.db.algebra.enumerable.EnumerableConvention;

    import org.polypheny.db.algebra.enumerable.document.DocumentProjectToCalcRule.NearDetector;

    import org.polypheny.db.algebra.logical.document.LogicalDocumentFilter;

    import org.polypheny.db.algebra.operators.OperatorName;

    import org.polypheny.db.algebra.type.AlgDataType;

    import org.polypheny.db.algebra.type.DocumentType;

    import org.polypheny.db.algebra.type.AlgDataTypeField;

    import org.polypheny.db.catalog.logistic.DataModel;

    import org.polypheny.db.languages.OperatorRegistry;

    import org.polypheny.db.languages.QueryLanguage;

    import org.polypheny.db.plan.AlgCluster;

    @@ -53,13 +55,20 @@ public DocumentFilterToCalcRule() {
  
        @Override

        public AlgNode convert( AlgNode alg ) {

            final LogicalDocumentFilter filter = (LogicalDocumentFilter) alg;

            NearDetector nearDetector = new NearDetector();

            filter.accept( nearDetector );

            if ( nearDetector.containsNear ) {

                return null;

            }

            final AlgNode input = filter.getInput();

            // Create a program containing a filter.

            final RexBuilder rexBuilder = filter.getCluster().getRexBuilder();

            final AlgDataType inputRowType = input.getTupleType();

            final RexProgramBuilder programBuilder = new RexProgramBuilder( inputRowType, rexBuilder );

            NameRefReplacer replacer = new NameRefReplacer( filter.getCluster(), false );

            NameRefReplacer replacer = new NameRefReplacer( filter.getCluster(), false, alg.getInput( 0 ) );

            programBuilder.addIdentity();

            programBuilder.addCondition( filter.condition.accept( replacer ) );

            final RexProgram program = programBuilder.getProgram();

    @@ -74,26 +83,32 @@ public AlgNode convert( AlgNode alg ) {
  
        public static class NameRefReplacer extends RexShuttle {

            private final AlgCluster cluster;

            private final AlgNode input;

            boolean inplace;

            public NameRefReplacer( AlgCluster cluster, boolean inplace ) {

            public NameRefReplacer( AlgCluster cluster, boolean inplace, AlgNode input ) {

                this.cluster = cluster;

                this.inplace = inplace;

                this.input = input;

            }

            @Override

            public RexNode visitNameRef( RexNameRef nameRef ) {

                int index = 0;

                if ( input.getModel() == DataModel.RELATIONAL ) {

                    // within document model we just access the main field, if already mapped we use the data field

                    index = input.getTupleType().getFields().stream().filter( f -> f.getName().equals( "_data" ) ).map( AlgDataTypeField::getIndex ).findAny().orElse( 0 );

                }

                return new RexCall(

                        nameRef.getType(),

                        OperatorRegistry.get( QueryLanguage.from( "mql" ), OperatorName.MQL_QUERY_VALUE ),

                        RexIndexRef.of( 0, DocumentType.ofDoc() ),

                        RexIndexRef.of( index, input.getTupleType() ),

                        DocumentUtil.getStringArray( nameRef.names, cluster ) );

            }

        }

    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extend GIS Support to the Document and Graph Model #537

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Extend GIS Support to the Document and Graph Model #537

Are you sure you want to change the base?

Uh oh!

Extend GIS Support to the Document and Graph Model #537

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!