Use neo4jLayout compat in databaseLayout

knutwalker · knutwalker · commit ebf232bea66f · 2022-12-19T18:58:48.000+01:00
diff --git a/compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java b/compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java
@@ -650,7 +650,7 @@ public void configureRecordFormat(Config.Builder configBuilder, String recordFor
 
     @Override
     public GdsDatabaseLayout databaseLayout(Config config, String databaseName) {
-        return new GdsDatabaseLayoutImpl(Neo4jLayout.of(config).databaseLayout(databaseName));
+        return new GdsDatabaseLayoutImpl(neo4jLayout(config).databaseLayout(databaseName));
     }
 
     @Override
diff --git a/compatibility/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/Neo4jProxyImpl.java b/compatibility/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/Neo4jProxyImpl.java
@@ -763,7 +763,8 @@ public void configureRecordFormat(Config.Builder configBuilder, String recordFor
     @Override
     public GdsDatabaseLayout databaseLayout(Config config, String databaseName) {
         var storageEngineFactory = StorageEngineFactory.selectStorageEngine(config);
-        var databaseLayout =  storageEngineFactory.formatSpecificDatabaseLayout(Neo4jLayout.of(config).databaseLayout(databaseName));
+        var dbLayout = neo4jLayout(config).databaseLayout(databaseName);
+        var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(dbLayout);
         return new GdsDatabaseLayoutImpl(databaseLayout);
     }
 
diff --git a/compatibility/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/Neo4jProxyImpl.java b/compatibility/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/Neo4jProxyImpl.java
@@ -761,7 +761,8 @@ public void configureRecordFormat(Config.Builder configBuilder, String recordFor
     @Override
     public GdsDatabaseLayout databaseLayout(Config config, String databaseName) {
         var storageEngineFactory = StorageEngineFactory.selectStorageEngine(config);
-        var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(Neo4jLayout.of(config).databaseLayout(databaseName));
+        var dbLayout = neo4jLayout(config).databaseLayout(databaseName);
+        var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(dbLayout);
         return new GdsDatabaseLayoutImpl(databaseLayout);
     }
 
diff --git a/compatibility/5.3/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_53/Neo4jProxyImpl.java b/compatibility/5.3/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_53/Neo4jProxyImpl.java
@@ -761,7 +761,8 @@ public void configureRecordFormat(Config.Builder configBuilder, String recordFor
     @Override
     public GdsDatabaseLayout databaseLayout(Config config, String databaseName) {
         var storageEngineFactory = StorageEngineFactory.selectStorageEngine(config);
-        var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(Neo4jLayout.of(config).databaseLayout(databaseName));
+        var dbLayout = neo4jLayout(config).databaseLayout(databaseName);
+        var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(dbLayout);
         return new GdsDatabaseLayoutImpl(databaseLayout);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,7 @@ public void configureRecordFormat(Config.Builder configBuilder, String recordFor`
`650`	`650`
`651`	`651`	`@Override`
`652`	`652`	`public GdsDatabaseLayout databaseLayout(Config config, String databaseName) {`
`653`		`- return new GdsDatabaseLayoutImpl(Neo4jLayout.of(config).databaseLayout(databaseName));`
	`653`	`+ return new GdsDatabaseLayoutImpl(neo4jLayout(config).databaseLayout(databaseName));`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,8 @@ public void configureRecordFormat(Config.Builder configBuilder, String recordFor`
`763`	`763`	`@Override`
`764`	`764`	`public GdsDatabaseLayout databaseLayout(Config config, String databaseName) {`
`765`	`765`	`var storageEngineFactory = StorageEngineFactory.selectStorageEngine(config);`
`766`		`- var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(Neo4jLayout.of(config).databaseLayout(databaseName));`
	`766`	`+ var dbLayout = neo4jLayout(config).databaseLayout(databaseName);`
	`767`	`+ var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(dbLayout);`
`767`	`768`	`return new GdsDatabaseLayoutImpl(databaseLayout);`
`768`	`769`	`}`
`769`	`770`
Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,8 @@ public void configureRecordFormat(Config.Builder configBuilder, String recordFor`
`761`	`761`	`@Override`
`762`	`762`	`public GdsDatabaseLayout databaseLayout(Config config, String databaseName) {`
`763`	`763`	`var storageEngineFactory = StorageEngineFactory.selectStorageEngine(config);`
`764`		`- var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(Neo4jLayout.of(config).databaseLayout(databaseName));`
	`764`	`+ var dbLayout = neo4jLayout(config).databaseLayout(databaseName);`
	`765`	`+ var databaseLayout = storageEngineFactory.formatSpecificDatabaseLayout(dbLayout);`
`765`	`766`	`return new GdsDatabaseLayoutImpl(databaseLayout);`
`766`	`767`	`}`
`767`	`768`