tarantool16 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34d90ff491fcf45653aa4038a3c2730f67071cf3
-  data.tar.gz: 3352d2894b63e5db9407fd1c621752babfc08ff9
+  metadata.gz: af64fb29db82e36fb7a370dd4136cdff47398588
+  data.tar.gz: 6c8fcaf9af9c9fe7547f369aec65d2fdd4148a10
 SHA512:
-  metadata.gz: 34046053a18655464b966e9ad50182c3f947de8c29d63fdca3d291ec364c53538697a97845f8d048a546a5bfc543416456d60b8721e24f287af08b73182de1d0
-  data.tar.gz: a6ce2048a5ed0c7d48040015f2485ea295c57b07ba9bd8ca887fe0ac18c8e17dec2f4184e687fb9e196b58f92f0315eb2b9703430757adf353117c19f2569ea6
+  metadata.gz: 5190f23a23de008bfd24c08a2170418941f5d99af23dda05e9c166ea5b0599a3bd8dec79da6309a32dea7c33e94ee498148d1f4d776a8bfb213425769d166d06
+  data.tar.gz: f1b4bccd8d7402b88b3a30ebd9e403fb727586fed05e54051a977f1127db9fdd2391b053e7f8824ca1d941d4671caa49769fd6895e1ced7f8613b0c70216b068

data/README.md

@@ -71,6 +71,7 @@ tar.update(:_space, {name: 'test'}, {format: [:=, [{name: :id, type: :num}, {nam
 
 ## Changelog
 
+0.0.7 - Implement EVAL, fix REPLACE
 0.0.6 - DumbConnection supports timeouts
 
 ## Contributing

data/lib/tarantool16/connection/common.rb

@@ -76,6 +76,8 @@ module Tarantool16
         str.setbyte(2, sz>>16)
         str.setbyte(1, sz>>24)
         str
+      ensure
+        @p.clear
       end
 
       def format_authenticate(user, pass1, salt)
@@ -106,6 +108,7 @@ module Tarantool16
         end
         n
       rescue ::MessagePack::UnpackError, ::MessagePack::TypeError => e
+        @u.reset
         e
       end
 
@@ -137,6 +140,7 @@ module Tarantool16
         end
         Option.ok(sync, code, body)
       rescue ::MessagePack::UnpackError, ::MessagePack::TypeError => e
+        @u.reset
         Option.error(sync, e, nil)
       end
 
@@ -196,6 +200,12 @@ module Tarantool16
         send_request(REQUEST_TYPE_CALL, req, cb)
       end
 
+      def _eval(expr, args, cb)
+        req = {IPROTO_EXPR => expr,
+               IPROTO_TUPLE => args}
+        send_request(REQUEST_TYPE_EVAL, req, cb)
+      end
+
       REQ_EMPTY = {}.freeze
       def _ping(cb)
         send_request(REQUEST_TYPE_PING, REQ_EMPTY, cb)

data/lib/tarantool16/connection/dumb.rb

@@ -24,6 +24,7 @@ module Tarantool16
         written = true
         response = _read_response
       rescue ::Errno::EPIPE, Retry => e
+        @socket.close rescue nil
         @socket = nil
         if !written && @retry && @reconnect
           @retry = false

data/lib/tarantool16/consts.rb

@@ -10,6 +10,7 @@ module Tarantool16
   IPROTO_TUPLE = 0x21
   IPROTO_FUNCTION_NAME = 0x22
   IPROTO_USER_NAME = 0x23
+  IPROTO_EXPR = 0x27
   IPROTO_DATA = 0x30
   IPROTO_ERROR = 0x31
 
@@ -24,6 +25,7 @@ module Tarantool16
   REQUEST_TYPE_DELETE = 5
   REQUEST_TYPE_CALL = 6
   REQUEST_TYPE_AUTHENTICATE = 7
+  REQUEST_TYPE_EVAL = 8
   REQUEST_TYPE_ERROR = 1 << 15
 
 

data/lib/tarantool16/db.rb

@@ -140,7 +140,7 @@ module Tarantool16
       _with_space(sno, cb) do |sp|
         _tuple = tuple.is_a?(Hash) ? sp.map_tuple(tuple) : tuple
         _cb = need_hash ? sp.wrap_cb(cb) : cb
-        conn.insert(sp.sid, _tuple, _cb)
+        conn._replace(sp.sid, _tuple, _cb)
       end
     end
 
@@ -197,6 +197,10 @@ module Tarantool16
       conn._call(name, args, cb)
     end
 
+    def _eval(expr, args, cb)
+      conn._eval(expr, args, cb)
+    end
+
     def _ping(cb)
       conn._ping(cb)
     end

data/lib/tarantool16/dumb_db.rb

@@ -63,6 +63,10 @@ module Tarantool16
       _call(name, args, RETURN_OR_RAISE)
     end
 
+    def eval(expr, args)
+      _eval(expr, args, RETURN_OR_RAISE)
+    end
+
     def _synchronized
       yield
     end

data/lib/tarantool16/version.rb

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

data/tarantool16.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "msgpack", ">= 0.5.9"
+  spec.add_dependency "msgpack", ">= 0.5.11"
 end

data/test/test_dumb.rb

@@ -64,6 +64,10 @@ describe 'DumbConnection' do
     db.delete(:test, "world", index: 1).must_equal [r2]
   end
 
+  it "should eval" do
+    db.eval("local a, b = ... ; return a + b", [1, 2]).must_equal [3]
+  end
+
   describe "with field names" do
     before {
       db.define_fields(:test, [[:id, :int], [:name, :str], [:point, :array], [:count, :int]])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarantool16
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Sokolov Yura aka funny_falcon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 0.5.11
 description: adapter for Tarantool 1.6
 email:
 - funny.falcon@gmail.com