Add getConnectionForSql and use it #988

srknzl · 2021-07-28T10:40:13Z

Followup to #963. In 5.0 SQL team decided to use their own logic for selecting a connection for sending SQL message instead of using LoadBalancer.

Like java side did, this pr deprecates old methods on load balancer.

srknzl · 2021-07-30T07:38:33Z

src/BuildInfo.ts

+    public static calculateMemberVersion(m: MemberVersion) : number {
+        return BuildInfo.calculateServerVersion(m.major, m.minor, m.patch);
+    }


This is added as a utility

srknzl · 2021-07-30T07:38:53Z

src/HazelcastClient.ts

+            this.config.connectionStrategy.asyncStart,
+            this.config.connectionStrategy.reconnectMode,


refactored constructor to accept specific configs it needs

srknzl · 2021-07-30T07:39:25Z

src/core/MemberVersion.ts

+
+    /**
+     * @param other other version to compare to
+     * @return true if this version equals `other`
+     */
+    equals(other: MemberVersion): boolean {
+        return this.major === other.major && this.minor === other.minor;
+    }
+
+    toString(): string {
+        return `${this.major}.${this.minor}`;
+    }


these are used in memberOfLargerSameVersionGroup

srknzl · 2021-07-30T07:39:43Z

src/invocation/ClusterService.ts

@@ -77,7 +77,7 @@ export class ClusterService implements Cluster {
     * @param uuid The UUID of the member as a string.
     * @return The member that was found, or undefined if not found.
     */
-    getMember(uuid: string): MemberImpl {
+    getMember(uuid: string): MemberImpl | undefined {


side change that is unrelated

srknzl · 2021-07-30T07:40:40Z

src/network/ConnectionManager.ts

+        private readonly asyncStart: boolean,
+        private readonly reconnectMode: ReconnectMode,
+        private readonly smartRoutingEnabled: boolean,
+        private readonly loadBalancer: LoadBalancer,
+        private readonly clusterService: ClusterService


preferred to use compact construction syntax(like other classes I refactored in #797 )

srknzl · 2021-07-30T07:41:10Z

src/network/ConnectionManager.ts

+    getRandomConnection(): Connection | null {
        if (this.smartRoutingEnabled) {
-            let member;
-            if (dataMember) {
-                if (this.loadBalancer.canGetNextDataMember()) {
-                    member = this.loadBalancer.nextDataMember();
-                } else {
-                    member = null;
+            const member = this.loadBalancer.next();
+            if (member != null) {
+                const connection = this.getConnection(member.uuid);
+                if (connection != null) {
+                    return connection;
                }
-            } else {
-                member = this.loadBalancer.next();
            }
+        }
+
+        const iterator = this.activeConnections.values();
+        const next = iterator.next();
+        if (!next.done) {
+            return next.value;
+        } else {
+            return null;
+        }
+    }


reverted to old version

srknzl · 2021-07-30T07:41:48Z

src/network/ConnectionManager.ts

                const connection = this.getConnection(member.uuid);
-                if (connection != null) {
+                if (connection !== undefined) {


connection can only be undefined, I chose to be more specific here

srknzl · 2021-07-30T07:42:38Z

src/sql/SqlService.ts

@@ -255,7 +255,7 @@ export class SqlServiceImpl implements SqlService {
     * @param connection
     * @returns {@link HazelcastSqlException}
     */
-    toHazelcastSqlException(err: any, connection: Connection) : HazelcastSqlException {
+    rethrow(err: any, connection: Connection): HazelcastSqlException {


refactored so that rethrow takes err and connection and returns a HazelcastSqlException whereas toHazelcastSqlException is just for converting an err to HazelcastSqlException

Done this because I needed toHazelcastSqlException logic as a separate func

srknzl · 2021-07-30T07:43:40Z

test/unit/network/ConnectionRegistryTest.js

+                false,
+                ReconnectMode.ON,


contructor change affected tests

srknzl · 2021-07-30T07:44:57Z

test/unit/sql/SqlResult.js

@@ -231,6 +231,7 @@ describe('SqlResultTest', function () {
        beforeEach(function () {
            fakeSqlService = {
                toHazelcastSqlException: sandbox.fake((err) => new HazelcastSqlException(null, 1, '', err)),
+                rethrow: sandbox.fake((err) => new HazelcastSqlException(null, 1, '', err)),


rethrow used in the sql service we need to add it too

srknzl · 2021-07-30T07:45:34Z

test/unit/network/ConnectionRegistryTest.js

-
-        it('should return data member connection when one exists and when data member is requested, [dummy mode]',
-            function () {
-                const firstUUID = UuidUtil.generate();
-                const secondUUID = UuidUtil.generate();
-                const thirdUUID = UuidUtil.generate();
-
-                const loadBalancerStub = {next: sandbox.spy(), nextDataMember: sandbox.spy()};
-                const clusterServiceStub = {};
-                clusterServiceStub.getMember = sandbox.stub();
-
-                clusterServiceStub.getMember.withArgs(firstUUID.toString()).returns({
-                    liteMember: true
-                });
-                clusterServiceStub.getMember.withArgs(secondUUID.toString()).returns({
-                    liteMember: false
-                });
-                clusterServiceStub.getMember.withArgs(thirdUUID.toString()).returns({
-                    liteMember: true
-                });
-
-                const connectionRegistry = new ConnectionRegistryImpl(
-                    new ConnectionStrategyConfigImpl(),
-                    false,
-                    loadBalancerStub,
-                    clusterServiceStub
-                );
-
-                const secondConnection = {};
-                const firstConnection = {};
-                connectionRegistry.setConnection(firstUUID, firstConnection);
-                connectionRegistry.setConnection(secondUUID, secondConnection);
-                connectionRegistry.setConnection(thirdUUID, {});
-
-                const connection = connectionRegistry.getRandomConnection();
-                const otherConnection = connectionRegistry.getRandomConnection();
-                const dataMemberConnection = connectionRegistry.getRandomConnection(true);
-
-                expect(connection).to.be.equal(firstConnection);
-                expect(otherConnection).to.be.equal(firstConnection);
-                expect(dataMemberConnection).to.be.equal(secondConnection);
-
-                expect(loadBalancerStub.next.called).to.be.false;
-                expect(loadBalancerStub.nextDataMember.called).to.be.false;
-            }
-        );
-
-        it('should return null if there is no data member connection and data member is requested, [dummy mode]',
-            function () {
-                const firstUUID = UuidUtil.generate();
-                const secondUUID = UuidUtil.generate();
-
-                const loadBalancerStub = {next: sandbox.spy(), nextDataMember: sandbox.spy()};
-                const clusterServiceStub = {};
-                clusterServiceStub.getMember = sandbox.stub();
-
-                clusterServiceStub.getMember.withArgs(firstUUID.toString()).returns({
-                    liteMember: true
-                });
-                clusterServiceStub.getMember.withArgs(secondUUID.toString()).returns({
-                    liteMember: true
-                });
-
-                const connectionRegistry = new ConnectionRegistryImpl(
-                    new ConnectionStrategyConfigImpl(),
-                    false,
-                    loadBalancerStub,
-                    clusterServiceStub
-                );
-
-                const secondConnection = {};
-                const firstConnection = {};
-                connectionRegistry.setConnection(firstUUID, firstConnection);
-                connectionRegistry.setConnection(secondUUID, secondConnection);
-
-                const connection = connectionRegistry.getRandomConnection();
-                const otherConnection = connectionRegistry.getRandomConnection();
-                const dataMemberConnection = connectionRegistry.getRandomConnection(true);
-
-                expect(connection).to.be.equal(firstConnection);
-                expect(otherConnection).to.be.equal(firstConnection);
-                expect(dataMemberConnection).to.be.equal(null);
-
-                expect(loadBalancerStub.next.called).to.be.false;
-                expect(loadBalancerStub.nextDataMember.called).to.be.false;
-            }
-        );


deleted tests that are related to old get sql connection method(via getRandomConnection(dataMember))

src/BuildInfo.ts

src/core/LoadBalancer.ts

src/core/MemberVersion.ts

src/network/ConnectionManager.ts

src/util/Util.ts

test/unit/network/ConnectionRegistryTest.js

test/integration/backward_compatible/sql/ExecuteTest.js

src/util/Util.ts

test/integration/backward_compatible/sql/ExecuteTest.js

srknzl added 4 commits July 28, 2021 12:14

Remove data member load balancing for sql

8dc7926

Add getConnectionForSql

4c9eb4e

fix

2e91b86

fix

a1bd4fa

srknzl added Type: Enhancement Priority: Low Estimation: S Source: Internal labels Jul 28, 2021

srknzl added this to the 5.0 milestone Jul 28, 2021

srknzl requested a review from mdumandag July 28, 2021 10:40

srknzl mentioned this pull request Jul 28, 2021

[API-274] SQL for Map ([API-617], [API-616], [API-431], [API-619], [API-620], [API-432], [API-659], [API-660], [API-661]) hazelcast/hazelcast-csharp-client#475

Merged

Fix Tests

1384ace

srknzl commented Jul 30, 2021

View reviewed changes

Revert whitespace change

07e8fe5

mdumandag reviewed Jul 30, 2021

View reviewed changes

srknzl added 4 commits July 30, 2021 12:34

Fix some of comments

b64ec35

Add unit tests for getConnectionForSql

aefdd68

Add test

6a07e7c

Add fix

baa0300

mdumandag reviewed Jul 30, 2021

View reviewed changes

src/util/Util.ts Show resolved Hide resolved

Fix bug

d25b794

srknzl requested a review from mdumandag August 2, 2021 06:55

mdumandag approved these changes Aug 3, 2021

View reviewed changes

test/integration/backward_compatible/sql/ExecuteTest.js Outdated Show resolved Hide resolved

Remove leftover change

6142398

srknzl added Estimation: M and removed Priority: Low Estimation: S labels Aug 3, 2021

srknzl merged commit a4f9e7c into hazelcast:master Aug 3, 2021

harunalpak pushed a commit to harunalpak/hazelcast-nodejs-client that referenced this pull request Dec 8, 2022

Add getConnectionForSql and use it (hazelcast#988)

ea7a8fb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add getConnectionForSql and use it #988

Add getConnectionForSql and use it #988

srknzl commented Jul 28, 2021

srknzl Jul 30, 2021

srknzl Jul 30, 2021

srknzl Jul 30, 2021

srknzl Jul 30, 2021

srknzl Jul 30, 2021

srknzl Jul 30, 2021

srknzl Jul 30, 2021

srknzl Jul 30, 2021 •

edited

srknzl Jul 30, 2021

srknzl Jul 30, 2021

srknzl Jul 30, 2021 •

edited

		this.config.connectionStrategy.asyncStart,
		this.config.connectionStrategy.reconnectMode,

Add getConnectionForSql and use it #988

Add getConnectionForSql and use it #988

Conversation

srknzl commented Jul 28, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

srknzl Jul 30, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

srknzl Jul 30, 2021 • edited

Choose a reason for hiding this comment

srknzl Jul 30, 2021 •

edited

srknzl Jul 30, 2021 •

edited