From 28c75e09a98c888880660babf40de0d16a504c91 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 3 Dec 2013 22:16:44 -0500
Subject: [PATCH] can haz sorted sets?

---
 src/database/mongo.js | 79 ++++++++++++++++++++++++++++++++++++-------
 src/database/redis.js |  4 +--
 src/routes/debug.js   | 36 ++++++++++++++++++--
 3 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/src/database/mongo.js b/src/database/mongo.js
index fe81e0fd07..752f291249 100644
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@@ -26,15 +26,13 @@
 			});
 
 
-			db.createCollection('objects', function(err, collection) {
-			});
+			db.createCollection('objects', function(err, _collection) {
 
-			db.createCollection('sets', function(err, collection) {
 			});
 
-
 			callback(err);
 		});
+
 		// look up how its done in mongo
 		/*if (nconf.get('mongo:password')) {
 			redisClient.auth(nconf.get('mongo:password'));
@@ -68,7 +66,7 @@
 		throw new Error('not-implemented');
 	}
 
-	module.set = function(key, callback) {
+	module.set = function(key, value, callback) {
 		throw new Error('not-implemented');
 	}
 
@@ -124,15 +122,20 @@
 				return callback(err);
 			}
 
-			var data = {};
 			if(item === null) {
+				item = {};
+				for(var i=0; i<fields.length; ++i) {
+					item[fields[i]] = null;
+				}
+			} else {
 				for(var i=0; i<fields.length; ++i) {
-					data[fields[i]] = null;
+					if(item[fields[i]] === null || item[fields[i]] === undefined) {
+						item[fields[i]] = null;
+					}
 				}
-				return callback(null, data);
 			}
 
-			if(item._id) {
+			if(item && item._id) {
 				delete item._id;
 			}
 			callback(err, item);
@@ -238,23 +241,73 @@
 	// sorted sets
 
 	module.sortedSetAdd = function(key, score, value, callback) {
-		throw new Error('not-implemented');
+
+		var data = {
+			score:score,
+			value:value
+		};
+
+		data.setName = key
+		module.setObject(key+':'+value, data, callback);
 	}
 
 	module.sortedSetRemove = function(key, value, callback) {
 		throw new Error('not-implemented');
 	}
 
+	function getSortedSetRange(key, start, stop, sort, callback) {
+		db.collection('objects').find({setName:key}, {fields:{value:1}})
+			.limit(stop - start + 1)
+			.skip(start)
+			.sort({score: sort})
+			.toArray(function(err, data) {
+				if(err) {
+					return callback(err);
+				}
+
+				// maybe this can be done with mongo?
+				data = data.map(function(item) {
+					return item.value;
+				});
+
+				callback(err, data);
+			});
+	}
+
 	module.getSortedSetRange = function(key, start, stop, callback) {
-		throw new Error('not-implemented');
+		getSortedSetRange(key, start, stop, 1, callback);
 	}
 
 	module.getSortedSetRevRange = function(key, start, stop, callback) {
-		throw new Error('not-implemented');
+		getSortedSetRange(key, start, stop, -1, callback);
 	}
 
 	module.getSortedSetRevRangeByScore = function(args, callback) {
-		throw new Error('not-implemented');
+
+		//var args = ['topics:recent', '+inf', timestamp - since, 'LIMIT', start, end - start + 1];
+		var key = args[0],
+			max = (args[1] === '+inf')?Number.MAX_VALUE:args[1],
+			min = args[2],
+			start = args[4],
+			stop = args[5];
+
+
+		db.collection('objects').find({setName:key, score: {$gt:min, $lt:max}}, {fields:{value:1}})
+			.limit(stop - start + 1)
+			.skip(start)
+			.sort({score: -1})
+			.toArray(function(err, data) {
+				if(err) {
+					return callback(err);
+				}
+
+				// maybe this can be done with mongo?
+				data = data.map(function(item) {
+					return item.value;
+				});
+
+				callback(err, data);
+			});
 	}
 
 	module.sortedSetCount = function(key, min, max, callback) {
diff --git a/src/database/redis.js b/src/database/redis.js
index 07a2d54945..57bc1e02b2 100644
--- a/src/database/redis.js
+++ b/src/database/redis.js
@@ -132,8 +132,8 @@
 		redisClient.get(key, callback);
 	}
 
-	module.set = function(key, callback) {
-		redisClient.get(key, callback);
+	module.set = function(key, value, callback) {
+		redisClient.set(key, value, callback);
 	}
 
 	module.keys = function(key, callback) {
diff --git a/src/routes/debug.js b/src/routes/debug.js
index e0ca415998..85390da963 100644
--- a/src/routes/debug.js
+++ b/src/routes/debug.js
@@ -83,7 +83,7 @@ var	DebugRoute = function(app) {
 		app.get('/mongo', function(req, res) {
 
 			var db = require('./../database');
-			var objectKey = 'someotherObj';
+			var objectKey = 'testing4';
 
 			function createUser(callback) {
 				user.create('baris','123456', 'barisusakli@gmail.com', callback);
@@ -156,7 +156,27 @@ var	DebugRoute = function(app) {
 				});
 			}
 
-			var tasks = [
+
+			function sortedSetAdd(callback) {
+				db.sortedSetAdd('sortedSet2', 1, 12, function(err, data) {
+					console.log('sortedSetAdd return', data);
+					callback(err, {'sortedSetAdd': data});
+				});
+			}
+
+			function getSortedSetRange(callback) {
+				db.getSortedSetRevRange('sortedSet2', 0, -1, function(err, data) {
+					console.log('getSortedSetRange return', data);
+					callback(err, {'getSortedSetRange': data});
+				});
+				/*var args = ['sortedSet2', '+inf', 100, 'LIMIT', 0, 10];
+				db.getSortedSetRevRangeByScore(args, function(err, data) {
+					console.log('getSortedSetRevRangeByScore return', data);
+					callback(err, {'getSortedSetRevRangeByScore': data});
+				});*/
+			}
+
+			var objectTasks = [
 				//createUser,
 				getUser,
 				setObject,
@@ -175,7 +195,15 @@ var	DebugRoute = function(app) {
 				getObject
 			];
 
-			require('async').series(tasks, function(err, results) {
+			var sortedSetTasks = [
+				//sortedSetAdd,
+				getSortedSetRange,
+				sortedSetAdd,
+				getSortedSetRange
+			];
+
+
+			require('async').series(sortedSetTasks, function(err, results) {
 				if(err) {
 					console.log(err);
 					res.send(err.message);
@@ -184,6 +212,8 @@ var	DebugRoute = function(app) {
 				}
 			});
 		});
+
+
 	});
 };