ioredis 4.27.5 → 4.27.6

package/Changelog.md

@@ -1,3 +1,10 @@
+## [4.27.6](https://github.com/luin/ioredis/compare/v4.27.5...v4.27.6) (2021-06-13)
+
+
+### Bug Fixes
+
+* fixed autopipeline performances. ([#1226](https://github.com/luin/ioredis/issues/1226)) ([42f1ee1](https://github.com/luin/ioredis/commit/42f1ee107174366a79ff94bec8a7a1ac353e035c))
+
 ## [4.27.5](https://github.com/luin/ioredis/compare/v4.27.4...v4.27.5) (2021-06-05)
 
 

package/built/autoPipelining.js

@@ -18,13 +18,6 @@ exports.notAllowedAutoPipelineCommands = [
     "unsubscribe",
     "unpsubscribe",
 ];
-function findAutoPipeline(client, _commandName, ...args) {
-    if (!client.isCluster) {
-        return "main";
-    }
-    // We have slot information, we can improve routing by grouping slots served by the same subset of nodes
-    return client.slots[calculateSlot(args[0])].join(",");
-}
 function executeAutoPipeline(client, slotKey) {
     /*
       If a pipeline is already executing, keep queueing up commands
@@ -83,7 +76,8 @@ function executeWithAutoPipelining(client, functionName, commandName, args, call
             });
         });
     }
-    const slotKey = findAutoPipeline(client, commandName, ...args);
+    // If we have slot information, we can improve routing by grouping slots served by the same subset of nodes
+    const slotKey = client.isCluster ? client.slots[calculateSlot(args[0])].join(",") : 'main';
     if (!client._autoPipelines.has(slotKey)) {
         const pipeline = client.pipeline();
         pipeline[exports.kExec] = false;

package/built/cluster/index.js

@@ -42,6 +42,8 @@ class Cluster extends events_1.EventEmitter {
         this.isRefreshing = false;
         this.isCluster = true;
         this._autoPipelines = new Map();
+        this._groupsIds = {};
+        this._groupsBySlot = Array(16384);
         this._runningAutoPipelines = new Set();
         this._readyDelayedCallbacks = [];
         this._addedScriptHashes = {};
@@ -127,7 +129,9 @@ class Cluster extends events_1.EventEmitter {
                 reject(new Error("Redis is already connecting/connected"));
                 return;
             }
+            // Make sure only one timer is active at a time
             clearInterval(this._addedScriptHashesCleanInterval);
+            // Start the script cache cleaning
             this._addedScriptHashesCleanInterval = setInterval(() => {
                 this._addedScriptHashes = {};
             }, this.options.maxScriptsCachingTime);
@@ -491,6 +495,7 @@ class Cluster extends events_1.EventEmitter {
                         else {
                             _this.slots[slot] = [key];
                         }
+                        _this._groupsBySlot[slot] = _this._groupsIds[_this.slots[slot].join(';')];
                         _this.connectionPool.findOrCreate(_this.natMapper(key));
                         tryConnection();
                         debug("refreshing slot caches... (triggered by MOVED error)");
@@ -693,6 +698,20 @@ class Cluster extends events_1.EventEmitter {
                     this.slots[slot] = keys;
                 }
             }
+            // Assign to each node keys a numeric value to make autopipeline comparison faster.
+            this._groupsIds = Object.create(null);
+            let j = 0;
+            for (let i = 0; i < 16384; i++) {
+                const target = (this.slots[i] || []).join(';');
+                if (!target.length) {
+                    this._groupsBySlot[i] = undefined;
+                    continue;
+                }
+                if (!this._groupsIds[target]) {
+                    this._groupsIds[target] = ++j;
+                }
+                this._groupsBySlot[i] = this._groupsIds[target];
+            }
             this.connectionPool.reset(nodes);
             callback();
         }, this.options.slotsRefreshTimeout));

package/built/pipeline.js

@@ -15,10 +15,9 @@ const commander_1 = require("./commander");
 */
 function generateMultiWithNodes(redis, keys) {
     const slot = calculateSlot(keys[0]);
-    const target = redis.slots[slot].join(",");
+    const target = redis._groupsBySlot[slot];
     for (let i = 1; i < keys.length; i++) {
-        const currentTarget = redis.slots[calculateSlot(keys[i])].join(",");
-        if (currentTarget !== target) {
+        if (redis._groupsBySlot[calculateSlot(keys[i])] !== target) {
             return -1;
         }
     }
@@ -141,6 +140,7 @@ Pipeline.prototype.fillResult = function (value, position) {
                 moved: function (slot, key) {
                     _this.preferKey = key;
                     _this.redis.slots[errv[1]] = [key];
+                    _this.redis._groupsBySlot[errv[1]] = _this.redis._groupsIds[_this.redis.slots[errv[1]].join(";")];
                     _this.redis.refreshSlotsCache();
                     _this.exec();
                 },

package/built/redis/index.js

@@ -262,7 +262,9 @@ Redis.prototype.connect = function (callback) {
             reject(new Error("Redis is already connecting/connected"));
             return;
         }
+        // Make sure only one timer is active at a time
         clearInterval(this._addedScriptHashesCleanInterval);
+        // Start the script cache cleaning
         this._addedScriptHashesCleanInterval = setInterval(() => {
             this._addedScriptHashes = {};
         }, this.options.maxScriptsCachingTime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ioredis",
-  "version": "4.27.5",
+  "version": "4.27.6",
   "description": "A robust, performance-focused and full-featured Redis client for Node.js.",
   "main": "built/index.js",
   "files": [