Skip to content

Commit fab8d4b

Browse files
KlonD90KlonD90
committed
upsert in progress
1 parent f1c11ad commit fab8d4b

File tree

5 files changed

+126
-23
lines changed

5 files changed

+126
-23
lines changed

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ So it's insert. More you can read here: http://tarantool.org/doc/book/box/box_sp
8787

8888
Promise resolve a new tuple.
8989

90+
**upsert(spaceId: Number or String, tuple: tuple) : Promise(Tuple)**
91+
92+
So it's insert. More you can read here: http://tarantool.org/doc/book/box/box_space.html
93+
94+
Promise resolve a new tuple.
95+
9096

9197
**replace(spaceId: Number or String, tuple: tuple) : Promise(Tuple)**
9298

‎lib/connection.js‎

Lines changed: 76 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,36 +55,43 @@ TarantoolConnection.prototype._getSpaceId = function(name){
5555
return this.select(tarantoolConstants.Space.space, tarantoolConstants.IndexSpace.name, 1, 0,
5656
tarantoolConstants.IteratorsType.all, [name])
5757
.then(function(value){
58-
var spaceId = value[0][0];
59-
this.namespace[name] = {
60-
id: spaceId,
61-
name: name,
62-
indexes: {}
63-
};
64-
this.namespace[spaceId] = {
65-
id: spaceId,
66-
name: name,
67-
indexes: {}
68-
};
69-
return spaceId;
58+
if (value && value.length && value[0])
59+
{
60+
var spaceId = value[0][0];
61+
this.namespace[name] = {
62+
id: spaceId,
63+
name: name,
64+
indexes: {}
65+
};
66+
this.namespace[spaceId] = {
67+
id: spaceId,
68+
name: name,
69+
indexes: {}
70+
};
71+
return spaceId;
72+
}
73+
else
74+
{
75+
throw new Error('Cannot read a space name or space is not defined');
76+
}
7077
}.bind(this))
71-
.catch(function(e){
72-
reject(new Error('cannot detect space by name'));
73-
});
7478
};
7579

7680
TarantoolConnection.prototype._getIndexId = function(spaceId, indexName){
7781
return this.select(tarantoolConstants.Space.index, tarantoolConstants.IndexSpace.indexName, 1, 0,
7882
tarantoolConstants.IteratorsType.all, [spaceId, indexName])
79-
.then(function(value){
80-
var indexId = value[0][1];
81-
var space = this.namespace[spaceId];
82-
if (space)
83-
{
84-
this.namespace[space.name].indexes[indexName] = indexId;
85-
this.namespace[space.id].indexes[indexName] = indexId;
83+
.then(function(value) {
84+
if (value && value[0] && value[0].length>1) {
85+
var indexId = value[0][1];
86+
var space = this.namespace[spaceId];
87+
if (space) {
88+
this.namespace[space.name].indexes[indexName] = indexId;
89+
this.namespace[space.id].indexes[indexName] = indexId;
90+
}
91+
return indexId;
8692
}
87-
return indexId;
93+
else
94+
throw new Error('Cannot read a space name indexes or index is not defined');
8895
}.bind(this));
8996
};
9097

@@ -305,6 +312,8 @@ TarantoolConnection.prototype.ping = function(){
305312
};
306313

307314
TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset, iterator, key){
315+
if (Number.isInteger(key))
316+
key = [key];
308317
return new Promise(function(resolve, reject){
309318
if (typeof(spaceId)=='string' || typeof(indexId)=='string')
310319
{
@@ -341,6 +350,8 @@ TarantoolConnection.prototype.select = function(spaceId, indexId, limit, offset,
341350
};
342351

343352
TarantoolConnection.prototype.delete = function(spaceId, indexId, key){
353+
if (Number.isInteger(key))
354+
key = [key];
344355
return new Promise(function (resolve, reject) {
345356
if (Array.isArray(key))
346357
{
@@ -372,6 +383,8 @@ TarantoolConnection.prototype.delete = function(spaceId, indexId, key){
372383
};
373384

374385
TarantoolConnection.prototype.update = function(spaceId, indexId, key, ops){
386+
if (Number.isInteger(key))
387+
key = [key];
375388
return new Promise(function (resolve, reject) {
376389
if (Array.isArray(ops) && Array.isArray(key)){
377390
if (typeof(spaceId)=='string' || typeof(indexId)=='string')
@@ -403,6 +416,46 @@ TarantoolConnection.prototype.update = function(spaceId, indexId, key, ops){
403416
}.bind(this));
404417
};
405418

419+
420+
421+
TarantoolConnection.prototype.upsert = function(spaceId, key, ops, tuple){
422+
return new Promise(function (resolve, reject) {
423+
if (Number.isInteger(key))
424+
key = [key];
425+
if (Array.isArray(ops) && Array.isArray(key)){
426+
if (typeof(spaceId)=='string' || typeof(indexId)=='string')
427+
{
428+
return this._getMetadata(spaceId, indexId)
429+
.then(function(info){
430+
return this.update(info[0], info[1], key, ops);
431+
}.bind(this))
432+
.then(resolve)
433+
.catch(reject);
434+
}
435+
var reqId = requestId.getId();
436+
var header = this._header(tarantoolConstants.RequestCode.rqUpsert, reqId);
437+
var buffered = {
438+
spaceId: msgpack.encode(spaceId),
439+
//indexId: msgpack.encode(indexId),
440+
ops: msgpack.encode(ops),
441+
key: msgpack.encode(key),
442+
tuple: msgpack.encode(tuple)
443+
};
444+
var body = Buffer.concat([new Buffer([0x84,tarantoolConstants.KeysCode.space_id]), buffered.spaceId,
445+
//new Buffer([tarantoolConstants.KeysCode.index_id]), buffered.indexId,
446+
new Buffer([tarantoolConstants.KeysCode.key]), buffered.key,
447+
new Buffer([tarantoolConstants.KeysCode.tuple]), buffered.ops,
448+
new Buffer([tarantoolConstants.KeysCode.def_tuple]), buffered.tuple]);
449+
console.log(body);
450+
this._request(header, body);
451+
this.commandsQueue.push([tarantoolConstants.RequestCode.rqUpsert, reqId, {resolve: resolve, reject: reject}]);
452+
}
453+
else
454+
reject(new Error('need array'));
455+
}.bind(this));
456+
};
457+
458+
406459
TarantoolConnection.prototype.eval = function(expression){
407460
var tuple = Array.prototype.slice.call(arguments, 1);
408461
return new Promise(function (resolve, reject) {

‎lib/const.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const RequestCode = {
1111
rqCall: 0x06,
1212
rqAuth: 0x07,
1313
rqEval: 0x08,
14+
rqUpsert: 0x09,
1415
rqDestroy: 0x100, //fake for destroy socket cmd
1516
rqPing: 0x40
1617
};
@@ -28,6 +29,7 @@ const KeysCode = {
2829
function_name: 0x22,
2930
username: 0x23,
3031
expression: 0x27,
32+
def_tuple: 0x28,
3133
data: 0x30,
3234
error: 0x31
3335
};

‎test/app.js‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,40 @@ describe('Tarantool Connection tests', function(){
238238
.catch(done);
239239
});
240240
});
241+
describe('upsert', function(){
242+
var conn;
243+
before(function(done){
244+
try{
245+
conn = new TarantoolConnection({port: 33013, log: true});
246+
conn.connect().then(function(){
247+
return conn.auth('test', 'test');
248+
}, function(e){ throw 'not connected'; done();})
249+
.then(function(){
250+
return Promise.all([
251+
conn.delete('upstest', 'primary', 1)
252+
]);
253+
})
254+
.then(function(){
255+
done();
256+
})
257+
.catch(function(e){
258+
done(e);
259+
});
260+
}
261+
catch(e){
262+
console.log(e);
263+
}
264+
});
265+
it('try', function(done){
266+
conn.upsert(517, [1], [['+', 3, 3]], [1, 2, 3])
267+
.then(function(tuple){
268+
assert.deepEqual(tuple, [1, 2, 3]);
269+
done();
270+
})
271+
272+
.catch(function(e){
273+
done(e);
274+
})
275+
})
276+
});
241277
});

‎test/box.lua‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ if not box.space.toaddmore then
6969
box.schema.user.grant('test', 'read,write,execute', 'space', '_index')
7070
end
7171

72+
if not box.space.upstest then
73+
local s = box.schema.space.create('upstest')
74+
s:create_index('primary', {type = 'TREE', unique = true, parts = {1, 'NUM'}})
75+
box.schema.user.grant('test', 'read,write,execute', 'space', 'upstest')
76+
end
77+
7278
function clearaddmore()
7379
local values = box.space.toaddmore:select{}
7480
for k,v in pairs(values) do

0 commit comments

Comments
 (0)