Skip to content

Commit 418c338

Browse files
committed
Read mode from db directly instead of the settings
1 parent 05b1e8d commit 418c338

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.neo4j.gds.annotation.SuppressForbidden;
2626
import org.neo4j.gds.compat.DatabaseMode;
2727
import org.neo4j.gds.compat.SettingProxyApi;
28+
import org.neo4j.graphdb.GraphDatabaseService;
2829
import org.neo4j.graphdb.config.Setting;
2930

3031
public class SettingProxyImpl implements SettingProxyApi {
@@ -40,7 +41,7 @@ public <T> Setting<T> setting(org.neo4j.gds.compat.Setting<T> setting) {
4041
}
4142

4243
@Override
43-
public DatabaseMode databaseMode(Config config) {
44+
public DatabaseMode databaseMode(Config config, GraphDatabaseService databaseService) {
4445
var mode = config.get(GraphDatabaseSettings.mode);
4546
switch (mode) {
4647
case SINGLE:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
package org.neo4j.gds.compat;
2121

2222
import org.neo4j.configuration.Config;
23+
import org.neo4j.graphdb.GraphDatabaseService;
2324

2425
public interface SettingProxyApi {
2526
// public, otherwise checkstyle complains that "'<' is preceded with whitespace."
2627
public <T> org.neo4j.graphdb.config.Setting<T> setting(Setting<T> setting);
2728

28-
DatabaseMode databaseMode(Config config);
29+
DatabaseMode databaseMode(Config config, GraphDatabaseService databaseService);
2930

3031
void setDatabaseMode(Config config, DatabaseMode databaseMode);
3132
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.jetbrains.annotations.Nullable;
2323
import org.neo4j.configuration.Config;
2424
import org.neo4j.configuration.SettingValueParser;
25+
import org.neo4j.graphdb.GraphDatabaseService;
2526

2627
public final class SettingProxy {
2728

@@ -35,8 +36,8 @@ public static <T> Setting.Builder<T> newBuilder(
3536
return ImmutableSetting.builder(name, parser, defaultValue).convert(IMPL::setting);
3637
}
3738

38-
public static DatabaseMode databaseMode(Config config) {
39-
return IMPL.databaseMode(config);
39+
public static DatabaseMode databaseMode(Config config, GraphDatabaseService databaseService) {
40+
return IMPL.databaseMode(config, databaseService);
4041
}
4142

4243
public static void setDatabaseMode(Config config, DatabaseMode databaseMode) {

proc/common/src/main/java/org/neo4j/gds/preconditions/ClusterRestrictions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private ClusterRestrictions() {}
3131

3232
public static void disallowRunningOnCluster(GraphDatabaseAPI api, String detail) throws IllegalStateException {
3333
var config = GraphDatabaseApiProxy.resolveDependency(api, Config.class);
34-
var neo4jMode = SettingProxy.databaseMode(config);
34+
var neo4jMode = SettingProxy.databaseMode(config, api);
3535
if (neo4jMode != DatabaseMode.SINGLE) {
3636
throw new IllegalStateException(
3737
"The requested operation (" + detail +

0 commit comments

Comments
 (0)