Skip to content

Commit 9c7d6eb

Browse files
committed
Check if is composite without database manager
1 parent 6e13a6e commit 9c7d6eb

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

compatibility/5-common/neo4j-kernel-adapter/src/main/java17/org/neo4j/gds/compat/_5x/CommonNeo4jProxyImpl.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.neo4j.configuration.helpers.DatabaseNameValidator;
3131
import org.neo4j.dbms.api.DatabaseManagementService;
3232
import org.neo4j.exceptions.KernelException;
33-
import org.neo4j.fabric.FabricDatabaseManager;
3433
import org.neo4j.gds.annotation.SuppressForbidden;
3534
import org.neo4j.gds.compat.CompatCallableProcedure;
3635
import org.neo4j.gds.compat.CompatExecutionMonitor;
@@ -104,6 +103,8 @@
104103
import org.neo4j.kernel.api.KernelTransactionHandle;
105104
import org.neo4j.kernel.api.procedure.CallableProcedure;
106105
import org.neo4j.kernel.api.procedure.CallableUserAggregationFunction;
106+
import org.neo4j.kernel.database.DatabaseReferenceImpl;
107+
import org.neo4j.kernel.database.DatabaseReferenceRepository;
107108
import org.neo4j.kernel.database.NormalizedDatabaseName;
108109
import org.neo4j.kernel.impl.coreapi.InternalTransaction;
109110
import org.neo4j.kernel.impl.index.schema.IndexImporterFactoryImpl;
@@ -808,8 +809,11 @@ public TransactionalContext newQueryContext(
808809

809810
@Override
810811
public boolean isCompositeDatabase(GraphDatabaseService databaseService) {
811-
var databaseManager = GraphDatabaseApiProxy.resolveDependency(databaseService, FabricDatabaseManager.class);
812-
return databaseManager.isFabricDatabase(GraphDatabaseApiProxy.databaseId(databaseService));
812+
var databaseId = GraphDatabaseApiProxy.databaseId(databaseService);
813+
var repo = GraphDatabaseApiProxy.resolveDependency(databaseService, DatabaseReferenceRepository.class);
814+
return repo.getCompositeDatabaseReferences().stream()
815+
.map(DatabaseReferenceImpl.Internal::databaseId)
816+
.anyMatch(databaseId::equals);
813817
}
814818

815819
public abstract CursorContextFactory cursorContextFactory(Optional<PageCacheTracer> pageCacheTracer);

0 commit comments

Comments
 (0)