Skip to content

Commit ec60c32

Browse files
committed
Update parameter syntax
1 parent ea30251 commit ec60c32

13 files changed

+16
-16
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
@@ -39,7 +39,7 @@ public class RoutingProcedureRunner
3939
{
4040
static final String GET_SERVERS = "dbms.cluster.routing.getServers";
4141
static final String GET_ROUTING_TABLE_PARAM = "context";
42-
static final String GET_ROUTING_TABLE = "dbms.cluster.routing.getRoutingTable({" + GET_ROUTING_TABLE_PARAM + "})";
42+
static final String GET_ROUTING_TABLE = "dbms.cluster.routing.getRoutingTable($" + GET_ROUTING_TABLE_PARAM + ")";
4343

4444
private final RoutingContext context;
4545

driver/src/test/resources/acquire_endpoints.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
!: AUTO RESET
33
!: AUTO PULL_ALL
44

5-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
5+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
66
PULL_ALL
77
S: SUCCESS {"fields": ["ttl", "servers"]}
88
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_v3.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
C: HELLO {"scheme": "none", "user_agent": "neo4j-java/dev"}
55
S: SUCCESS {"server": "Neo4j/9.9.9", "connection_id": "bolt-123456789"}
6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}} {}
6+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
77
PULL_ALL
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"}]]

driver/src/test/resources/acquire_endpoints_v3_leader_killed.script

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33

44
C: HELLO {"scheme": "none", "user_agent": "neo4j-java/dev"}
55
S: SUCCESS {"server": "Neo4j/9.9.9", "connection_id": "bolt-123456789"}
6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}} {}
6+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
77
PULL_ALL
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9004"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001"], "role": "ROUTE"}]]
1010
SUCCESS {}
11-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}} {}
11+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
1212
PULL_ALL
1313
S: SUCCESS {"fields": ["ttl", "servers"]}
1414
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9004"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001"], "role": "ROUTE"}]]
1515
SUCCESS {}
16-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}} {}
16+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
1717
PULL_ALL
1818
S: SUCCESS {"fields": ["ttl", "servers"]}
1919
RECORD [9223372036854775807, [{"addresses": [],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001"], "role": "ROUTE"}]]
2020
SUCCESS {}
21-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}} {}
21+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
2222
PULL_ALL
2323
S: SUCCESS {"fields": ["ttl", "servers"]}
2424
RECORD [9223372036854775807, [{"addresses": ["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"], "role": "ROUTE"}]]

driver/src/test/resources/discover_no_writers.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
!: AUTO RESET
33
!: AUTO PULL_ALL
44

5-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
5+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
66
PULL_ALL
77
S: SUCCESS {"fields": ["ttl", "servers"]}
88
RECORD [9223372036854775807, [{"addresses": [],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9004","127.0.0.1:9005"], "role": "ROUTE"}]]

driver/src/test/resources/discover_one_router.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
!: AUTO RESET
33
!: AUTO PULL_ALL
44

5-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
5+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
66
PULL_ALL
77
S: SUCCESS {"fields": ["ttl", "servers"]}
88
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001","127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9003","127.0.0.1:9004"], "role": "READ"},{"addresses": ["127.0.0.1:9005"], "role": "ROUTE"}]]

driver/src/test/resources/discover_servers.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
!: AUTO RESET
33
!: AUTO PULL_ALL
44

5-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
5+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
66
PULL_ALL
77
S: SUCCESS {"fields": ["ttl", "servers"]}
88
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003","127.0.0.1:9004"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]

driver/src/test/resources/failed_discovery.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
!: AUTO RESET
33
!: AUTO PULL_ALL
44

5-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
5+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
66
PULL_ALL
77
S: FAILURE {"code": "Neo.ClientError.General.Unknown", "message": "wut!"}
88
S: IGNORED

driver/src/test/resources/get_routing_table.script

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

55
S: SUCCESS {"server": "Neo4j/3.2.2"}
6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
6+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
77
PULL_ALL
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "ROUTE"}]]

driver/src/test/resources/get_routing_table_with_context.script

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

55
S: SUCCESS {"server": "Neo4j/3.2.3"}
6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {"policy": "my_policy", "region": "china"}}
6+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"policy": "my_policy", "region": "china"}}
77
PULL_ALL
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "ROUTE"}]]

driver/src/test/resources/non_discovery_server.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
!: AUTO RESET
33
!: AUTO PULL_ALL
44

5-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
5+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
66
C: PULL_ALL
77
S: FAILURE {"code": "Neo.ClientError.Procedure.ProcedureNotFound", "message": "blabla"}
88
S: IGNORED

driver/src/test/resources/rediscover_using_initial_router.script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
!: AUTO RUN "COMMIT" {}
66
!: AUTO RUN "ROLLBACK" {}
77

8-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
8+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
99
PULL_ALL
1010
S: SUCCESS {"fields": ["ttl", "servers"]}
1111
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001","127.0.0.1:9009","127.0.0.1:9010"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9011"], "role": "ROUTE"}]]

examples/src/test/resources/get_routing_table_only.script

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

55
S: SUCCESS {"server": "Neo4j/3.2.2"}
6-
C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
6+
C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
77
PULL_ALL
88
S: SUCCESS {"fields": ["ttl", "servers"]}
99
RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001"], "role": "ROUTE"}]]

0 commit comments

Comments
 (0)