hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed keys

Browse Source
v1.18.x
barisusakli 11 years ago
parent da0793c011
commit 4f72513f19
2 changed files with 48 additions and 96 deletions
Show Stats Download Patch File Download Diff File

138
src/database/mongo.js
Unescape Escape View File

@ -121,12 +121,12 @@
return value.toString(); return value.toString();
} }
// //
// Exported functions // Exported functions
// //
module.searchIndex = function(key, content, id) { module.searchIndex = function(key, content, id) {
var data = { var data = {
id:id, id:id,
key:key, key:key,
@ -141,33 +141,26 @@
}; };
module.search = function(key, term, limit, callback) { module.search = function(key, term, limit, callback) {
db.command({text:"search" , search: term, filter: {key:key}, limit: limit }, function(err, result) { db.command({text:'search' , search: term, filter: {key:key}, limit: limit }, function(err, result) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
if(!result) { if(!result || !result.results || !result.results.length) {
return callback(null, []); return callback(null, []);
} }
if(result.results && result.results.length) { var data = result.results.map(function(item) {
var data = result.results.map(function(item) { return item.obj.id;
return item.obj.id; });
}); callback(null, data);
callback(null, data);
} else {
callback(null, []);
}
}); });
}; };
module.searchRemove = function(key, id, callback) { module.searchRemove = function(key, id, callback) {
db.collection('search').remove({id:id, key:key}, function(err, result) { db.collection('search').remove({id:id, key:key}, function(err, result) {
if(err) {
winston.error('Error removing search ' + err.message);
}
if (typeof callback === 'function') { if (typeof callback === 'function') {
callback(); callback(err);
} }
}); });
}; };
@ -221,12 +214,6 @@
module.setObject(key, data, callback); module.setObject(key, data, callback);
}; };
module.keys = function(key, callback) {
db.collection('objects').find( { _key: { $regex: key /*, $options: 'i'*/ } }, function(err, result) {
callback(err, result);
});
};
module.rename = function(oldKey, newKey, callback) { module.rename = function(oldKey, newKey, callback) {
db.collection('objects').update({_key: oldKey}, {$set:{_key: newKey}}, function(err, result) { db.collection('objects').update({_key: oldKey}, {$set:{_key: newKey}}, function(err, result) {
if(typeof callback === 'function') { if(typeof callback === 'function') {
@ -450,7 +437,7 @@
array[index] = toString(element); array[index] = toString(element);
}); });
db.collection('objects').update( { _key: key }, { $pullAll: { members: value } }, function(err, result) { db.collection('objects').update({_key: key}, {$pullAll: {members: value}}, function(err, result) {
if(typeof callback === 'function') { if(typeof callback === 'function') {
callback(err, result); callback(err, result);
} }
@ -500,34 +487,27 @@
return result.indexOf(set) !== -1 ? 1 : 0; return result.indexOf(set) !== -1 ? 1 : 0;
}); });
callback(err, result); callback(null, result);
}); });
}; };
module.getSetMembers = function(key, callback) { module.getSetMembers = function(key, callback) {
db.collection('objects').findOne({_key:key}, {members:1}, function(err, data) { db.collection('objects').findOne({_key:key}, {members:1}, function(err, data) {
if(err) { if (err) {
return callback(err); return callback(err);
} }
if(!data) { callback(null, data ? data.members : []);
callback(null, []);
} else {
callback(null, data.members);
}
}); });
}; };
module.setCount = function(key, callback) { module.setCount = function(key, callback) {
db.collection('objects').findOne({_key:key}, function(err, data) { db.collection('objects').findOne({_key:key}, function(err, data) {
if(err) { if (err) {
return callback(err); return callback(err);
} }
if(!data) {
return callback(null, 0);
}
callback(null, data.members.length); return callback(null, data ? data.members.length : 0);
}); });
}; };
@ -535,25 +515,25 @@
db.collection('objects').findOne({_key:key}, function(err, data) { db.collection('objects').findOne({_key:key}, function(err, data) {
if(err) { if(err) {
if(typeof callback === 'function') { if(typeof callback === 'function') {
return callback(err); callback(err);
} else {
return winston.error(err.message);
} }
return;
} }
if(!data) { if(!data) {
if(typeof callback === 'function') { if(typeof callback === 'function') {
callback(null, 0); callback(null, 0);
} }
} else { return;
var randomIndex = Math.floor(Math.random() * data.members.length);
var value = data.members[randomIndex];
module.setRemove(data._key, value, function(err, result) {
if(typeof callback === 'function') {
callback(err, value);
}
});
} }
var randomIndex = Math.floor(Math.random() * data.members.length);
var value = data.members[randomIndex];
module.setRemove(data._key, value, function(err, result) {
if(typeof callback === 'function') {
callback(err, value);
}
});
}); });
}; };
@ -615,10 +595,8 @@
}; };
module.getSortedSetRevRangeByScore = function(args, callback) { module.getSortedSetRevRangeByScore = function(args, callback) {
//var args = ['topics:recent', '+inf', timestamp - since, 'LIMIT', start, end - start + 1];
var key = args[0], var key = args[0],
max = (args[1] === '+inf')?Number.MAX_VALUE:args[1], max = (args[1] === '+inf') ? Number.MAX_VALUE : args[1],
min = args[2], min = args[2],
start = args[4], start = args[4],
count = args[5]; count = args[5];
@ -647,27 +625,13 @@
module.sortedSetCount = function(key, min, max, callback) { module.sortedSetCount = function(key, min, max, callback) {
db.collection('objects').count({_key:key, score: {$gte:min, $lte:max}}, function(err, count) { db.collection('objects').count({_key:key, score: {$gte:min, $lte:max}}, function(err, count) {
if(err) { callback(err, count ? count : 0);
return callback(err);
}
if(!count) {
return callback(null, 0);
}
callback(null,count);
}); });
}; };
module.sortedSetCard = function(key, callback) { module.sortedSetCard = function(key, callback) {
db.collection('objects').count({_key:key}, function(err, count) { db.collection('objects').count({_key:key}, function(err, count) {
if(err) { callback(err, count ? count : 0);
return callback(err);
}
if(!count) {
return callback(null, 0);
}
callback(null, count);
}); });
}; };
@ -768,15 +732,7 @@
db.collection('objects').update({_key: key }, { $pop: { array: 1 } }, function(err, result) { db.collection('objects').update({_key: key }, { $pop: { array: 1 } }, function(err, result) {
if(typeof callback === 'function') { if(typeof callback === 'function') {
if(err) { callback(err, (value && value.length) ? value[0] : null);
return callback(err);
}
if(value && value.length) {
callback(err, value[0]);
} else {
callback(err, null);
}
} }
}); });
}); });
@ -811,31 +767,31 @@
return callback(err); return callback(err);
} }
if(data && data.array) { if(!(data && data.array)) {
if(splice) { return callback(null, []);
}
if(start < 0) { if(splice) {
start = data.array.length - Math.abs(start);
}
if(stop < 0) { if(start < 0) {
stop = data.array.length - Math.abs(stop); start = data.array.length - Math.abs(start);
} }
if(start > stop) { if(stop < 0) {
return callback(null, []); stop = data.array.length - Math.abs(stop);
} }
var howMany = stop - start + 1; if(start > stop) {
if(start !== 0 || howMany !== data.array.length) { return callback(null, []);
data.array = data.array.splice(start, howMany);
}
} }
callback(null, data.array); var howMany = stop - start + 1;
} else { if(start !== 0 || howMany !== data.array.length) {
callback(null, []); data.array = data.array.splice(start, howMany);
}
} }
callback(null, data.array);
}); });
}; };

6
src/database/redis.js
Unescape Escape View File

@ -167,10 +167,6 @@
redisClient.set(key, value, callback); redisClient.set(key, value, callback);
}; };
module.keys = function(key, callback) {
redisClient.keys(key, callback);
};
module.rename = function(oldKey, newKey, callback) { module.rename = function(oldKey, newKey, callback) {
redisClient.rename(oldKey, newKey, callback); redisClient.rename(oldKey, newKey, callback);
}; };
@ -188,7 +184,7 @@
module.setObject = function(key, data, callback) { module.setObject = function(key, data, callback) {
// TODO: this crashes if callback isnt supplied -baris // TODO: this crashes if callback isnt supplied -baris
redisClient.hmset(key, data, function(err, res) { redisClient.hmset(key, data, function(err, res) {
if(callback) { if(typeof callback === 'function') {
callback(err, res); callback(err, res);
} }
}); });

Write Preview
Loading…
Cancel
Save