Send address to routing procedure on 4.0

Peter Wilhelmsson · 2hdddg · commit 5b1c2ebbb727 · 2020-06-12T11:02:50.000+02:00
diff --git a/src/internal/routing-util.js b/src/internal/routing-util.js
@@ -148,13 +148,10 @@ export default class RoutingUtil {
       if (protocolVersion >= 4.0) {
         query = CALL_GET_ROUTING_TABLE_MULTI_DB
         params = {
-          context: this._routingContext,
+          context: this._routingContext || {},
           database: database || null
         }
-        if (protocolVersion >= 4.1) {
-          params.context = params.context || {}
-          params.context.address = this._initialAddress
-        }
+        params.context.address = this._initialAddress
       } else {
         query = CALL_GET_ROUTING_TABLE
         params = { context: this._routingContext }
diff --git a/test/internal/node/routing.driver.boltkit.test.js b/test/internal/node/routing.driver.boltkit.test.js
@@ -2242,21 +2242,21 @@ describe('#stub-routing routing driver with stub server', () => {
       // Given
       const router1 = await boltStub.start(
         './test/resources/boltstub/v4/acquire_endpoints_aDatabase_no_servers.script',
-        9001
+        9002
       )
       const router2 = await boltStub.start(
         './test/resources/boltstub/v4/acquire_endpoints_aDatabase.script',
-        9002
+        9003
       )
       const reader1 = await boltStub.start(
         './test/resources/boltstub/v4/read_from_aDatabase.script',
         9005
       )
 
-      const driver = boltStub.newDriver('neo4j://127.0.0.1:9000', {
+      const driver = boltStub.newDriver('neo4j://127.0.0.1:9001', {
         resolver: address => [
-          'neo4j://127.0.0.1:9001',
-          'neo4j://127.0.0.1:9002'
+          'neo4j://127.0.0.1:9002',
+          'neo4j://127.0.0.1:9003'
         ]
       })
 
diff --git a/test/internal/routing-util.test.js b/test/internal/routing-util.test.js
@@ -237,7 +237,7 @@ describe('#unit RoutingUtil', () => {
         'CALL dbms.routing.getRoutingTable($context, $database)'
       ])
       expect(connection.seenParameters).toEqual([
-        { context: {}, database: null }
+        { context: { address: '127.0.0.1' }, database: null }
       ])
       expect(connection.seenProtocolOptions).toEqual([
         jasmine.objectContaining({
@@ -264,7 +264,7 @@ describe('#unit RoutingUtil', () => {
         'CALL dbms.routing.getRoutingTable($context, $database)'
       ])
       expect(connection.seenParameters).toEqual([
-        { context: {}, database: null }
+        { context: { address: '127.0.0.1' }, database: null }
       ])
       expect(connection.seenProtocolOptions).toEqual([
         jasmine.objectContaining({
@@ -290,7 +290,7 @@ describe('#unit RoutingUtil', () => {
         'CALL dbms.routing.getRoutingTable($context, $database)'
       ])
       expect(connection.seenParameters).toEqual([
-        { context: {}, database: null }
+        { context: { address: '127.0.0.1' }, database: null }
       ])
       expect(connection.seenProtocolOptions).toEqual([
         jasmine.objectContaining({
@@ -515,7 +515,7 @@ describe('#unit RoutingUtil', () => {
   }
 
   function callRoutingProcedure (session, database, routingContext) {
-    const util = new RoutingUtil(routingContext || {})
+    const util = new RoutingUtil(routingContext || {}, '127.0.0.1')
     return util.callRoutingProcedure(session, database, ROUTER_ADDRESS)
   }
 
diff --git a/test/resources/boltstub/v4/acquire_endpoints_aDatabase.script b/test/resources/boltstub/v4/acquire_endpoints_aDatabase.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {}, "database": "aDatabase"} {"mode": "r", "db": "system"}
+C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {"address": "127.0.0.1:9001"}, "database": "aDatabase"} {"mode": "r", "db": "system"}
    PULL {"n": -1}
 S: SUCCESS {"fields": ["ttl", "servers"]}
    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"}]]
diff --git a/test/resources/boltstub/v4/acquire_endpoints_aDatabase_no_servers.script b/test/resources/boltstub/v4/acquire_endpoints_aDatabase_no_servers.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {}, "database":"aDatabase"} {"mode": "r", "db": "system"}
+C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {"address": "127.0.0.1:9001"}, "database":"aDatabase"} {"mode": "r", "db": "system"}
    PULL {"n": -1}
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, []]
diff --git a/test/resources/boltstub/v4/acquire_endpoints_aDatabase_with_bookmark.script b/test/resources/boltstub/v4/acquire_endpoints_aDatabase_with_bookmark.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {}, "database": "aDatabase"} {"mode": "r", "db": "system", "bookmarks": ["system:1111", "aDatabase:5555"]}
+C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {"address":"127.0.0.1:9001"}, "database": "aDatabase"} {"mode": "r", "db": "system", "bookmarks": ["system:1111", "aDatabase:5555"]}
    PULL {"n": -1}
 S: SUCCESS {"fields": ["ttl", "servers"]}
    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"}]]
diff --git a/test/resources/boltstub/v4/acquire_endpoints_db_not_found.script b/test/resources/boltstub/v4/acquire_endpoints_db_not_found.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {}, "database": "aDatabase"} {"mode": "r", "db": "system"}
+C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {"address": "127.0.0.1:9001"}, "database": "aDatabase"} {"mode": "r", "db": "system"}
    PULL {"n": -1}
 S: FAILURE {"code": "Neo.ClientError.Database.DatabaseNotFound", "message": "database not found"}
    IGNORED
diff --git a/test/resources/boltstub/v4/acquire_endpoints_default_database.script b/test/resources/boltstub/v4/acquire_endpoints_default_database.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {}, "database": null} {"mode": "r", "db": "system"}
+C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": {"address": "127.0.0.1:9001"}, "database": null} {"mode": "r", "db": "system"}
    PULL {"n": -1}
 S: SUCCESS {"fields": ["ttl", "servers"]}
    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"}]]

Original file line number	Diff line number	Diff line change
`@@ -2242,21 +2242,21 @@ describe('#stub-routing routing driver with stub server', () => {`
`2242`	`2242`	`// Given`
`2243`	`2243`	`const router1 = await boltStub.start(`
`2244`	`2244`	`'./test/resources/boltstub/v4/acquire_endpoints_aDatabase_no_servers.script',`
`2245`		`- 9001`
	`2245`	`+ 9002`
`2246`	`2246`	`)`
`2247`	`2247`	`const router2 = await boltStub.start(`
`2248`	`2248`	`'./test/resources/boltstub/v4/acquire_endpoints_aDatabase.script',`
`2249`		`- 9002`
	`2249`	`+ 9003`
`2250`	`2250`	`)`
`2251`	`2251`	`const reader1 = await boltStub.start(`
`2252`	`2252`	`'./test/resources/boltstub/v4/read_from_aDatabase.script',`
`2253`	`2253`	`9005`
`2254`	`2254`	`)`
`2255`	`2255`
`2256`		`- const driver = boltStub.newDriver('neo4j://127.0.0.1:9000', {`
	`2256`	`+ const driver = boltStub.newDriver('neo4j://127.0.0.1:9001', {`
`2257`	`2257`	`resolver: address => [`
`2258`		`- 'neo4j://127.0.0.1:9001',`
`2259`		`- 'neo4j://127.0.0.1:9002'`
	`2258`	`+ 'neo4j://127.0.0.1:9002',`
	`2259`	`+ 'neo4j://127.0.0.1:9003'`
`2260`	`2260`	`]`
`2261`	`2261`	`})`
`2262`	`2262`