Restore graph from Neo4j to graph model instead of relational model

polypheny · Jan 13, 2025 · 2e5e22f · 2e5e22f
1 parent 42aaa95
commit 2e5e22f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/core/src/main/java/org/polypheny/db/algebra/rules/ScanRule.java b/core/src/main/java/org/polypheny/db/algebra/rules/ScanRule.java
@@ -53,7 +53,10 @@ public void onMatch( AlgOptRuleCall call ) {
         if ( oldAlg.getEntity().unwrap( TranslatableEntity.class ).isEmpty() ) {
             return;
         }
-        AlgNode newAlg = oldAlg.getEntity().unwrap( TranslatableEntity.class ).get().toAlg( oldAlg.getCluster(), oldAlg.getTraitSet() );
+        TranslatableEntity one = oldAlg.getEntity().unwrap( TranslatableEntity.class ).orElseThrow();
+        var oldCluster = oldAlg.getCluster();
+        var newTraitSet = oldAlg.getTraitSet();
+        AlgNode newAlg = one.toAlg( oldCluster, newTraitSet );
         call.transformTo( newAlg );
     }
 

diff --git a/plugins/neo4j-adapter/src/main/java/org/polypheny/db/adapter/neo4j/Neo4jPlugin.java b/plugins/neo4j-adapter/src/main/java/org/polypheny/db/adapter/neo4j/Neo4jPlugin.java
@@ -124,7 +124,7 @@ private static String getPhysicalGraphName( long id ) {
     }
 
 
-    private static String getMappingLabel( long id ) {
+    static String getMappingLabel( long id ) {
         return String.format( "___n_%d___", id );
     }
 
@@ -427,7 +427,7 @@ public void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities,
         public void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities, Context context ) {
             for ( PhysicalEntity entity : entities ) {
                 updateNamespace( entity.namespaceName, entity.namespaceId );
-                adapterCatalog.addPhysical( alloc, currentNamespace.createEntity( entity, List.of(), currentNamespace ) );
+                adapterCatalog.addPhysical( alloc,  currentNamespace.createGraph( entity, List.of(), this.db, this ) );
             }
         }
 

diff --git a/plugins/neo4j-adapter/src/main/java/org/polypheny/db/adapter/neo4j/NeoNamespace.java b/plugins/neo4j-adapter/src/main/java/org/polypheny/db/adapter/neo4j/NeoNamespace.java
@@ -30,6 +30,8 @@
 import org.polypheny.db.plan.Convention;
 import org.polypheny.db.schema.Namespace;
 
+import static org.polypheny.db.adapter.neo4j.Neo4jPlugin.getMappingLabel;
+
 @EqualsAndHashCode(callSuper = true)
 @Value
 public class NeoNamespace extends Namespace implements Expressible {
@@ -67,6 +69,10 @@ public NeoEntity createEntity( PhysicalEntity entity, List<? extends PhysicalFie
         return new NeoEntity( entity, fields, namespace );
     }
 
+    public NeoGraph createGraph( PhysicalEntity entity, List<? extends PhysicalField> fields, Driver db, Neo4jStore store  ) {
+        return new NeoGraph( entity, fields, this.transactionProvider, db, getMappingLabel( entity.id ), store );
+    }
+
 
     @Override
     public Expression asExpression() {