Skip to content

Commit f9c43ca

Browse files
committed
Use reflection to set the mode on dev
I don't like it, but going through the settings doesn't work in our tests since we don't depend on Neo4j EE.
1 parent 418c338 commit f9c43ca

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public DatabaseMode databaseMode(Config config, GraphDatabaseService databaseSer
5656
}
5757

5858
@Override
59-
public void setDatabaseMode(Config config, DatabaseMode databaseMode) {
59+
public void setDatabaseMode(Config config, DatabaseMode databaseMode, GraphDatabaseService databaseService) {
6060
GraphDatabaseSettings.Mode mode;
6161
switch (databaseMode) {
6262
case SINGLE:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package org.neo4j.gds.compat;
2121

22+
import org.jetbrains.annotations.TestOnly;
2223
import org.neo4j.configuration.Config;
2324
import org.neo4j.graphdb.GraphDatabaseService;
2425

@@ -28,5 +29,6 @@ public interface SettingProxyApi {
2829

2930
DatabaseMode databaseMode(Config config, GraphDatabaseService databaseService);
3031

31-
void setDatabaseMode(Config config, DatabaseMode databaseMode);
32+
@TestOnly
33+
void setDatabaseMode(Config config, DatabaseMode databaseMode, GraphDatabaseService databaseService);
3234
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package org.neo4j.gds.compat;
2121

2222
import org.jetbrains.annotations.Nullable;
23+
import org.jetbrains.annotations.TestOnly;
2324
import org.neo4j.configuration.Config;
2425
import org.neo4j.configuration.SettingValueParser;
2526
import org.neo4j.graphdb.GraphDatabaseService;
@@ -40,8 +41,9 @@ public static DatabaseMode databaseMode(Config config, GraphDatabaseService data
4041
return IMPL.databaseMode(config, databaseService);
4142
}
4243

43-
public static void setDatabaseMode(Config config, DatabaseMode databaseMode) {
44-
IMPL.setDatabaseMode(config, databaseMode);
44+
@TestOnly
45+
public static void setDatabaseMode(Config config, DatabaseMode databaseMode, GraphDatabaseService databaseService) {
46+
IMPL.setDatabaseMode(config, databaseMode, databaseService);
4547
}
4648

4749
private SettingProxy() {}

proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphStoreExportProcTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ void exportCsvWithAdditionalNodePropertiesDuplicateProperties() {
326326
void failsCsvExportWhenRunningOnCluster() {
327327
var exportName = "export";
328328
var config = GraphDatabaseApiProxy.resolveDependency(db, Config.class);
329-
SettingProxy.setDatabaseMode(config, DatabaseMode.READ_REPLICA);
329+
SettingProxy.setDatabaseMode(config, DatabaseMode.READ_REPLICA, db);
330330

331331
projectGraph();
332332

@@ -352,7 +352,7 @@ void failsCsvExportWhenRunningOnCluster() {
352352
void failsDatabaseExportWhenRunningOnCluster() {
353353
var exportName = "export";
354354
var config = GraphDatabaseApiProxy.resolveDependency(db, Config.class);
355-
SettingProxy.setDatabaseMode(config, DatabaseMode.READ_REPLICA);
355+
SettingProxy.setDatabaseMode(config, DatabaseMode.READ_REPLICA, db);
356356

357357
projectGraph();
358358

@@ -394,7 +394,7 @@ void csvEstimation() {
394394
@Test
395395
void failCsvEstimationWhenRunningOnCluster() {
396396
var config = GraphDatabaseApiProxy.resolveDependency(db, Config.class);
397-
SettingProxy.setDatabaseMode(config, DatabaseMode.READ_REPLICA);
397+
SettingProxy.setDatabaseMode(config, DatabaseMode.READ_REPLICA, db);
398398

399399
projectGraph();
400400

0 commit comments

Comments
 (0)