Skip to content

Commit aa332d4

Browse files
author
Zhen Li
committed
Changed from dbms.cluster.routing.getRoutingTable to dbms.routing.getRoutingTable, as this procedure is not only used by cluster but also single instance.
1 parent d09054a commit aa332d4

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingProcedureRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class RoutingProcedureRunner
4646
static final String ROUTING_CONTEXT = "context";
4747
static final String GET_ROUTING_TABLE = "dbms.cluster.routing.getRoutingTable({" + ROUTING_CONTEXT + "})";
4848
static final String DATABASE_NAME = "database";
49-
static final String MULTI_DB_GET_ROUTING_TABLE = String.format( "dbms.cluster.routing.getRoutingTable({%s}, {%s})", ROUTING_CONTEXT, DATABASE_NAME );
49+
static final String MULTI_DB_GET_ROUTING_TABLE = String.format( "dbms.routing.getRoutingTable({%s}, {%s})", ROUTING_CONTEXT, DATABASE_NAME );
5050

5151
private final RoutingContext context;
5252

‎driver/src/test/resources/acquire_endpoints_v4.script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
!: AUTO HELLO
44
!: AUTO GOODBYE
55

6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": null} {"mode": "r", "db": "system"}
6+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": null} {"mode": "r", "db": "system"}
77
PULL {"n": -1}
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
1010
SUCCESS {}
11-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
11+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
1212
PULL {"n": -1}
1313
S: SUCCESS {"fields": ["ttl", "servers"]}
1414
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]

‎driver/src/test/resources/acquire_endpoints_v4_database_not_found.script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
!: AUTO HELLO
44
!: AUTO GOODBYE
55

6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": null} {"mode": "r", "db": "system"}
6+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": null} {"mode": "r", "db": "system"}
77
PULL {"n": -1}
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
1010
SUCCESS {}
11-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
11+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
1212
PULL {"n": -1}
1313
S: FAILURE {"code": "Neo.ClientError.Database.DatabaseNotFound", "message": "wut!"}
1414
IGNORED

‎driver/src/test/resources/acquire_endpoints_v4_empty.script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
!: AUTO HELLO
44
!: AUTO GOODBYE
55

6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": null} {"mode": "r", "db": "system"}
6+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": null} {"mode": "r", "db": "system"}
77
PULL {"n": -1}
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
1010
SUCCESS {}
11-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
11+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
1212
PULL {"n": -1}
1313
S: SUCCESS {"fields": ["ttl", "servers"]}
1414
RECORD [9223372036854775807, []]

‎driver/src/test/resources/acquire_endpoints_v4_multi_db.script

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
!: AUTO HELLO
44
!: AUTO GOODBYE
55

6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": null} {"mode": "r", "db": "system"}
6+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": null} {"mode": "r", "db": "system"}
77
PULL {"n": -1}
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
1010
SUCCESS {}
11-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "Unreachable"} {"mode": "r", "db": "system"}
11+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "Unreachable"} {"mode": "r", "db": "system"}
1212
PULL {"n": -1}
1313
S: SUCCESS {"fields": ["ttl", "servers"]}
1414
RECORD [9223372036854775807, []]
1515
SUCCESS {}
16-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
16+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
1717
PULL {"n": -1}
1818
S: SUCCESS {"fields": ["ttl", "servers"]}
1919
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]

‎driver/src/test/resources/acquire_endpoints_v4_with_db.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
!: AUTO HELLO
44
!: AUTO GOODBYE
55

6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
6+
C: RUN "CALL dbms.routing.getRoutingTable({context}, {database})" {"context": {}, "database": "myDatabase"} {"mode": "r", "db": "system"}
77
PULL {"n": -1}
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]

0 commit comments

Comments
 (0)