tarantool16 0.0.8 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c6f3dd4aa811b1cb867865472ca56c2ebafb90
-  data.tar.gz: 009fceed5451625228f289889a4b000d6595e6ea
+  metadata.gz: 023336b8ef9383c64a2f05157b93a4184f22bcc1
+  data.tar.gz: e88b102d00165c541d9ff1a433e10ec54af97ada
 SHA512:
-  metadata.gz: 52ec4a7a31e37024fc0aac40f23812d6fa0a153526fd4eb5ca017c5d8bc4ea084a590e9ed0c1c6f043a85ff7485de956657ede835f81e89cc54cbc6907b04fc8
-  data.tar.gz: 2a82a91c5288ced4bdbe9f0e878464cc07aff7704314f398025b21785ee7a40291e5088c88144eac1f29b0a55a8864ee5900ff7a2bfe36c620c95d8a395b65fa
+  metadata.gz: fffa01cb78d4571c93271018b724b152cdede06f781145365d09a2792e12c732a451b1a9c663e2fa6e98eb97e1395b4fd720b89821025c6a1501fbbc214f5864
+  data.tar.gz: 845c92f4ccba0b1e81fe2115b578d4d450bd64f4b7b2b113da8626824a0df3d1fbd169cd52db93220e1e922553971e6cdd4f19881418aaa5778f67ba9b40fb3b

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Sokolov Yura aka funny_falcon
+Copyright (c) 2014-2016 Sokolov Yura aka funny_falcon
 
 MIT License
 

data/README.md

@@ -29,6 +29,9 @@ require 'tarantool16'
 
 db = Tarantool16.new host:'localhost:33013'
 #db = Tarantool16.new host:'localhost:33013', user:'tester', password:'testpass'
+#db = Tarantool16.new host:['tcp','localhost:33013']
+#db = Tarantool16.new host:['unix','path/to.sock']
+#db = Tarantool16.new unix:'path/to.sock'
 
 # select from '_space' space info about 'test' table
 # returns array of tuples as an array
@@ -71,6 +74,12 @@ tar.update(:_space, {name: 'test'}, {format: [:=, [{name: :id, type: :num}, {nam
 
 ## Changelog
 
+0.0.11 - change a way of unix socket option.
+        since previos scheme were introduced 12 hours ago,
+        i think it is still safe to change it.
+0.0.10 - a bit of fixes
+0.0.9 - Fix detection of update operation shape
+        Add unix socket connection.
 0.0.8 - Fix schema read from new tarantool versions
         Implement UPSERT
 0.0.7 - Implement EVAL, fix REPLACE

data/lib/tarantool16/connection/common.rb

@@ -144,13 +144,25 @@ module Tarantool16
         Option.error(sync, e, nil)
       end
 
+      def _unix?
+        @host[0] == 'unix' || @host[0] == :unix
+      end
+
+      def _tcp?
+        @host[0] == 'tcp' || @host[0] == :tcp
+      end
+
+      def _unix_sock_path
+        @host[1]
+      end
+
       def host_port
-        @host =~ /^(.*):([^:]+)$/
+        @host[1] =~ /^(.*):([^:]+)$/
         [$1, $2.to_i]
       end
 
       def _ipv6?
-        @host.count(':') > 1
+        @host[1].count(':') > 1
       end
 
       def _insert(space_no, tuple, cb)

data/lib/tarantool16/connection/dumb.rb

@@ -68,16 +68,23 @@ module Tarantool16
         unless could_be_connected?
           raise Disconnected, "connection is closed"
         end
-        @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
-        if @timeout
-          _connect_nonblock(sockaddr)
+        if _unix?
+          @socket = Socket.unix(_unix_sock_path)
+        elsif _tcp?
+          @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
+          if @timeout
+            _connect_nonblock(sockaddr)
+          else
+            @socket.connect(sockaddr)
+          end
         else
-          @socket.connect(sockaddr)
+          raise "unsupported host option: #{@host.inspect}"
         end
+
         greeting = _read(IPROTO_GREETING_SIZE)
         unless greeting && greeting.bytesize == IPROTO_GREETING_SIZE
           raise Disconnected, "mailformed greeting #{greeting.inspect}"
@@ -124,7 +131,13 @@ module Tarantool16
               req = req[n..-1]
             end
           rescue IO::WaitWritable
-            _wait_writable(expire - now_f)
+            nf = now_f
+            if expire <= nf
+              raise Timeout, "response timeouted"
+            else
+              _wait_writable(expire - nf)
+              retry
+            end
           rescue Errno::EINTR
             retry
           end
@@ -192,7 +205,16 @@ module Tarantool16
         end
       end
 
-      if defined?(Kgio)
+      if (RUBY_VERSION.split('.').map(&:to_i) <=> [2,1]) >= 0
+        EXCEPTION_FALSE = {exception: false}.freeze
+        def _read_nonblock(n, buf)
+          if buf
+            @socket.read_nonblock(n, buf, EXCEPTION_FALSE)
+          else
+            @socket.read_nonblock(n, EXCEPTION_FALSE)
+          end
+        end
+      elsif defined?(Kgio)
         def _read_nonblock(n, buf)
           return buf ? Kgio.tryread(@socket, n, buf) : Kgio.tryread(@socket, n)
         end

data/lib/tarantool16/consts.rb

@@ -33,7 +33,9 @@ module Tarantool16
 
   SPACE_SCHEMA  = 272
   SPACE_SPACE   = 280
+  SPACE_VSPACE  = 281
   SPACE_INDEX   = 288
+  SPACE_VINDEX  = 289
   SPACE_FUNC    = 296
   SPACE_USER    = 304
   SPACE_PRIV    = 312

data/lib/tarantool16/db.rb

@@ -9,7 +9,6 @@ module Tarantool16
       @future = nil
       @spaces = nil
       @defined_fields = {}
-      _fill_standard_spaces
       @conn = self.class::Connection.new(@host, @opts)
     end
 
@@ -28,14 +27,6 @@ module Tarantool16
       end
     end
 
-    def _fill_standard_spaces
-      rf = @defined_fields
-      rf[SPACE_INDEX] =
-        [%w{sid num}, %w{iid num}, %w{name str},
-         %w{type str}, %w{unique num}, %w{part_count num},
-         {name: 'parts', type: [:num, :str], tail: true}]
-    end
-
     def _synchronized
       raise "Override #_synchronized"
     end
@@ -78,7 +69,7 @@ module Tarantool16
             _synchronized do
               _fill_spaces(r.data)
               spaces = @spaces
-              _select(SPACE_INDEX, 0, [], 0, 2**30, :all, false, fill_indexes)
+              _select(SPACE_VINDEX, 0, [], 0, 2**30, :all, false, fill_indexes)
             end
           end
         end
@@ -96,7 +87,7 @@ module Tarantool16
             end
           end
         end
-        _select(SPACE_SPACE, 0, [], 0, 2**30, :all, false, fill_spaces)
+        _select(SPACE_VSPACE, 0, [], 0, 2**30, :all, false, fill_spaces)
         return future
       end
     end
@@ -187,7 +178,7 @@ module Tarantool16
 
     def _update(sno, ino, key, ops, need_hash, cb)
       ino = 0 if ino.nil? && key.is_a?(Array)
-      ops_good = ops.is_a?(Array) && ops.all?{|a| ops[1].is_a?(Integer)}
+      ops_good = ops.is_a?(Array) && ops.all?{|a| a[1].is_a?(Integer)}
       if sno.is_a?(Integer) && ino.is_a?(Integer) && key.is_a?(Array) && ops_good
         return conn._update(sno, ino, key, ops, cb)
       end
@@ -202,7 +193,7 @@ module Tarantool16
 
     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)}
+      ops_good = ops.is_a?(Array) && ops.all?{|a| a[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

data/lib/tarantool16/version.rb

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

data/lib/tarantool16.rb

@@ -5,7 +5,19 @@ module Tarantool16
   autoload :DumbDB, 'tarantool16/dumb_db'
   def self.new(opts = {})
     opts = opts.dup
-    hosts = [opts[:host], opts[:port]].compact.join(':')
+    if opts[:unix] && opts[:host]
+        raise "`:host` and `:unix` options are mutually exclusive"
+    elsif opts[:unix]
+      hosts = ["unix", opts[:unix]]
+    elsif opts[:host]
+      host = opts[:host]
+      if Array === host
+        hosts = host
+      else
+        host = [host, opts[:port]].compact.join(':')
+        hosts = ["tcp", host]
+      end
+    end
     type = opts[:type] && opts[:type].to_s || 'dumb'
     case type
     when 'dumb'

metadata

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