address comment: fix transaction

Signed-off-by: James Xin <[email protected]>

Author: jamesx-improving

node/src/Transaction.ts

@@ -10,6 +10,7 @@ import {
     ReadFrom, // eslint-disable-line @typescript-eslint/no-unused-vars
     SortedSetDataType,
     convertGlideRecord,
+    Score,
 } from "./BaseClient";
 
 import {
@@ -66,7 +67,6 @@ import {
     TimeUnit,
     ZAddOptions,
     ZScanOptions,
-    convertElementsAndScores,
     convertFieldsAndValuesToHashDataType,
     createAppend,
     createBLMPop,
@@ -1738,16 +1738,13 @@ class BaseTransaction<T extends BaseTransaction<T>> {
      */
     public zadd(
         key: GlideString,
-        membersAndScores: SortedSetDataType | Record<string, number>,
+        membersAndScores:
+            | SortedSetDataType
+            | Record<string, number>
+            | Record<string, Score>,
         options?: ZAddOptions,
     ): T {
-        return this.addAndReturn(
-            createZAdd(
-                key,
-                convertElementsAndScores(membersAndScores),
-                options,
-            ),
-        );
+        return this.addAndReturn(createZAdd(key, membersAndScores, options));
     }
 
     /**

node/tests/TestUtilities.ts

@@ -1109,28 +1109,44 @@ export async function transactionTest(
     responseData.push(['smove(key7, key7, "non_existing_member")', false]);
     baseTransaction.scard(key7);
     responseData.push(["scard(key7)", 0]);
-    baseTransaction.zadd(key8, [
-        { element: member1, score: 1 },
-        { element: member2, score: 2 },
-        { element: member3, score: 3.5 },
-        { element: member4, score: 4 },
-        { element: member5, score: 5 },
-    ]);
-    responseData.push(["zadd(key8, { ... } ", 5]);
+    baseTransaction.zadd(key8, {
+        member1: 1,
+        member2: 2,
+        member3: 3.5,
+        member4: 4,
+        member5: 5,
+        infMember: "+inf",
+        negInfMember: "-inf",
+    });
+    responseData.push(["zadd(key8, { ... } ", 7]);
     baseTransaction.zrank(key8, member1);
-    responseData.push(['zrank(key8, "member1")', 0]);
+    responseData.push(['zrank(key8, "member1")', 1]);
+    baseTransaction.zrank(key8, "negInfMember");
+    responseData.push(['zrank(key8, "negInfMember")', 0]);
 
     if (!cluster.checkIfServerVersionLessThan("7.2.0")) {
         baseTransaction.zrankWithScore(key8, member1);
-        responseData.push(['zrankWithScore(key8, "member1")', [0, 1]]);
+        responseData.push(['zrankWithScore(key8, "member1")', [1, 1]]);
+        baseTransaction.zrankWithScore(key8, "negInfMember");
+        responseData.push([
+            'zrankWithScore(key8, "negInfMember")',
+            [0, -Infinity],
+        ]);
     }
 
     baseTransaction.zrevrank(key8, "member5");
-    responseData.push(['zrevrank(key8, "member5")', 0]);
+    responseData.push(['zrevrank(key8, "member5")', 1]);
+    baseTransaction.zrevrank(key8, "infMember");
+    responseData.push(['zrevrank(key8, "infMember")', 0]);
 
     if (!cluster.checkIfServerVersionLessThan("7.2.0")) {
         baseTransaction.zrevrankWithScore(key8, "member5");
-        responseData.push(['zrevrankWithScore(key8, "member5")', [0, 5]]);
+        responseData.push(['zrevrankWithScore(key8, "member5")', [1, 5]]);
+        baseTransaction.zrevrankWithScore(key8, "infMember");
+        responseData.push([
+            'zrevrankWithScore(key8, "infMember")',
+            [0, Infinity],
+        ]);
     }
 
     baseTransaction.zaddIncr(key8, member2, 1);
@@ -1140,28 +1156,34 @@ export async function transactionTest(
     baseTransaction.zrem(key8, [member1]);
     responseData.push(['zrem(key8, ["member1"])', 1]);
     baseTransaction.zcard(key8);
-    responseData.push(["zcard(key8)", 4]);
+    responseData.push(["zcard(key8)", 6]);
 
     baseTransaction.zscore(key8, member2);
     responseData.push(['zscore(key8, "member2")', 3.0]);
+    baseTransaction.zscore(key8, "infMember");
+    responseData.push(['zscore(key8, "infMember")', Infinity]);
     baseTransaction.zrange(key8, { start: 0, end: -1 });
     responseData.push([
         "zrange(key8, { start: 0, end: -1 })",
         [
+            "negInfMember",
             member2.toString(),
             member3.toString(),
             member4.toString(),
             member5.toString(),
+            "infMember",
         ],
     ]);
     baseTransaction.zrangeWithScores(key8, { start: 0, end: -1 });
     responseData.push([
         "zrangeWithScores(key8, { start: 0, end: -1 })",
         convertRecordToGlideRecord({
+            negInfMember: -Infinity,
             member2: 3,
             member3: 3.5,
             member4: 4,
             member5: 5,
+            infMember: Infinity,
         }),
     ]);
     baseTransaction.zadd(key12, [
@@ -1202,7 +1224,7 @@ export async function transactionTest(
         baseTransaction.zrangeStore(key8, key8, { start: 0, end: -1 });
         responseData.push([
             "zrangeStore(key8, key8, { start: 0, end: -1 })",
-            4,
+            6,
         ]);
         baseTransaction.zdiff([key13, key12]);
         responseData.push(["zdiff([key13, key12])", ["three"]]);
@@ -1258,7 +1280,7 @@ export async function transactionTest(
     baseTransaction.zcount(key8, { value: 2 }, InfBoundary.PositiveInfinity);
     responseData.push([
         "zcount(key8, { value: 2 }, InfBoundary.PositiveInfinity)",
-        4,
+        5,
     ]);
     baseTransaction.zlexcount(
         key8,
@@ -1267,17 +1289,17 @@ export async function transactionTest(
     );
     responseData.push([
         'zlexcount(key8, { value: "a" }, InfBoundary.PositiveInfinity)',
-        4,
+        6,
     ]);
     baseTransaction.zpopmin(key8);
     responseData.push([
         "zpopmin(key8)",
-        convertRecordToGlideRecord({ member2: 3.0 }),
+        convertRecordToGlideRecord({ negInfMember: -Infinity }),
     ]);
     baseTransaction.zpopmax(key8);
     responseData.push([
         "zpopmax(key8)",
-        convertRecordToGlideRecord({ member5: 5 }),
+        convertRecordToGlideRecord({ infMember: Infinity }),
     ]);
     baseTransaction.zadd(key8, [{ element: member6, score: 6 }]);
     responseData.push(["zadd(key8, {member6: 6})", 1]);
@@ -1300,7 +1322,7 @@ export async function transactionTest(
         InfBoundary.NegativeInfinity,
         InfBoundary.PositiveInfinity,
     );
-    responseData.push(["zremRangeByScore(key8, -Inf, +Inf)", 1]); // key8 is now empty
+    responseData.push(["zremRangeByScore(key8, -Inf, +Inf)", 3]); // key8 is now empty
     baseTransaction.zremRangeByLex(
         key8,
         InfBoundary.NegativeInfinity,