Fix graph inserts

polypheny · Dec 24, 2024 · 754daa5 · 754daa5
1 parent 822cd56
commit 754daa5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/core/src/main/java/org/polypheny/db/algebra/enumerable/lpg/EnumerableLpgValues.java b/core/src/main/java/org/polypheny/db/algebra/enumerable/lpg/EnumerableLpgValues.java
@@ -30,6 +30,7 @@
 import org.polypheny.db.algebra.enumerable.EnumerableAlg;
 import org.polypheny.db.algebra.enumerable.EnumerableAlgImplementor;
 import org.polypheny.db.algebra.enumerable.EnumerableConvention;
+import org.polypheny.db.algebra.enumerable.JavaTupleFormat;
 import org.polypheny.db.algebra.enumerable.PhysType;
 import org.polypheny.db.algebra.enumerable.PhysTypeImpl;
 import org.polypheny.db.algebra.type.AlgDataType;
@@ -59,7 +60,7 @@ public Result implement( EnumerableAlgImplementor implementor, Prefer pref ) {
         final PhysType physType = PhysTypeImpl.of(
                 implementor.getTypeFactory(),
                 getTupleType(),
-                pref.preferCustom()
+                pref.prefer( JavaTupleFormat.SCALAR)
         );
         final List<Expression> expressions = Stream.concat(
                 nodes.stream().map( n -> Expressions.newArrayInit( PolyNode.class, n.asExpression() ) ),

diff --git a/core/src/main/java/org/polypheny/db/functions/Functions.java b/core/src/main/java/org/polypheny/db/functions/Functions.java
@@ -116,6 +116,7 @@
 import org.polypheny.db.type.entity.category.PolyNumber;
 import org.polypheny.db.type.entity.category.PolyTemporal;
 import org.polypheny.db.type.entity.document.PolyDocument;
+import org.polypheny.db.type.entity.graph.GraphPropertyHolder;
 import org.polypheny.db.type.entity.graph.PolyDictionary;
 import org.polypheny.db.type.entity.numerical.PolyBigDecimal;
 import org.polypheny.db.type.entity.numerical.PolyDouble;
@@ -294,28 +295,34 @@ public static Enumerable<?> batch( final DataContext context, final Enumerable<P
 
     @SuppressWarnings("unused")
     public static Enumerable<PolyValue[]> addRelIdentifiers(final Enumerable<PolyValue[]> input, long logicalId) {
+        LogicalEntity entity = Catalog.getInstance().getSnapshot().getLogicalEntity( logicalId ).orElseThrow();
         return input.select( row -> {
-            LogicalEntity entity = Catalog.getInstance().getSnapshot().getLogicalEntity( logicalId ).orElseThrow();
             row[0] = entity.getEntryIdentifiers().getNextEntryIdentifier().getEntryIdentifierAsPolyLong();
             return row;
         } );
     }
 
     @SuppressWarnings("unused")
     public static Enumerable<PolyValue[]> addDocIdentifiers(final Enumerable<PolyValue[]> input, long logicalId) {
-        return input.select( oldRow -> {
-            PolyDocument document = (PolyDocument) oldRow[0];
-            LogicalEntity entity = Catalog.getInstance().getSnapshot().getLogicalEntity( logicalId ).orElseThrow();
-            document.put( IdentifierUtils.getIdentifierKeyAsPolyString(), entity.getEntryIdentifiers().getNextEntryIdentifier().getEntryIdentifierAsPolyLong());
-            return new PolyValue[]{document};
+        LogicalEntity entity = Catalog.getInstance().getSnapshot().getLogicalEntity( logicalId ).orElseThrow();
+        return input.select( row -> {
+            for ( PolyValue value : row ) {
+                PolyLong entryIdentifier = entity.getEntryIdentifiers().getNextEntryIdentifier().getEntryIdentifierAsPolyLong();
+                ((PolyDocument) value).put( IdentifierUtils.getIdentifierKeyAsPolyString(), entryIdentifier );
+            }
+            return row;
         } );
     }
 
     @SuppressWarnings("unused")
     public static Enumerable<PolyValue[]> addLpgIdentifiers(final Enumerable<PolyValue[]> input, long logicalId) {
-        return input.select( oldRow -> {
-
-            return oldRow;
+        LogicalEntity entity = Catalog.getInstance().getSnapshot().getLogicalEntity( logicalId ).orElseThrow();
+        return input.select( row -> {
+            for ( PolyValue value : row ) {
+                PolyLong entryIdentifier = entity.getEntryIdentifiers().getNextEntryIdentifier().getEntryIdentifierAsPolyLong();
+                ((GraphPropertyHolder) value).getProperties().put( IdentifierUtils.getIdentifierKeyAsPolyString(), entryIdentifier );
+            }
+            return row;
         } );
     }