tarantool16 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f0cdce1f8470261a302880dab218dab3bdca96
-  data.tar.gz: d4741e947f16031249f814ee47d26f9cb6451ab1
+  metadata.gz: 34d90ff491fcf45653aa4038a3c2730f67071cf3
+  data.tar.gz: 3352d2894b63e5db9407fd1c621752babfc08ff9
 SHA512:
-  metadata.gz: 570159a2cd2aeda88a8e70d98e334354647c4e8cc32e63cd3cfbef9cf8636d6526564773e7ebf2103ebc421dbb671d3b5ba86dc90e1aff00bb4343b9a88a6dfb
-  data.tar.gz: 18ba0629d6f4946d872840b12fce21633137eb161feab8ccb4b71ddf55494100ab62ccb62008a829405b0d79410982f3ec759979d28445dbcf4cb7748a8546e2
+  metadata.gz: 34046053a18655464b966e9ad50182c3f947de8c29d63fdca3d291ec364c53538697a97845f8d048a546a5bfc543416456d60b8721e24f287af08b73182de1d0
+  data.tar.gz: a6ce2048a5ed0c7d48040015f2485ea295c57b07ba9bd8ca887fe0ac18c8e17dec2f4184e687fb9e196b58f92f0315eb2b9703430757adf353117c19f2569ea6

data/README.md

@@ -69,6 +69,10 @@ tar.update(:_space, {name: 'test'}, {format: [:=, [{name: :id, type: :num}, {nam
 
 ```
 
+## Changelog
+
+0.0.6 - DumbConnection supports timeouts
+
 ## Contributing
 
 1. Fork it ( https://github.com/funny-falcon/tarantool16/fork )

data/lib/tarantool16/connection/common.rb

@@ -10,6 +10,7 @@ module Tarantool16
     class ConnectionError < Error; end
     class CouldNotConnect < ConnectionError; end
     class Disconnected < ConnectionError; end
+    class Timeout < ConnectionError; end
     class Retry < ConnectionError; end
     class UnexpectedResponse < Error; end
 
@@ -31,6 +32,7 @@ module Tarantool16
         else
           @reconnect = false
         end
+        @timeout = opts[:timeout]
         @p = MessagePack::Packer.new
         @u = MessagePack::Unpacker.new
         @s = 0
@@ -127,10 +129,10 @@ module Tarantool16
         elsif code == nil
           return Option.error(nil, UnexpectedResponse, "Mailformed response: no code for sync=#{sync}")
         end
-        unless @u.buffer.empty?
+        begin
           bmap = @u.read
           body = bmap[IPROTO_DATA] || bmap[IPROTO_ERROR]
-        else
+        rescue EOFError
           body = nil
         end
         Option.ok(sync, code, body)
@@ -139,8 +141,12 @@ module Tarantool16
       end
 
       def host_port
-        h, p = @host.split(':')
-        [h, p.to_i]
+        @host =~ /^(.*):([^:]+)$/
+        [$1, $2.to_i]
+      end
+
+      def _ipv6?
+        @host.count(':') > 1
       end
 
       def _insert(space_no, tuple, cb)

data/lib/tarantool16/connection/dumb.rb

@@ -1,4 +1,10 @@
 require 'socket'
+require 'io/wait'
+begin
+  #require 'kgio'
+rescue LoadError
+end
+
 require_relative 'common'
 module Tarantool16
   module Connection
@@ -61,17 +67,25 @@ module Tarantool16
         unless could_be_connected?
           raise Disconnected, "connection is closed"
         end
-        @socket = TCPSocket.new(*host_port)
+        @socket = Socket.new((_ipv6? ? Socket::AF_INET6 : Socket::AF_INET), Socket::SOCK_STREAM)
         @socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)
+        @socket.sync = true
+        sockaddr = Socket.pack_sockaddr_in(*host_port.reverse)
         @retry = @reconnect
-        greeting = @socket.read(IPROTO_GREETING_SIZE)
+        if @timeout
+          _connect_nonblock(sockaddr)
+        else
+          @socket.connect(sockaddr)
+        end
+        greeting = _read(IPROTO_GREETING_SIZE)
         unless greeting && greeting.bytesize == IPROTO_GREETING_SIZE
           raise Disconnected, "mailformed greeting #{greeting.inspect}"
         end
         @nbuf = "\x00\x00\x00\x00\x00".force_encoding('BINARY')
         parse_greeting greeting
         authenticate if @user
-      rescue ::Errno::ECONNREFUSED, ::Errno::EPIPE, Disconnected => e
+      rescue ::Errno::ECONNREFUSED, ::Errno::EPIPE, Disconnected, Timeout => e
+        @socket.close rescue nil
         @socket = nil
         if !@reconnect
           @socket = false
@@ -82,9 +96,37 @@ module Tarantool16
         raise CouldNotConnect, e.message
       end
 
+      def _connect_nonblock(sockaddr)
+        expire = now_f + @timeout
+        begin
+          @socket.connect_nonblock(sockaddr)
+        rescue IO::WaitWritable
+          t = [@socket]
+          IO.select(t, t, nil, expire - now_f)
+          begin
+            @socket.connect_nonblock(sockaddr)
+          rescue Errno::EISCONN
+          end
+        end
+      end
+
       def syswrite(req)
-        if @socket.syswrite(req) != req.bytesize
-          raise Retry, "Could not write message"
+        unless @timeout
+          if @socket.syswrite(req) != req.bytesize
+            raise Retry, "Could not write message"
+          end
+        else
+          expire = now_f
+          begin
+            until req.empty?
+              n = @socket.write_nonblock(req)
+              req = req[n..-1]
+            end
+          rescue IO::WaitWritable
+            _wait_writable(expire - now_f)
+          rescue Errno::EINTR
+            retry
+          end
         end
       end
 
@@ -94,7 +136,7 @@ module Tarantool16
       end
 
       def _read_response
-        str = @socket.read(5, @nbuf)
+        str = _read(5, @nbuf)
         unless str && str.bytesize == 5
           # check if we sent request or not
           begin
@@ -109,7 +151,7 @@ module Tarantool16
         end
         n = parse_size(str)
         raise n unless ::Integer === n
-        resp = @socket.read(n)
+        resp = _read(n)
         raise Disconnected, "disconnected while read response" unless resp && resp.bytesize == n
         r = parse_response(resp)
         if r.ok? && r.sync != @s
@@ -117,6 +159,77 @@ module Tarantool16
         end
         r
       end
+
+      def _read(n, buf=nil)
+        unless @timeout
+          buf ? @socket.read(n, buf) : @socket.read(n)
+        else
+          expire = now_f + @timeout
+          rbuf = nil
+          while n > 0
+            case tbuf = _read_nonblock(n, buf)
+            when String
+              if rbuf
+                rbuf << tbuf
+              else
+                rbuf = tbuf
+              end
+              buf = nil
+              n -= tbuf.size
+            when :wait_readable
+              nf = now_f
+              if expire <= nf
+                raise Timeout, "response timeouted"
+              else
+                _wait_readable(expire - nf)
+              end
+            when nil
+              raise EOFError
+            end
+          end
+          return rbuf
+        end
+      end
+
+      if defined?(Kgio)
+        def _read_nonblock(n, buf)
+          return buf ? Kgio.tryread(@socket, n, buf) : Kgio.tryread(@socket, n)
+        end
+      else
+        def _read_nonblock(n, buf)
+          begin
+            if buf
+              @socket.read_nonblock(n, buf)
+            else
+              @socket.read_nonblock(n)
+            end
+          rescue IO::WaitReadable
+            return :wait_readable
+          rescue Errno::EINTR
+            retry
+          end
+        end
+      end
+
+      if RUBY_ENGINE == 'jruby'
+        def _wait_readable(timeout)
+          IO.select([@socket], nil, nil, timeout)
+        end
+      else
+        def _wait_readable(timeout)
+          @socket.wait(timeout)
+        end
+      end
+      if IO.instance_methods.include?(:wait_writable)
+        def _wait_writable(timeout)
+          @socket.wait_writable(timeout)
+        end
+      else
+        def _wait_writable(timeout)
+          t = [@socket]
+          IO.select(t, t, nil, expire - now_f)
+        end
+      end
     end
   end
 end

data/lib/tarantool16/db.rb

@@ -160,7 +160,13 @@ module Tarantool16
     def _select(sno, ino, key, offset, limit, iterator, need_hash, cb)
       key = [] if key.nil?
       ino = 0 if ino.nil? && key.is_a?(Array)
-      iterator = ::Tarantool16.iter(iterator) unless iterator.is_a?(Integer)
+      unless iterator.is_a?(Integer)
+        if key.empty? && (Array === key || Hash === key)
+          iterator = ITERATOR_ALL
+        else
+          iterator = ::Tarantool16.iter(iterator)
+        end
+      end
       if sno.is_a?(Integer) && ino.is_a?(Integer) && (key.is_a?(Array) || key.nil?)
         return conn._select(sno, ino, key, offset, limit, iterator, cb)
       end

data/lib/tarantool16/dumb_db.rb

@@ -20,36 +20,16 @@ module Tarantool16
       offset = opts[:offset] || 0
       limit = opts[:limit] || 2**30
       iterator = opts[:iterator]
-      need_hash = opts[:hash]
-      key = case key
-            when nil
-              []
-            when Array
-              key
-            when Hash
-              need_hash = true
-              key
-            else
-              [key]
-            end
+      need_hash = opts.fetch(:hash, Hash === key)
+      key = _norm_key(key)
       _select(sno, ino, key, offset, limit, iterator, need_hash, RETURN_OR_RAISE)
     end
 
     def get(sno, key, opts={})
       ino = opts[:index]
       iterator = opts[:iterator]
-      need_hash = opts[:hash]
-      key = case key
-            when nil
-              []
-            when Array
-              key
-            when Hash
-              need_hash = true
-              key
-            else
-              [key]
-            end
+      need_hash = opts.fetch(:hash, Hash === key)
+      key = _norm_key(key)
       _select(sno, ino, key, 0, 1, iterator, need_hash, RETURN_ONE_OR_RAISE)
     end
 
@@ -64,14 +44,18 @@ module Tarantool16
     end
 
     def delete(sno, key, opts = {})
-      ino = opts[:index]
-      need_hash = opts[:hash] || key.is_a?(Hash)
+      key_hash = Hash === key
+      ino = opts[:index] || (key_hash ? nil : 0)
+      need_hash = opts.fetch(:hash, key_hash)
+      key = _norm_key(key)
       _delete(sno, ino, key, need_hash, RETURN_OR_RAISE)
     end
 
     def update(sno, key, ops, opts = {})
-      ino = opts[:index]
-      need_hash = opts[:hash] || key.is_a?(Hash)
+      key_hash = Hash === key
+      ino = opts[:index] || (key_hash ? nil : 0)
+      need_hash = opts.fetch(:hash, key_hash)
+      key = _norm_key(key)
       _update(sno, ino, key, ops, need_hash, RETURN_OR_RAISE)
     end
 
@@ -83,6 +67,17 @@ module Tarantool16
       yield
     end
 
+    def _norm_key(key)
+      case key
+      when Array
+        key
+      when Hash
+        key
+      else
+        [key]
+      end
+    end
+
     class SchemaFuture
       UNDEF = Object.new.freeze
       def initialize

data/lib/tarantool16/schema.rb

@@ -70,17 +70,15 @@ module Tarantool16
       @indices && !@indices.empty?
     end
 
-    def get_ino(ino, key, iter, cb)
+    def get_ino(ino, key, _iter, cb)
       if ino.nil?
         unless key.is_a?(Hash)
           opt = Option.error(SchemaError, "Could not detect index without field names and iterator: #{key.inspect} in #{name_sid}")
           return cb.call(opt)
         end
-        unless iter.is_a?(Integer)
-          iter = ::Tarantool16.iter(iter)
-        end
         # key should be Hash here
         keys = key.keys
+        keys << _iter
         _ino = @_fields_2_ino[keys]
         if _ino
           ind = @indices[_ino]
@@ -89,6 +87,8 @@ module Tarantool16
           opt = Option.error(SchemaError, "Could not detect index for fields #{key.keys} in #{name_sid}")
           return cb.call(opt)
         end
+        keys.pop
+        iter = _iter.is_a?(Integer) ? _iter : ::Tarantool16.iter(iter)
 
         fields = keys.map{|fld|
           case fld
@@ -105,7 +105,7 @@ module Tarantool16
         for ind in @indices
           next unless ind
           first_fields = ind.parts[0,fields.size]
-          if ind.can_iterator?(iter)
+          if ind.can_iterator?(iter, fields.size)
             if fields == first_fields
               index = ind
               break
@@ -114,6 +114,7 @@ module Tarantool16
             end
           end
         end
+        keys << _iter
         if index
           @_fields_2_ino[keys.freeze] = index.pos
           yield index.pos, index.map_key(key)
@@ -189,7 +190,15 @@ module Tarantool16
           _op[1] = @field_names[_1].pos
           _op
         when Array
-          _1.dup.insert(1, @field_names[op[0]].pos)
+          fld_pos = case op[0]
+                when Integer
+                  op[0]
+                when Symbol, String
+                  @field_names[op[0]].pos
+                else
+                  raise "No field #{op[0].inspect} in #{name_sid}"
+                end
+          _1.dup.insert(1, fld_pos)
         end
       end
     end
@@ -236,8 +245,18 @@ module Tarantool16
         }
       end
 
-      def can_iterator?(iter)
-        @iters.include?(iter)
+      def can_iterator?(iter, flds_cnt)
+        @iters.include?(iter) && begin
+          if iter == ITERATOR_ALL
+            true
+          elsif @type == :hash && flds_cnt == @parts.count
+            true
+          elsif flds_cnt == 1
+            true
+          else
+            false
+          end
+        end
       end
 
       def map_key(key)

data/lib/tarantool16/version.rb

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

data/test/bench_timeout.rb

@@ -0,0 +1,36 @@
+require 'tarantool16'
+require 'timeout'
+
+def bench_1000_get(kind, timeout=nil)
+  case kind
+  when :no, :external
+    db = Tarantool16.new host: '127.0.0.1:33013'
+  when :native
+    db = Tarantool16.new host: '127.0.0.1:33013', timeout: timeout
+  end
+  now = Time.now.to_f
+  if kind == :external
+    10000.times do
+      Timeout.timeout(1) do
+        db.get(:test, 1)
+      end
+    end
+  else
+    10000.times do
+      db.get(:test, 1)
+    end
+  end
+  r = Time.now.to_f - now
+  db.conn.disconnect
+  r
+end
+
+puts "Without timeout: %f" % bench_1000_get(:no, nil)
+puts "With timeout: %f" % bench_1000_get(:native, 1)
+puts "With Timeout: %f" % bench_1000_get(:external, 1)
+puts "Without timeout: %f" % bench_1000_get(:no, nil)
+puts "With timeout: %f" % bench_1000_get(:native, 1)
+puts "With Timeout: %f" % bench_1000_get(:external, 1)
+puts "Without timeout: %f" % bench_1000_get(:no, nil)
+puts "With timeout: %f" % bench_1000_get(:native, 1)
+puts "With Timeout: %f" % bench_1000_get(:external, 1)

data/test/config.lua

@@ -15,8 +15,8 @@ end
 function reseed()
     local s1 = box.space.test
     s1:truncate()
-    s1:insert{1, "hello", {1, 2}}
-    s1:insert{2, "world", {3, 4}}
+    s1:insert{1, "hello", {1, 2}, 100}
+    s1:insert{2, "world", {3, 4}, 200}
 end
 
 pcall(function()

data/test/helper.rb

@@ -62,15 +62,40 @@ class Spawn
     Dir.chdir(@dir) do
       @pid = spawn(@binary, 'config.lua', {out: log, err: log})
     end
-    sleep(0.25)
+    100.times do
+      begin
+        TCPSocket.new('127.0.0.1', @admin_port).close
+        return
+      rescue Errno::ECONNREFUSED
+        sleep(0.02)
+      end
+    end
+    raise "NOT CONNECTED"
+  end
+
+  def with_pause
+    Process.kill('STOP', @pid)
+    yield
+  ensure
+    Process.kill('CONT', @pid)
   end
 
   def reseed
     run
     s = TCPSocket.new '127.0.0.1', @admin_port
+    begin
+      sleep(0.0005)
+      s.read_nonblock(1000)
+    rescue Errno::EWOULDBLOCK
+      retry
+    end
     s.send("reseed()\n", 0)
-    sleep(0.004)
-    s.read_nonblock(1000)
+    begin
+      sleep(0.0005)
+      s.read_nonblock(1000)
+    rescue Errno::EWOULDBLOCK
+      retry
+    end
     s.close
   end
 
@@ -92,6 +117,10 @@ class Spawn
     inst(what).reseed
   end
 
+  def self.with_pause(what=:main)
+    inst(what).with_pause{ yield }
+  end
+
   def self.stop(what=:main)
     if inst = CONF[what][:inst]
       inst.stop

data/test/test_dumb.rb

@@ -2,9 +2,16 @@ require_relative 'helper'
 
 describe 'DumbConnection' do
   before { Spawn.reseed }
-  let(:db) { Tarantool16.new host: 'localhost:16788' }
-  let(:r1) { [1, 'hello', [1,2]].deep_freeze }
-  let(:r2) { [2, 'world', [3,4]].deep_freeze }
+  let(:db) { Tarantool16.new host: 'localhost:16788', timeout: 0.1 }
+  let(:r1) { [1, 'hello', [1,2], 100].deep_freeze }
+  let(:r2) { [2, 'world', [3,4], 200].deep_freeze }
+  let(:r3) { [3, 'wicky', [7,10], 300].deep_freeze }
+
+  def rwith(r, fld, val)
+    r=r.dup
+    r[fld]=val
+    r
+  end
 
   it "should select by pk" do
     db.select(:test, 1).must_equal [r1]
@@ -35,17 +42,41 @@ describe 'DumbConnection' do
     db.select(:test, [[4,4]], index: 2, iterator: "<->").must_equal [r2, r1]
   end
 
+  it "should iterate with offset and limit" do
+    db.insert(:test, r3)
+    db.select(:test, 1, iterator: :>=, index: 3, limit: 1).must_equal [r1]
+    db.select(:test, 1, iterator: :>=, index: 3, offset: 1).must_equal [r2, r3]
+    db.select(:test, 1, iterator: :>=, index: 3, limit: 1, offset: 1).must_equal [r2]
+  end
+
   it "should insert" do
-    db.insert(:test, [4, "johny", [5,6]])
-    db.select(513, 4).must_equal [[4, "johny", [5,6]]]
+    db.insert(:test, r3)
+    db.select(513, 3).must_equal [r3]
+  end
+
+  it "should update" do
+    db.update(:test, 1, [[:+, 3, 1]]).must_equal [rwith(r1,3,101)]
+    db.update(:test, "world", {1 => [':', 6, 0, '!']}, index: 1).must_equal [rwith(r2,1,"world!")]
+  end
+
+  it "should delete" do
+    db.delete(:test, 1).must_equal [r1]
+    db.delete(:test, "world", index: 1).must_equal [r2]
   end
 
   describe "with field names" do
     before {
-      db.define_fields(:test, [[:id, :int], [:name, :str], [:point, :array]])
+      db.define_fields(:test, [[:id, :int], [:name, :str], [:point, :array], [:count, :int]])
     }
-    let(:h1){ {id:1, name:'hello', point:[1,2]}.deep_freeze }
-    let(:h2){ {id:2, name:'world', point:[3,4]}.deep_freeze }
+    let(:h1){ {id:1, name:'hello', point:[1,2], count:100}.deep_freeze }
+    let(:h2){ {id:2, name:'world', point:[3,4], count:200}.deep_freeze }
+    let(:h3) { {id:3, name:'wicky', point:[7,10], count:300}.deep_freeze }
+
+    def hwith(h, fld, val)
+      h=h.dup
+      h[fld] = val
+      h
+    end
 
     it "should select by hash" do
       db.select(:test, {id: 1}).must_equal [h1]
@@ -55,6 +86,38 @@ describe 'DumbConnection' do
     it "should iterate" do
       db.select(:test, {id: 0}, iterator: :>).must_equal [h1, h2]
       db.select(:test, {id: 4}, iterator: :<).must_equal [h2, h1]
+      db.select(:test, {name: 'hello'}, iterator: :>).must_equal [h2]
+      db.select(:test, {point: [0,0]}, iterator: "<->").must_equal [h1, h2]
+      db.select(:test, {point: [4,4]}, iterator: "<->").must_equal [h2, h1]
+    end
+
+    it "should insert" do
+      db.insert(:test, h3)
+      db.select(513, {id:3}).must_equal [h3]
+    end
+
+    it "should update" do
+      db.update(:test, {id: 1}, [[:+, :count, 1]]).must_equal [hwith(h1, :count, 101)]
+      db.update(:test, {name: "world"}, {count:  [:+, 1]}).must_equal [hwith(h2, :count, 201)]
+    end
+  end
+
+  describe "timeouts" do
+    it "should timeout on connect" do
+      Spawn.with_pause do
+        proc {
+          db.get(:test, 1)
+        }.must_raise Tarantool16::Connection::CouldNotConnect
+      end
+    end
+
+    it "should timeout on request" do
+      db.get(:test, 1)
+      Spawn.with_pause do
+        proc {
+          db.get(:test, 1)
+        }.must_raise Tarantool16::Connection::Timeout
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarantool16
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sokolov Yura aka funny_falcon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - lib/tarantool16/schema.rb
 - lib/tarantool16/version.rb
 - tarantool16.gemspec
+- test/bench_timeout.rb
 - test/config.lua
 - test/helper.rb
 - test/test_dumb.rb
@@ -100,11 +101,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: adapter for Tarantool 1.6
 test_files:
+- test/bench_timeout.rb
 - test/config.lua
 - test/helper.rb
 - test/test_dumb.rb