Merge pull request #6688 from knutwalker/arrow-compat-c-7bE0XfDT

Move Neo4jLayout.of behind compat layer

Author: knutwalker

compatibility/4.4/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_44/Neo4jProxyImpl.java

@@ -650,7 +650,13 @@ 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
+    @SuppressForbidden(reason = "This is the compat specific use")
+    public Neo4jLayout neo4jLayout(Config config) {
+        return Neo4jLayout.of(config);
     }
 
     @Override

compatibility/5.1/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_51/Neo4jProxyImpl.java

@@ -763,10 +763,17 @@ 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);
     }
 
+    @Override
+    @SuppressForbidden(reason = "This is the compat specific use")
+    public Neo4jLayout neo4jLayout(Config config) {
+        return Neo4jLayout.of(config);
+    }
+
     @Override
     public BoltTransactionRunner<?, ?> boltTransactionRunner() {
         return new BoltTransactionRunnerImpl();

compatibility/5.2/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_52/Neo4jProxyImpl.java

@@ -761,10 +761,17 @@ 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);
     }
 
+    @Override
+    @SuppressForbidden(reason = "This is the compat specific use")
+    public Neo4jLayout neo4jLayout(Config config) {
+        return Neo4jLayout.of(config);
+    }
+
     @Override
     public BoltTransactionRunner<?, ?> boltTransactionRunner() {
         return new BoltTransactionRunnerImpl();

compatibility/5.3/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_53/Neo4jProxyImpl.java

@@ -761,10 +761,17 @@ 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);
     }
 
+    @Override
+    @SuppressForbidden(reason = "This is the compat specific use")
+    public Neo4jLayout neo4jLayout(Config config) {
+        return Neo4jLayout.of(config);
+    }
+
     @Override
     public BoltTransactionRunner<?, ?> boltTransactionRunner() {
         return new BoltTransactionRunnerImpl();

compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxyApi.java

@@ -63,6 +63,7 @@
 import org.neo4j.internal.schema.IndexOrder;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.layout.DatabaseLayout;
+import org.neo4j.io.layout.Neo4jLayout;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.io.pagecache.context.CursorContext;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
@@ -264,6 +265,8 @@ RecordFormats selectRecordFormatForStore(
 
     GdsDatabaseLayout databaseLayout(Config config, String databaseName);
 
+    Neo4jLayout neo4jLayout(Config config);
+
     BoltTransactionRunner<?, ?> boltTransactionRunner();
 
     HostnamePort getLocalBoltAddress(ConnectorPortRegister connectorPortRegister);

compatibility/common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxy.java

@@ -63,6 +63,7 @@
 import org.neo4j.internal.schema.IndexOrder;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.layout.DatabaseLayout;
+import org.neo4j.io.layout.Neo4jLayout;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.io.pagecache.context.CursorContext;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
@@ -398,6 +399,10 @@ public static GdsDatabaseLayout databaseLayout(Config config, String databaseNam
         return IMPL.databaseLayout(config, databaseName);
     }
 
+    public static Neo4jLayout neo4jLayout(Config config) {
+        return IMPL.neo4jLayout(config);
+    }
+
     public static BoltTransactionRunner<?, ?> boltTransactionRunner() {
         return IMPL.boltTransactionRunner();
     }

etc/forbidden-apis

@@ -11,6 +11,9 @@ org.neo4j.logging.internal.LogService#getInternalLog(java.lang.Class) @ Use Neo4
 org.neo4j.configuration.SettingImpl#newBuilder(java.lang.String, org.neo4j.configuration.SettingValueParser, java.lang.Object) @ Use SettingProxy#newBuilder instead.
 org.neo4j.configuration.SettingBuilder(java.lang.String, org.neo4j.configuration.SettingValueParser, java.lang.Object) @ Use SettingProxy#newBuilder instead.
 
+org.neo4j.io.layout.Neo4jLayout.of(org.neo4j.configuration.Config) @ Use Neo4jProxy.neo4jLayout instead.
+org.neo4j.io.layout.Neo4jLayout.of(org.neo4j.graphdb.config.Configuration) @ Use Neo4jProxy.neo4jLayout instead.
+
 java.util.ServiceLoader#load(java.lang.Class) @ Must pass explicit class loader with service loading, as the context class loader for the thread may be the wrong one
 
 org.neo4j.kernel.api.procedure.CallableProcedure @ Implement org.neo4j.gds.compat.CompatCallableProcedure instead and call Neo4jProxy.callableProcedure(compat).

neo4j-adapter/src/main/java/org/neo4j/gds/compat/GraphDatabaseApiProxy.java

@@ -21,7 +21,6 @@
 
 import org.jetbrains.annotations.TestOnly;
 import org.neo4j.common.DependencyResolver;
-import org.neo4j.configuration.Config;
 import org.neo4j.exceptions.KernelException;
 import org.neo4j.gds.annotation.ValueClass;
 import org.neo4j.graphdb.GraphDatabaseService;
@@ -30,7 +29,6 @@
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.io.layout.DatabaseLayout;
-import org.neo4j.io.layout.Neo4jLayout;
 import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.procedure.GlobalProcedures;
@@ -114,11 +112,6 @@ public static DatabaseLayout databaseLayout(GraphDatabaseService db) {
         return cast(db).databaseLayout();
     }
 
-    public static Neo4jLayout neo4jLayout(GraphDatabaseService db) {
-        Config configuration = resolveDependency(db, Config.class);
-        return Neo4jLayout.of(configuration);
-    }
-
     public static DbmsInfo dbmsInfo(GraphDatabaseService db) {
         return cast(db).dbmsInfo();
     }