unpack to table.unpack

This commit is contained in:
Cloud Wu
2015-01-23 17:15:30 +08:00
parent 40794a90b8
commit e44f589c53
2 changed files with 11 additions and 11 deletions

View File

@@ -230,10 +230,10 @@ function mongo_collection:insert(doc)
end end
function mongo_collection:safe_insert(doc) function mongo_collection:safe_insert(doc)
return self.database:runCommand("insert", self.name, "documents", {bson_encode(doc)}) return self.database:runCommand("insert", self.name, "documents", {bson_encode(doc)})
end end
function mongo_collection:batch_insert(docs) function mongo_collection:batch_insert(docs)
for i=1,#docs do for i=1,#docs do
if docs[i]._id == nil then if docs[i]._id == nil then
docs[i]._id = bson.objectid() docs[i]._id = bson.objectid()
@@ -291,7 +291,7 @@ function mongo_collection:createIndex(keys, option)
for k, v in pairs(keys) do for k, v in pairs(keys) do
name = (name == nil) and k or (name .. "_" .. k) name = (name == nil) and k or (name .. "_" .. k)
name = name .. "_" .. v name = name .. "_" .. v
end end
end end
@@ -319,13 +319,13 @@ end
-- collection:findAndModify({query = {name = "userid"}, update = {["$inc"] = {nextid = 1}}, }) -- collection:findAndModify({query = {name = "userid"}, update = {["$inc"] = {nextid = 1}}, })
-- keys, value type -- keys, value type
-- query, table -- query, table
-- sort, table -- sort, table
-- remove, bool -- remove, bool
-- update, table -- update, table
-- new, bool -- new, bool
-- fields, bool -- fields, bool
-- upsert, boolean -- upsert, boolean
function mongo_collection:findAndModify(doc) function mongo_collection:findAndModify(doc)
assert(doc.query) assert(doc.query)
assert(doc.update or doc.remove) assert(doc.update or doc.remove)
@@ -335,7 +335,7 @@ function mongo_collection:findAndModify(doc)
table.insert(cmd, k) table.insert(cmd, k)
table.insert(cmd, v) table.insert(cmd, v)
end end
return self.database:runCommand(unpack(cmd)) return self.database:runCommand(table.unpack(cmd))
end end
function mongo_cursor:hasNext() function mongo_cursor:hasNext()

View File

@@ -35,7 +35,7 @@ local function dump_list(list)
end end
skynet.start(function() skynet.start(function()
local list = skynet.call(".launcher","lua", unpack(cmd)) local list = skynet.call(".launcher","lua", table.unpack(cmd))
if list then if list then
dump_list(list) dump_list(list)
end end