tarantool 0.4.4.0 → 0.5.0

data/Gemfile

@@ -10,6 +10,9 @@ group :test do
   gem "yajl-ruby"
   gem "bson"
   gem "bson_ext"
+  gem "rake"
+  gem "kgio"
+  gem "eventmachine"
 end
 # Specify your gem's dependencies in tarantool.gemspec
 gemspec name: 'tarantool'

data/ext/tarantool/response_c.c

@@ -133,7 +133,7 @@ unpack_tuples(VALUE self, VALUE data, VALUE fields, VALUE _tail, VALUE tuples_af
         }
         end = str + 8 + *(uint32_t*)str;
         tuplen = *(uint32_t*)(str+4);
-        tuple = rb_ary_new2(fieldsn);
+        tuple = rb_ary_new2(tuplen);
         str += 8;
         len -= 8;
         for(i = 0; i < tuplen; i++) {

data/lib/tarantool/record/select.rb

@@ -56,13 +56,14 @@ module Tarantool
 
       def auto_shard
         params = @params.dup
-        params.delte :shard
+        params.delete :shard
         self.class.new(@record, params)
       end
 
       def all
         results.dup
       end
+      alias to_a all
 
       def first
         space.select(@params[:where], @params[:offset] || 0, 1).first

data/lib/tarantool/request.rb

@@ -253,9 +253,9 @@ module Tarantool
         op = operation[1]
         op = UPDATE_OPS[op]  unless Integer === op
         raise ArgumentError, "Unknown operation #{operation[1]}" unless op
-        ::BinUtils.append_int32_int8_le!(body, field_no, op)
         case op
         when 0
+          ::BinUtils.append_int32_int8_le!(body, field_no, op)
           if (type = fields[field_no]).nil?
             if operation.size == 4 && Symbol === operation.last
               *operation, type = operation
@@ -268,11 +268,13 @@ module Tarantool
           end
           pack_field(body, type, operation[2])
         when 1, 2, 3, 4
+          ::BinUtils.append_int32_int8_le!(body, field_no, op)
           unless operation.size == 3 && !operation[2].nil?
             raise ArgumentError, "wrong arguments for integer operation #{operation.inspect}"
           end
           pack_field(body, :sint, operation[2])
         when 5
+          ::BinUtils.append_int32_int8_le!(body, field_no, op)
           unless operation.size == 5 && !operation[2].nil? && !operation[3].nil?
             raise ArgumentError, "wrong arguments for slice operation #{operation.inspect}"
           end
@@ -283,9 +285,10 @@ module Tarantool
           ::BinUtils.append_bersize_int32_le!(body, operation[3].to_i)
           ::BinUtils.append_bersize_string!(body, str.to_s)
         when 7
-          old_field_no = field_no + 
+          old_field_no = field_no +
             (inserted ||= []).count{|i| i <= field_no} -
             (deleted ||= []).count{|i| i <= field_no}
+          ::BinUtils.append_int32_int8_le!(body, old_field_no, op)
           inserted << field_no
           if (type = fields[old_field_no]).nil?
             if operation.size == 4 && Symbol === operation.last
@@ -299,6 +302,11 @@ module Tarantool
           end
           pack_field(body, type, operation[2])
         when 6
+          old_field_no = field_no +
+            (inserted ||= []).count{|i| i <= field_no} -
+            (deleted ||= []).count{|i| i <= field_no}
+          ::BinUtils.append_int32_int8_le!(body, old_field_no, op)
+          deleted << field_no
           body << ZERO
           # pass
         end

data/lib/tarantool/version.rb

@@ -1,4 +1,4 @@
 module Tarantool
-  VERSION = "0.4.4.0"
-  RECORD_VERSION = "0.4.2.1"
+  VERSION = "0.5.0"
+  RECORD_VERSION = "0.4.3"
 end

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'minitest/spec'
 require 'rr'
 require 'fileutils'
+require 'eventmachine'
 
 require 'tarantool'
 
@@ -184,9 +185,10 @@ HSPACE3 = {
 
 module Helper
   def tarantool_pipe
-    $tarantool_pipe ||= begin
+    #$tarantool_pipe ||= begin
+    begin
         cnf = {port: 33013, admin: 33015} #TCONFIG
-        tarant = %W{tarantool -p #{cnf[:port]} -m #{cnf[:admin]}}
+        tarant = %W{tarantool -p #{cnf[:port]} -a #{cnf[:admin]}}
         tarant = [{}, *tarant, :err => [:child, :out]]
         IO.popen(tarant, 'w+').tap{|p| p.sync = true}
     end
@@ -194,10 +196,12 @@ module Helper
 
   def exec_tarantool(cmd, lines_to_read)
     cmd = cmd.gsub(/^\s+/, '')
-    tarantool_pipe.puts(cmd)
-    tarantool_pipe.flush
+    pipe = tarantool_pipe
+    pipe.puts(cmd)
+    pipe.flush
     lines_to_read.times do
-      tarantool_pipe.gets
+      #STDERR.puts pipe.gets
+      pipe.gets
     end
   end
 
@@ -284,14 +288,11 @@ module Helper
     yield
   end
 
-  def mock(u, meth, &block)
-    u.define_singleton_method(meth, &block)
-  end
 end
 
 class MiniTest::Unit::TestCase
   include ::Helper
-  include RR::Adapters::MiniTest
+  include ::RR::Adapters::MiniTest
 end
 
 class << MiniTest::Spec

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.4.0
 platform: ruby
 authors:
 - Andrew Rudenko
@@ -10,72 +10,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.8
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.8
+    none: false
+  prerelease: false
   name: iproto
-- !ruby/object:Gem::Dependency
   type: :runtime
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
+    none: false
+  prerelease: false
   name: murmurhash3
-- !ruby/object:Gem::Dependency
   type: :runtime
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+    none: false
+  prerelease: false
   name: sumbur
-- !ruby/object:Gem::Dependency
   type: :runtime
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
+    none: false
+  prerelease: false
   name: bin_utils
+  type: :runtime
 description: Tarantool KV-storage client.
 email:
 - ceo@prepor.ru
@@ -150,17 +150,23 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: -252277814378406513
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: -252277814378406513
       version: '0'
+      segments:
+      - 0
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23