add function for geting key table from arguments.

lib/client.js

@@ -3,6 +3,7 @@
 
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
+var HashMap = require('hashmap');
 var redis = require('redis');
 var commands = require('./commands');
 var Pool = require('./pool');
@@ -436,8 +437,8 @@ function init_commands(self) {
 function bindCommand(self, cmd) {
     ClusterClient.prototype[cmd] = function () {
         var argsAndFn = extractArgsAndCallback(arguments);
-        var keys = this.findKeysFromArgs(commands[cmd], argsAndFn[0]);
-
+        var keyTable = this.findKeyTable(cmd, argsAndFn[0]);
+        var keys = keyTable == null ? null : keyTable.values();
         try {
             var slotProxy = self.getProxy(keys);
             if(!slotProxy) {
@@ -555,41 +556,46 @@ function isFunction(obj) {
     return !!(obj && obj.constructor && obj.call && obj.apply);
 }
 
+
+
 /**
  * Finds keys from command args.
  *
- * @param {Object} commandMeta
+ * @param {String} command name
  * @param {Array} args Command args
  * @returns {Array|String} A list of string.
  */
-ClusterClient.prototype.findKeysFromArgs = function(commandMeta, args) {
+ClusterClient.prototype.findKeyTable = function(cmd, args) {
+    var commandMeta = commands[cmd];
     var keyPosition = commandMeta[2];
 
     // command do not need a key
     if(!keyPosition) {
         return null;
     }
 
-    // init key array with first key.
+    var table = new HashMap();
+
+    // store key position and its value.
     // command name is not included in args, so -1.
-    var keys = [args[keyPosition - 1]];
+    table.set(keyPosition - 1, args[keyPosition - 1]);
 
     var lastKeyPosition = commandMeta[3];
     var keyStep = commandMeta[4];
 
     // only have one key
     if(keyPosition === lastKeyPosition || !keyStep) {
-        return keys;
+        return table;
     }
 
     // command name is not included in args, so -1.
     keyPosition += keyStep - 1;
     while(args[keyPosition]) {
-        keys.push(args[keyPosition]);
+        table.set(keyPosition, args[keyPosition]);
         keyPosition += keyStep;
     }
 
-    return keys;
+    return table;
 };
 
 module.exports = ClusterClient;

lib/pipelining.js

@@ -17,14 +17,14 @@ function Pipelining(clusterClient) {
 	 * 
 	 */
 	this.enqueue = function(cmd, args) {
-		var keys = this.client.findKeysFromArgs(commands[cmd], args);
+		var keyTable = this.client.findKeyTable(cmd, args);
 		var slot = null;
-		if (!keys) {
+		if (!keyTable || keyTable.count() === 0) {
 			slot = -1; // solt:-1 for commands which do not target to a particular slot.
-		} else if (keys.length > 1) {
+		} else if (keyTable.count() > 1) {
 			throw new Error('transaction do not support mset/mget and etc with multi keys assigned');
 		} else {
-			slot = calculateSlot(keys[0]);
+			slot = calculateSlot(keyTable.values()[0]);
 		}
 
 		if (!slotMap[slot]) {

lib/transaction.js

@@ -17,14 +17,14 @@ function Transaction(clusterClient) {
 	 * 
 	 */
 	this.enqueue = function(cmd, args) {
-		var keys = this.client.findKeysFromArgs(commands[cmd], args);
+		var keyTable = this.client.findKeyTable(cmd, args);
 		var slot = null;
-		if (!keys) {
+		if (!keyTable || keyTable.count() === 0) {
 			slot = -1; // solt:-1 for commands which do not target to a particular slot.
-		} else if (keys.length > 1) {
+		} else if (keyTable.count() > 1) {
 			throw new Error('transaction do not support mset/mget and etc with multi keys assigned');
 		} else {
-			slot = calculateSlot(keys[0]);
+			slot = calculateSlot(keyTable.values()[0]);
 		}
 
 		if (!slotMap[slot]) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "clustedis",
-    "version": "0.0.5",
+    "version": "0.0.6",
     "description": "Node.js Redis cluster client for the official cluster implementation (by Redis 3.0)",
     "scripts": {
         "test": "nyc gulp test",
@@ -29,7 +29,8 @@
     },
     "dependencies": {
         "generic-pool": "2.2.0",
-        "redis": "^0.12.1"
+        "redis": "^0.12.1",
+        "hashmap": "^2.0.3"
     },
     "devDependencies": {
         "gulp": "^3.8.11",

test/index.js

@@ -55,6 +55,16 @@ describe('cluster command tests: ', function() {
             done();
         });
     });
+
+    describe('client helper functions', function() {
+        it('should get key table from args', function(done) {
+            var kt = client.findKeyTable('mset', ['key1', 'value1', 'key2', 'value2']);
+            expect(kt.count()).to.be.equal(2);
+            expect(kt.get(0)).to.be.equal('key1');
+            expect(kt.get(2)).to.be.equal('key2');
+            done();
+        });
+    });
 
     describe('redis server info', function() {