minor adjustment for model serialization

polypheny · Oct 18, 2023 · e8af3b3 · e8af3b3
1 parent c6b0dcc
commit e8af3b3
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 6 deletions.
diff --git a/core/src/main/java/org/polypheny/db/algebra/enumerable/EnumUtils.java b/core/src/main/java/org/polypheny/db/algebra/enumerable/EnumUtils.java
@@ -56,6 +56,7 @@
 import org.polypheny.db.rex.RexNode;
 import org.polypheny.db.rex.RexProgramBuilder;
 import org.polypheny.db.type.PolyType;
+import org.polypheny.db.type.PolyTypeFamily;
 import org.polypheny.db.type.entity.PolyBoolean;
 import org.polypheny.db.type.entity.PolyList;
 import org.polypheny.db.type.entity.PolyValue;
@@ -98,7 +99,7 @@ static Type javaClass( JavaTypeFactory typeFactory, AlgDataType type ) {
 
 
     public static Class<?> javaRowClass( JavaTypeFactory typeFactory, AlgDataType type ) {
-        if ( type.isStruct() && type.getFieldCount() == 1 ) {
+        if ( type.isStruct() && type.getFieldCount() == 1 && !PolyTypeFamily.GRAPH.contains( type ) ) {
             type = type.getFieldList().get( 0 ).getType();
         }
         final Type clazz = typeFactory.getJavaClass( type );

diff --git a/core/src/main/java/org/polypheny/db/type/entity/PolyList.java b/core/src/main/java/org/polypheny/db/type/entity/PolyList.java
@@ -100,6 +100,12 @@ public static <E extends PolyValue> PolyList<E> of( E... values ) {
     }
 
 
+    @SuppressWarnings("unused")
+    public static <E extends PolyValue> PolyList<E> ofArray( E[] values ) {
+        return new PolyList<>( values );
+    }
+
+
     /**
      * Required due to limitation of call, where interfaces lead to errors.
      */

diff --git a/core/src/main/java/org/polypheny/db/type/entity/PolyValue.java b/core/src/main/java/org/polypheny/db/type/entity/PolyValue.java
@@ -96,6 +96,7 @@
         PolyBigDecimal.class,
         PolyTimeStamp.class,
         PolyDocument.class,
+        PolyDictionary.class,
         PolyMap.class,
         PolyList.class,
         PolyGraph.class,

diff --git a/core/src/main/java/org/polypheny/db/type/entity/document/PolyDocument.java b/core/src/main/java/org/polypheny/db/type/entity/document/PolyDocument.java
@@ -16,6 +16,8 @@
 
 package org.polypheny.db.type.entity.document;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import io.activej.serializer.BinaryInput;
 import io.activej.serializer.BinaryOutput;
 import io.activej.serializer.BinarySerializer;
@@ -30,6 +32,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.linq4j.tree.Expression;
 import org.apache.calcite.linq4j.tree.Expressions;
+import org.jetbrains.annotations.Nullable;
+import org.polypheny.db.catalog.exceptions.GenericRuntimeException;
 import org.polypheny.db.type.PolySerializable;
 import org.polypheny.db.type.PolyType;
 import org.polypheny.db.type.entity.PolyString;
@@ -66,8 +70,19 @@ public PolyDocument( Pair<PolyString, PolyValue>... value ) {
 
 
     public static PolyDocument parse( String string ) {
-        log.warn( "todo wfwefcw" );
-        return null;
+        throw new GenericRuntimeException( "error on parsing Document" );
+    }
+
+
+    @Override
+    public @Nullable String toTypedJson() {
+        try {
+            return JSON_WRAPPER.writerFor( new TypeReference<PolyDocument>() {
+            } ).writeValueAsString( this );
+        } catch ( JsonProcessingException e ) {
+            log.warn( "Error on serializing typed JSON." );
+            return null;
+        }
     }
 
 

diff --git a/core/src/main/java/org/polypheny/db/type/entity/graph/PolyDictionary.java b/core/src/main/java/org/polypheny/db/type/entity/graph/PolyDictionary.java
@@ -17,6 +17,8 @@
 package org.polypheny.db.type.entity.graph;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import io.activej.serializer.BinaryInput;
 import io.activej.serializer.BinaryOutput;
 import io.activej.serializer.BinarySerializer;
@@ -26,15 +28,18 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.linq4j.tree.Expression;
 import org.apache.calcite.linq4j.tree.Expressions;
+import org.jetbrains.annotations.Nullable;
 import org.polypheny.db.algebra.enumerable.EnumUtils;
 import org.polypheny.db.type.PolySerializable;
 import org.polypheny.db.type.entity.PolyString;
 import org.polypheny.db.type.entity.PolyValue;
 import org.polypheny.db.type.entity.relational.PolyMap;
 import org.polypheny.db.util.BuiltInMethod;
 
+@Slf4j
 public class PolyDictionary extends PolyMap<PolyString, PolyValue> {
 
 
@@ -62,6 +67,18 @@ public Expression asExpression() {
     }
 
 
+    @Override
+    public @Nullable String toTypedJson() {
+        try {
+            return JSON_WRAPPER.writerFor( new TypeReference<PolyDictionary>() {
+            } ).writeValueAsString( this );
+        } catch ( JsonProcessingException e ) {
+            log.warn( "Error on serializing typed JSON." );
+            return null;
+        }
+    }
+
+
     public static PolyDictionary fromString( String json ) {
         return PolyValue.fromTypedJson( json, PolyDictionary.class );
     }

diff --git a/core/src/main/java/org/polypheny/db/type/entity/graph/PolyPath.java b/core/src/main/java/org/polypheny/db/type/entity/graph/PolyPath.java
@@ -30,6 +30,7 @@
 import org.polypheny.db.algebra.type.AlgDataType;
 import org.polypheny.db.algebra.type.AlgDataTypeField;
 import org.polypheny.db.algebra.type.AlgDataTypeFieldImpl;
+import org.polypheny.db.catalog.exceptions.GenericRuntimeException;
 import org.polypheny.db.type.PolySerializable;
 import org.polypheny.db.type.PolyType;
 import org.polypheny.db.type.entity.PolyList;
@@ -351,7 +352,7 @@ public int compareTo( @NotNull PolyValue o ) {
 
         @Override
         public Expression asExpression() {
-            throw new RuntimeException( "Cannot transform PolyPath." );
+            throw new GenericRuntimeException( "Cannot transform PolyPath." );
         }
 
 

diff --git a/core/src/main/java/org/polypheny/db/type/entity/relational/PolyMap.java b/core/src/main/java/org/polypheny/db/type/entity/relational/PolyMap.java
@@ -17,7 +17,9 @@
 package org.polypheny.db.type.entity.relational;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.type.TypeReference;
 import io.activej.serializer.BinaryInput;
 import io.activej.serializer.BinaryOutput;
 import io.activej.serializer.BinarySerializer;
@@ -32,6 +34,7 @@
 import lombok.Value;
 import lombok.experimental.Delegate;
 import lombok.experimental.NonFinal;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.linq4j.tree.Expression;
 import org.apache.calcite.linq4j.tree.Expressions;
 import org.jetbrains.annotations.NotNull;
@@ -45,6 +48,7 @@
 @EqualsAndHashCode(callSuper = true)
 @Value(staticConstructor = "of")
 @NonFinal
+@Slf4j
 public class PolyMap<K extends PolyValue, V extends PolyValue> extends PolyValue implements Map<K, V> {
 
     @Delegate
@@ -119,6 +123,17 @@ public Expression asExpression() {
     }
 
 
+    @Override
+    public @Nullable String toTypedJson() {
+        try {
+            return JSON_WRAPPER.writerFor( new TypeReference<PolyMap<PolyValue, PolyValue>>() {
+            } ).writeValueAsString( this );
+        } catch ( JsonProcessingException e ) {
+            log.warn( "Error on serializing typed JSON." );
+            return null;
+        }
+    }
+
     @Override
     public PolySerializable copy() {
         return PolySerializable.deserialize( serialize(), PolyMap.class );

diff --git a/core/src/main/java/org/polypheny/db/util/BuiltInMethod.java b/core/src/main/java/org/polypheny/db/util/BuiltInMethod.java
@@ -220,7 +220,7 @@ public enum BuiltInMethod {
     MAP_OF_ENTRIES( ImmutableMap.class, "copyOf", List.class ),
     ARRAY( Functions.class, "array", Object[].class ),
     FLAT_PRODUCT( Functions.class, "flatProduct", int[].class, boolean.class, FlatProductInputType[].class ),
-    LIST_N( PolyList.class, "of", Comparable[].class ),
+    LIST_N( PolyList.class, "ofArray", PolyValue[].class ),
     LIST2( ComparableList.class, "of", Object.class, Object.class ),
     LIST3( ComparableList.class, "of", Object.class, Object.class, Object.class ),
     LIST4( ComparableList.class, "of", Object.class, Object.class, Object.class, Object.class ),

diff --git a/plugins/cypher-language/src/main/java/org/polypheny/db/cypher/expression/CypherVariable.java b/plugins/cypher-language/src/main/java/org/polypheny/db/cypher/expression/CypherVariable.java
@@ -68,7 +68,7 @@ public Pair<PolyString, RexNode> getRex( CypherContext context, RexType type ) {
                 for ( AlgDataTypeField pathField : field.getType().getFieldList() ) {
                     if ( pathField.getName().equals( name ) ) {
                         // search r -> RowType(Path(r:Edge, n:Node))
-                        RexIndexRef pathRef = context.rexBuilder.makeInputRef( node.getRowType().getFieldList().get( field.getIndex() ).getType(), field.getIndex() );
+                        RexIndexRef pathRef = context.rexBuilder.makeInputRef( field.getType(), field.getIndex() );
                         return Pair.of(
                                 PolyString.of( name ),
                                 context.rexBuilder.makeCall(