tarantool16 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af64fb29db82e36fb7a370dd4136cdff47398588
-  data.tar.gz: 6c8fcaf9af9c9fe7547f369aec65d2fdd4148a10
+  metadata.gz: 63c6f3dd4aa811b1cb867865472ca56c2ebafb90
+  data.tar.gz: 009fceed5451625228f289889a4b000d6595e6ea
 SHA512:
-  metadata.gz: 5190f23a23de008bfd24c08a2170418941f5d99af23dda05e9c166ea5b0599a3bd8dec79da6309a32dea7c33e94ee498148d1f4d776a8bfb213425769d166d06
-  data.tar.gz: f1b4bccd8d7402b88b3a30ebd9e403fb727586fed05e54051a977f1127db9fdd2391b053e7f8824ca1d941d4671caa49769fd6895e1ced7f8613b0c70216b068
+  metadata.gz: 52ec4a7a31e37024fc0aac40f23812d6fa0a153526fd4eb5ca017c5d8bc4ea084a590e9ed0c1c6f043a85ff7485de956657ede835f81e89cc54cbc6907b04fc8
+  data.tar.gz: 2a82a91c5288ced4bdbe9f0e878464cc07aff7704314f398025b21785ee7a40291e5088c88144eac1f29b0a55a8864ee5900ff7a2bfe36c620c95d8a395b65fa

data/README.md

@@ -71,6 +71,8 @@ tar.update(:_space, {name: 'test'}, {format: [:=, [{name: :id, type: :num}, {nam
 
 ## Changelog
 
+0.0.8 - Fix schema read from new tarantool versions
+        Implement UPSERT
 0.0.7 - Implement EVAL, fix REPLACE
 0.0.6 - DumbConnection supports timeouts
 

data/lib/tarantool16/connection/common.rb

@@ -194,6 +194,14 @@ module Tarantool16
         send_request(REQUEST_TYPE_UPDATE, req, cb)
       end
 
+      def _upsert(space_no, index_no, tuple_key, ops, cb)
+        req = {IPROTO_SPACE_ID => space_no,
+               IPROTO_INDEX_ID => index_no,
+               IPROTO_TUPLE => tuple_key,
+               IPROTO_DEF_DUPLE => ops}
+        send_request(REQUEST_TYPE_UPSERT, req, cb)
+      end
+
       def _call(name, args, cb)
         req = {IPROTO_FUNCTION_NAME => name,
                IPROTO_TUPLE => args}

data/lib/tarantool16/consts.rb

@@ -11,6 +11,7 @@ module Tarantool16
   IPROTO_FUNCTION_NAME = 0x22
   IPROTO_USER_NAME = 0x23
   IPROTO_EXPR = 0x27
+  IPROTO_DEF_DUPLE = 0x28
   IPROTO_DATA = 0x30
   IPROTO_ERROR = 0x31
 
@@ -26,6 +27,7 @@ module Tarantool16
   REQUEST_TYPE_CALL = 6
   REQUEST_TYPE_AUTHENTICATE = 7
   REQUEST_TYPE_EVAL = 8
+  REQUEST_TYPE_UPSERT = 9
   REQUEST_TYPE_ERROR = 1 << 15
 
 

data/lib/tarantool16/db.rb

@@ -114,7 +114,14 @@ module Tarantool16
 
     def _fill_indices(spaces, rows)
       rows.
-        map{|row| [row[0], [row[2], row[1], row[3], 6.step(row.size-1, 2).map{|i| row[i]}]]}.
+        map{|row|
+          if row[4].is_a? Hash
+            # new format
+            [row[0], [row[2], row[1], row[3], row[5].map(&:first)]]
+          else
+            [row[0], [row[2], row[1], row[3], 6.step(row.size-1, 2).map{|i| row[i]}]]
+          end
+        }.
         group_by{|sid, _| sid}.
         each do |sid, inds|
           sp = spaces[sid]
@@ -193,6 +200,22 @@ module Tarantool16
       end
     end
 
+    def _upsert(sno, ino, tuple_key, ops, need_hash, cb)
+      ino = 0 if ino.nil?
+      ops_good = ops.is_a?(Array) && ops.all?{|a| ops[1].is_a?(Integer)}
+      if sno.is_a?(Integer) && ino.is_a?(Integer) && tuple_key.is_a?(Array) && ops_good
+        return conn._upsert(sno, ino, tuple_key, ops, cb)
+      end
+      _with_space(sno, cb) do |sp|
+        _tuple = tuple_key.is_a?(Hash) ? sp.map_tuple(tuple_key) : tuple_key
+        sp.get_ino(ino, nil, ITERATOR_EQ, cb) do |_ino, _key|
+          _ops = ops_good ? ops : sp.map_ops(ops)
+          _cb = need_hash ? sp.wrap_cb(cb) : cb
+          conn._upsert(sp.sid, _ino, tuple_key, _ops, _cb)
+        end
+      end
+    end
+
     def _call(name, args, cb)
       conn._call(name, args, cb)
     end

data/lib/tarantool16/dumb_db.rb

@@ -59,6 +59,12 @@ module Tarantool16
       _update(sno, ino, key, ops, need_hash, RETURN_OR_RAISE)
     end
 
+    def upsert(sno, tuple_key, ops, opts = {})
+      ino = opts[:index] || 0
+      need_hash = opts.fetch(:hash, Hash === tuple_key)
+      _upsert(sno, ino, tuple_key, ops, need_hash, RETURN_OR_RAISE)
+    end
+
     def call(name, args)
       _call(name, args, RETURN_OR_RAISE)
     end

data/lib/tarantool16/schema.rb

@@ -260,7 +260,7 @@ module Tarantool16
       end
 
       def map_key(key)
-        return key if key.is_a?(Array)
+        return key if key.is_a?(Array) || key.nil?
         res = []
         positions = @part_positions
         key.each_key do |k|

data/lib/tarantool16/version.rb

@@ -1,3 +1,3 @@
 module Tarantool16
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/config.lua

@@ -11,12 +11,20 @@ if not box.space.test then
     local irtree = s1:create_index('point', {type = 'rtree', unique=false, parts = {3, 'ARRAY'}, if_not_exists = true})
     local ipname = s1:create_index('id_name', {type = 'tree', parts = {1, 'NUM', 2, 'STR'}})
 end
+if not box.space.test1 then
+    local s2 = box.schema.space.create('test1', {id = 514, if_not_exists = true})
+    local ip = s2:create_index('primary', {type = 'hash', parts = {1, 'NUM'}, if_not_exists = true})
+end
 
 function reseed()
     local s1 = box.space.test
     s1:truncate()
     s1:insert{1, "hello", {1, 2}, 100}
     s1:insert{2, "world", {3, 4}, 200}
+    local s2 = box.space.test1
+    s2:truncate()
+    s2:insert{1, "hello", {1, 2}, 100}
+    s2:insert{2, "world", {3, 4}, 200}
 end
 
 pcall(function()

data/test/test_dumb.rb

@@ -59,6 +59,13 @@ describe 'DumbConnection' do
     db.update(:test, "world", {1 => [':', 6, 0, '!']}, index: 1).must_equal [rwith(r2,1,"world!")]
   end
 
+  it "should upsert" do
+    db.upsert(:test1, [1, 'hallo', [7,5], 999], [[:+, 3, 1]])
+    db.select(:test1, 1).must_equal [rwith(r1,3,101)]
+    db.upsert(:test1, r3, [[:+, 3, 1]])
+    db.select(:test1, 3).must_equal [r3]
+  end
+
   it "should delete" do
     db.delete(:test, 1).must_equal [r1]
     db.delete(:test, "world", index: 1).must_equal [r2]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarantool16
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Sokolov Yura aka funny_falcon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler