lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #530 from learno/master

Browse Source 
sort support multi key
This commit is contained in:
云风
2016-08-04 13:56:11 +08:00
committed by GitHub
parent e2fa2a1a4d c082d71a56
commit 2f23367671
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lualib/mongo.lua
View File

@@ -7,6 +7,7 @@ local md5 = require "md5"
local crypt = require "crypt" local crypt = require "crypt"
local rawget = rawget local rawget = rawget
local assert = assert local assert = assert
local table = table
local bson_encode = bson.encode local bson_encode = bson.encode
local bson_encode_order = bson.encode_order local bson_encode_order = bson.encode_order
@@ -395,8 +396,19 @@ function mongo_collection:find(query, selector)
} , cursor_meta) } , cursor_meta)
end end
function mongo_cursor:sort(key_list) -- cursor:sort { key = 1 } or cursor:sort( {key1 = 1}, {key2 = -1})
self.__sortquery = bson_encode {['$query'] = self.__query, ['$orderby'] = key_list} function mongo_cursor:sort(key, key_v, ...)
if key_v then
local key_list = {}
for _, kp in ipairs {key, key_v, ...} do
local next_func, t = pairs(kp)
local k, v = next_func(t, v) -- The first key pair
table.insert(key_list, k)
table.insert(key_list, v)
end
key = bson_encode_order(table.unpack(key_list))
end
self.__sortquery = bson_encode {['$query'] = self.__query, ['$orderby'] = key}
return self return self
end end

19
test/testmongodb.lua
View File

@@ -38,24 +38,27 @@ function test_find_and_remove()
db[db_name].testdb:dropIndex("*") db[db_name].testdb:dropIndex("*")
db[db_name].testdb:drop() db[db_name].testdb:drop()
db[db_name].testdb:ensureIndex({test_key = 1}, {unique = true, name = "test_key_index"}) db[db_name].testdb:ensureIndex({test_key = 1}, {test_key2 = -1}, {unique = true, name = "test_index"})
local ret = db[db_name].testdb:safe_insert({test_key = 1}) local ret = db[db_name].testdb:safe_insert({test_key = 1, test_key2 = 1})
assert(ret and ret.n == 1) assert(ret and ret.n == 1)
local ret = db[db_name].testdb:safe_insert({test_key = 2}) local ret = db[db_name].testdb:safe_insert({test_key = 1, test_key2 = 2})
assert(ret and ret.n == 1) assert(ret and ret.n == 1)
local ret = db[db_name].testdb:findOne({test_key = 1}) local ret = db[db_name].testdb:safe_insert({test_key = 2, test_key2 = 3})
assert(ret and ret.test_key == 1) assert(ret and ret.n == 1)
local ret = db[db_name].testdb:find({test_key = {['$gt'] = 0}}):sort({test_key = -1}):skip(1):limit(1) local ret = db[db_name].testdb:findOne({test_key2 = 1})
assert(ret:count() == 2) assert(ret and ret.test_key2 == 1)
local ret = db[db_name].testdb:find({test_key2 = {['$gt'] = 0}}):sort({test_key = 1}, {test_key2 = -1}):skip(1):limit(1)
assert(ret:count() == 3)
assert(ret:count(true) == 1) assert(ret:count(true) == 1)
if ret:hasNext() then if ret:hasNext() then
ret = ret:next() ret = ret:next()
end end
assert(ret and ret.test_key == 1) assert(ret and ret.test_key2 == 1)
db[db_name].testdb:delete({test_key = 1}) db[db_name].testdb:delete({test_key = 1})
db[db_name].testdb:delete({test_key = 2}) db[db_name].testdb:delete({test_key = 2})