Merge pull request #237 from lutovich/1.3-one-router-valid

Treat one router as valid in routing table

Author: lutovich

src/v1/internal/routing-table.js

@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {int} from "../integer";
-import RoundRobinArray from "./round-robin-array";
+import {int} from '../integer';
+import RoundRobinArray from './round-robin-array';
 
 const MIN_ROUTERS = 1;
 
@@ -55,7 +55,7 @@ export default class RoutingTable {
 
   isStale() {
     return this.expirationTime.lessThan(Date.now()) ||
-      this.routers.size() <= MIN_ROUTERS ||
+      this.routers.size() < MIN_ROUTERS ||
       this.readers.isEmpty() ||
       this.writers.isEmpty();
   }

test/internal/routing-table.test.js

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import RoutingTable from "../../src/v1/internal/routing-table";
-import RoundRobinArray from "../../src/v1/internal/round-robin-array";
-import {int} from "../../src/v1/integer";
+import RoutingTable from '../../src/v1/internal/routing-table';
+import RoundRobinArray from '../../src/v1/internal/round-robin-array';
+import {int} from '../../src/v1/integer';
 
 describe('routing-table', () => {
 
@@ -32,9 +32,9 @@ describe('routing-table', () => {
     expect(table.isStale()).toBeTruthy();
   });
 
-  it('should be stale when has single router', () => {
+  it('should not be stale when has single router', () => {
     const table = createTable([1], [2, 3], [4, 5], notExpired());
-    expect(table.isStale()).toBeTruthy();
+    expect(table.isStale()).toBeFalsy();
   });
 
   it('should be stale when no readers', () => {

test/resources/boltkit/discover_one_router.script

@@ -0,0 +1,9 @@
+!: AUTO INIT
+!: AUTO RESET
+!: AUTO PULL_ALL
+
+C: RUN "CALL dbms.cluster.routing.getServers" {}
+   PULL_ALL
+S: SUCCESS {"fields": ["ttl", "servers"]}
+   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"}]]
+   SUCCESS {}

test/v1/routing.driver.boltkit.it.js

@@ -1630,6 +1630,48 @@ describe('routing driver', () => {
     });
   });
 
+  it('should treat routing table with single router as valid', done => {
+    if (!boltkit.BoltKitSupport) {
+      done();
+      return;
+    }
+
+    const kit = new boltkit.BoltKit();
+    const router = kit.start('./test/resources/boltkit/discover_one_router.script', 9010);
+    const reader1 = kit.start('./test/resources/boltkit/read_server.script', 9003);
+    const reader2 = kit.start('./test/resources/boltkit/read_server.script', 9004);
+
+    kit.run(() => {
+      const driver = newDriver('bolt+routing://127.0.0.1:9010');
+      const session = driver.session(READ);
+
+      session.run('MATCH (n) RETURN n.name').then(result1 => {
+        expect(result1.records.length).toEqual(3);
+        expect(result1.summary.server.address).toEqual('127.0.0.1:9003');
+
+        session.run('MATCH (n) RETURN n.name').then(result2 => {
+          expect(result2.records.length).toEqual(3);
+          expect(result2.summary.server.address).toEqual('127.0.0.1:9004');
+
+          session.close(() => {
+            driver.close();
+            router.exit(code1 => {
+
+              reader1.exit(code2 => {
+                reader2.exit(code3 => {
+                  expect(code1).toEqual(0);
+                  expect(code2).toEqual(0);
+                  expect(code3).toEqual(0);
+                  done();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+
   function moveNextDateNow30SecondsForward() {
     const currentTime = Date.now();
     hijackNextDateNowCall(currentTime + 30 * 1000 + 1);