Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded hset to be the same as hmset #182

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 38 additions & 7 deletions lib/server/hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,24 +98,55 @@ exports.hdel = function (hash) {
/*
* Hset
*/
exports.hset = function (hash, key, value, callback) {
exports.hset = function (hash) {

// We require at least 3 arguments
// 0: mockInstance
// 1: hash name
// 2..N-2: key
// 3..N-1: value
// N: callback (optional)

var update = false;
let count = 0;
var len = arguments.length;
if (len <= 2) {
return;
}

var callback;
if ('function' === typeof arguments[len - 1]) {
callback = arguments[len-1];
}

// check to see if this hash exists
if (this.storage[hash]) {
if (this.storage[hash].type !== "hash") {
if (this.storage[hash].type !== "hash" && callback) {
return helpers.callCallback(callback,
new Error("ERR Operation against a key holding the wrong kind of value"));
}
if (this.storage[hash].value[key]) {
update = true;
}
} else {
this.storage[hash] = Item.createHash();
}

this.storage[hash].value[key] = value.toString();
for (var i = 1; i < len; i += 2) {
if (len <= (i + 1)) {
// should skip the callback here
break;
}
var k = arguments[i];
var v = arguments[i + 1];

if (this.storage[hash].value[k]) {
update = true;
}
this.storage[hash].value[k] = v.toString();
count++;
}

helpers.callCallback(callback, null, update ? 0 : 1);
if (callback) {
helpers.callCallback(callback, null, update ? 0 : count);
}
};

/**
Expand Down
12 changes: 12 additions & 0 deletions test/client/redis-mock.hash.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ describe("basic hashing usage", function () {

});

it("should set multiple values", function (done) {

r.hset(testHash, testKey, testValue, testKey + "2", testValue + "2", testKey + "3", testValue + "3", function (err, result) {

result.should.equal(3);

done();

});

});

it("should treat empty string as existent", function (done) {
r.hset(testHash, testKeyEmptyString, testValueEmptyString, function (err, result) {
r.hexists(testHash, testKeyEmptyString, function (err, result) {
Expand Down