tarantool 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d45dfdd4a7f89cdee76444521a0bf9cf82a7da18
-  data.tar.gz: 3f2c6296ec71a7abc6cec77a81d5bab886504122
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmM2OTBiNjJhNzdhNWEyZGY3ODc5NmY2OGZiNmRiOTMyMTI5ZmI0Mw==
+  data.tar.gz: !binary |-
+    Y2I2MDI0Y2NlNTU3NDcxMzJkMWUxMzdlYzkwZTFlMDA1MzJiZDE3OQ==
 SHA512:
-  metadata.gz: 9542b6c58e584561c1ebeb7125e7edbbd2b83fca3ef17bfc0ae7cb91c1d8c47bf290ada319ce1a9c4d1a89fddca31eda100aa75827ad89aef21f6d9b0a930d4c
-  data.tar.gz: 3c9b4b6e282c973505ea8f640c8db589a5e63209fe1505f2b3f57b96182e2f37855d99a666def9472c4a61b8ce7bcaee2e0fbc3f23a29a6b0d281f060826d71c
+  metadata.gz: !binary |-
+    MzVhMTVjNTYwNjUxY2Q3ZWFlNGMxYTNkYzVhMDE1MDliYjBhMjVjYzNhNzY2
+    NDE3ODQ4ODVmN2I3YmJiYjJjNGM4NzA4ZmEwYTFjZDkyYzRjNGNhZDNkMzJh
+    ZmIyN2I1NzUyMTRhZjdkMzZkMzdmYTgzM2YyNjc2MDAyMjkxMjY=
+  data.tar.gz: !binary |-
+    ZWNlZWMwM2FjNDhhMTY1MDI4NGY0NDVhMGU5NGMwMWU3ZWRkMmQ4NjBjM2Ji
+    OGUzNTljOTNjYTk0Y2RlOWRkZjZkOWQwMGMxNzg4ODQxZWM2MmE4ZGQ0NWY4
+    OGIyZDUzMGViMDc0MmViOThkNzc3NTNkZTZiNDM3MDE5MzA5NDc=

data/ext/tarantool/extconf.rb

@@ -1,8 +1,11 @@
-if RUBY_ENGINE == 'ruby' and "\x01\x02\x03\x04".unpack('L') == [0x04030201]
+begin
+  if RUBY_ENGINE != 'ruby' || "\x01\x02\x03\x04".unpack('L') != [0x04030201]
+    raise ':('
+  end
   require 'mkmf'
   have_func('rb_str_drop_bytes')
   create_makefile("response_c")
-else
+rescue
   File.open(File.dirname(__FILE__) + "/Makefile", 'w') do |f|
     f.write("install:\n\t#nothing to build")
   end

data/ext/tarantool/response_c.c

@@ -58,18 +58,6 @@ typedef unsigned long long uint64_t;
 #define NUM2U64(v) NUM2ULL(v)
 #endif
 
-#ifndef HAVE_RB_STR_DROP_BYTES
-/* rubinius has no rb_str_drop_bytes */
-ID aslice;
-static VALUE
-rb_str_drop_bytes(VALUE str, long bytes)
-{
-    VALUE args[2] = {0, INT2FIX(bytes)};
-    rb_funcall2(str, aslice, 2, args);
-    return str;
-}
-#endif
-
 ID id_rshft, id_band, id_get_serializer, id_decode;
 VALUE sym_int, sym_integer, sym_string, sym_str, sym_int64, sym_bytes, sym_int16;
 VALUE sym_int8, sym_sint, sym_sint64, sym_sint16, sym_sint8, sym_varint, sym_auto;
@@ -112,147 +100,108 @@ get_uint64(const char *str)
 }
 
 static VALUE
-unpack_tuples(VALUE self, VALUE data, VALUE fields, VALUE _tail, VALUE tuples_affected)
+unpack_field(VALUE self, VALUE data, VALUE field, VALUE i_o, VALUE realfield_o, VALUE serializers)
 {
-    uint32_t fieldsn = RARRAY_LEN(fields);
-    uint32_t tuplesn = NUM2UINT(tuples_affected);
-    uint32_t tail = NUM2UINT(_tail);
+    int i = NUM2INT(i_o);
     const char *str = StringValuePtr(data);
     size_t len = RSTRING_LEN(data);
-    rb_encoding *utf8 = rb_utf8_encoding(), *binary = rb_ascii8bit_encoding();
+    size_t fieldsize = slice_ber((const uint8_t**)&str, &len);
+    VALUE value;
+    rb_str_drop_bytes(data, RSTRING_LEN(data) - len);
+    str = StringValuePtr(data);
 
-    VALUE tuples = rb_ary_new2(tuplesn);
-    VALUE serializers = rb_ary_new2(fieldsn);
-
-    for (;tuplesn > 0; tuplesn--) {
-        uint32_t tuplen, i, realfield;
-        const char *end;
-        VALUE tuple;
-        if (len < 8) {
-            rb_raise(rb_eValueError, "Response too short");
-        }
-        end = str + 8 + get_uint32(str);
-        tuplen = get_uint32(str+4);
-        tuple = rb_ary_new2(tuplen);
-        str += 8;
-        len -= 8;
-        for(i = 0; i < tuplen; i++) {
-            size_t fieldsize = slice_ber((const uint8_t**)&str, &len);
-            VALUE field, value;
-            if (fieldsize == 0) {
-                rb_ary_push(tuple, Qnil);
-                continue;
-            }
-            if (fieldsize > len) {
-                rb_raise(rb_eValueError, "Response mailformed at field #%u fieldsize: %zu tail len: %zu", i, fieldsize, len);
-            }
-            realfield = i;
-            if (i >= fieldsn) {
-                if (tail == 1) {
-                    realfield = fieldsn - 1;
-                } else {
-                    realfield = fieldsn + (i - fieldsn) % tail - tail;
-                }
-            }
-            field = RARRAY_CONST_PTR(fields)[realfield];
+    if (fieldsize == 0) {
+	return Qnil;
+    }
+    if (fieldsize > len) {
+	rb_raise(rb_eValueError, "Response mailformed at field #%u fieldsize: %zu tail len: %zu", i, fieldsize, len);
+    }
 
-            if (field == sym_int || field == sym_integer) {
-                if (fieldsize != 4) {
-                    rb_raise(rb_eValueError, "Bad field size %zd for integer field #%u", fieldsize, i);
-                }
-                value = UINT2NUM(get_uint32(str));
-            } else if (field == sym_str || field == sym_string) {
-                if (*str == 0 && fieldsize > 0) {
-                    str++; len--; fieldsize--;
-                }
-                value = rb_enc_str_new(str, fieldsize, utf8);
-            } else if (field == sym_int64) {
-                if (fieldsize != 8) {
-                    rb_raise(rb_eValueError, "Bad field size %zd for 64bit integer field #%u", fieldsize, i);
-                }
-#if SIZEOF_LONG == 8
-                value = ULONG2NUM(get_uint64(str));
-#elif HAVE_LONG_LONG
-                value = ULL2NUM(get_uint64(str));
-#else
-#error "Should have long long or sizeof(long) == 8"
-#endif
-            } else if (field == sym_bytes) {
-                value = rb_enc_str_new(str, fieldsize, binary);
-            } else if (field == sym_int16) {
-                if (fieldsize != 2) {
-                    rb_raise(rb_eValueError, "Bad field size %zd for 16bit integer field #%u", fieldsize, i);
-                }
-                value = UINT2NUM(get_uint16(str));
-            } else if (field == sym_int8) {
-                if (fieldsize != 1) {
-                    rb_raise(rb_eValueError, "Bad field size %zd for 8bit integer field #%u", fieldsize, i);
-                }
-                value = UINT2NUM(*(uint8_t*)str);
-            } else if (field == sym_sint) {
-                if (fieldsize != 4) {
-                    rb_raise(rb_eValueError, "Bad field size %zd for integer field #%u", fieldsize, i);
-                }
-                value = INT2NUM((int32_t)get_uint32(str));
-            } else if (field == sym_sint64) {
-                if (fieldsize != 8) {
-                    rb_raise(rb_eValueError, "Bad field size %zd for 64bit integer field #%u", fieldsize, i);
-                }
-#if SIZEOF_LONG == 8
-                value = LONG2NUM((int64_t)get_uint64(str));
-#elif HAVE_LONG_LONG
-                value = LL2NUM((int64_t)get_uint64(str));
-#endif
-            } else if (field == sym_sint16) {
-                if (fieldsize != 2) {
-                    rb_raise(rb_eValueError, "Bad field size %zd for 16bit integer field #%u", fieldsize, i);
-                }
-                value = INT2NUM((int16_t)get_uint16(str));
-            } else if (field == sym_sint8) {
-                if (fieldsize != 1) {
-                    rb_raise(rb_eValueError, "Bad field size %zd for 8bit integer field #%u", fieldsize, i);
-                }
-                value = INT2NUM(*(int8_t*)str);
-            } else if (field == sym_varint) {
-                if (fieldsize == 4) {
-                    value = UINT2NUM(get_uint32(str));
-                } else if (fieldsize == 8) {
-#if SIZEOF_LONG == 8
-                    value = ULONG2NUM(get_uint64(str));
-#elif HAVE_LONG_LONG
-                    value = ULL2NUM(get_uint64(str));
-#endif
-                } else if (fieldsize == 2) {
-                    value = UINT2NUM(get_uint16(str));
-                } else {
-                    rb_raise(rb_eValueError, "Bad field size %zd for integer field %d", fieldsize, i);
-                }
-            } else if (field == sym_auto) {
-                value = rb_enc_str_new(str, fieldsize, utf8);
-                if (fieldsize == 2 || fieldsize == 4 || fieldsize == 8) {
-                    value = rb_class_new_instance(1, &value, rb_cAutoType);
-                }
-            } else {
-                VALUE serializer = rb_ary_entry(serializers, realfield);
-                VALUE substr = rb_enc_str_new(str, fieldsize, binary);
-                if (!RTEST(serializer)) {
-                    serializer = rb_funcall2(self, id_get_serializer, 1, &field);
-                    rb_ary_store(serializers, realfield, serializer);
-                }
-                value = rb_funcall2(serializer, id_decode, 1, &substr);
-            }
-            str += fieldsize;
-            len -= fieldsize;
-            rb_ary_push(tuple, value);
-        }
-        if (end != str) {
-            rb_raise(rb_eValueError, "Response mailformed");
-        }
-        rb_ary_push(tuples, tuple);
+    if (field == sym_int || field == sym_integer) {
+	if (fieldsize != 4) {
+	    rb_raise(rb_eValueError, "Bad field size %zd for integer field #%u", fieldsize, i);
+	}
+	value = UINT2NUM(get_uint32(str));
+    } else if (field == sym_str || field == sym_string) {
+	if (*str == 0 && fieldsize > 0) {
+	    value = rb_enc_str_new(str+1, fieldsize-1, rb_utf8_encoding());
+	} else {
+	    value = rb_enc_str_new(str, fieldsize, rb_utf8_encoding());
+	}
+    } else if (field == sym_int64) {
+	if (fieldsize != 8) {
+	    rb_raise(rb_eValueError, "Bad field size %zd for 64bit integer field #%u", fieldsize, i);
+	}
+	value = U642NUM(get_uint64(str));
+    } else if (field == sym_bytes) {
+	value = rb_enc_str_new(str, fieldsize, rb_ascii8bit_encoding());
+    } else if (field == sym_int16) {
+	if (fieldsize != 2) {
+	    rb_raise(rb_eValueError, "Bad field size %zd for 16bit integer field #%u", fieldsize, i);
+	}
+	value = UINT2NUM(get_uint16(str));
+    } else if (field == sym_int8) {
+	if (fieldsize != 1) {
+	    rb_raise(rb_eValueError, "Bad field size %zd for 8bit integer field #%u", fieldsize, i);
+	}
+	value = UINT2NUM(*(uint8_t*)str);
+    } else if (field == sym_sint) {
+	if (fieldsize != 4) {
+	    rb_raise(rb_eValueError, "Bad field size %zd for integer field #%u", fieldsize, i);
+	}
+	value = INT2NUM((int32_t)get_uint32(str));
+    } else if (field == sym_sint64) {
+	if (fieldsize != 8) {
+	    rb_raise(rb_eValueError, "Bad field size %zd for 64bit integer field #%u", fieldsize, i);
+	}
+	value = I642NUM((int64_t)get_uint64(str));
+    } else if (field == sym_sint16) {
+	if (fieldsize != 2) {
+	    rb_raise(rb_eValueError, "Bad field size %zd for 16bit integer field #%u", fieldsize, i);
+	}
+	value = INT2NUM((int16_t)get_uint16(str));
+    } else if (field == sym_sint8) {
+	if (fieldsize != 1) {
+	    rb_raise(rb_eValueError, "Bad field size %zd for 8bit integer field #%u", fieldsize, i);
+	}
+	value = INT2NUM(*(int8_t*)str);
+    } else if (field == sym_varint) {
+	if (fieldsize == 4) {
+	    value = UINT2NUM(get_uint32(str));
+	} else if (fieldsize == 8) {
+	    value = U642NUM(get_uint64(str));
+	} else if (fieldsize == 2) {
+	    value = UINT2NUM(get_uint16(str));
+	} else {
+	    rb_raise(rb_eValueError, "Bad field size %zd for integer field %d", fieldsize, i);
+	}
+    } else if (field == sym_auto) {
+	value = rb_enc_str_new(str, fieldsize, rb_utf8_encoding());
+	if (fieldsize == 2 || fieldsize == 4 || fieldsize == 8) {
+	    value = rb_class_new_instance(1, &value, rb_cAutoType);
+	}
+    } else {
+	int realfield = NUM2INT(realfield_o);
+	VALUE serializer = rb_ary_entry(serializers, realfield);
+	VALUE substr = rb_enc_str_new(str, fieldsize, rb_ascii8bit_encoding());
+	if (!RTEST(serializer)) {
+	    serializer = rb_funcall2(self, id_get_serializer, 1, &field);
+	    rb_ary_store(serializers, realfield, serializer);
+	}
+	value = rb_funcall2(serializer, id_decode, 1, &substr);
     }
+    rb_str_drop_bytes(data, fieldsize);
+    return value;
+}
 
-    RB_GC_GUARD(data);
-    return tuples;
+static VALUE
+get_tail_no(VALUE self, VALUE array, VALUE index_o, VALUE tail_o)
+{
+    int size = RARRAY_LEN(array);
+    int index = NUM2INT(index_o);
+    int tail = NUM2INT(tail_o);
+    int pos = index < size ? index : (size - tail + (index - size) % tail);
+    return INT2NUM(pos);
 }
 
 void
@@ -261,7 +210,8 @@ Init_response_c()
     VALUE rb_mTarantool = rb_define_module("Tarantool");
     VALUE rb_mUnpackTuples = rb_define_module_under(rb_mTarantool, "UnpackTuples");
     VALUE rb_mUtil = rb_const_get(rb_mTarantool, rb_intern("Util"));
-    rb_define_method(rb_mUnpackTuples, "_unpack_tuples", unpack_tuples, 4);
+    rb_define_method(rb_mUnpackTuples, "_unpack_field", unpack_field, 5);
+    rb_define_private_method(rb_mUnpackTuples, "get_tail_no", get_tail_no, 3);
     rb_eValueError = rb_const_get(rb_mTarantool, rb_intern("ValueError"));
     rb_cAutoType = rb_const_get(rb_mUtil, rb_intern("AutoType"));
 

data/lib/tarantool.rb

@@ -141,15 +141,24 @@ module Tarantool
     def _shard(number)
       @connections[number] ||= begin
         @shards[number].map do |host, port|
-          IProto.get_connection(host, port, self.class::IPROTO_CONNECTION_TYPE)
+          con = IProto.get_connection(host, port, self.class::IPROTO_CONNECTION_TYPE)
+          _tune_new_connection(con)
+          con
         end
       end
     end
 
-    def close_connection
-      @connections.each do |number, replicas|
-        replicas.each(&:close)
+    def _tune_new_connection(con)
+    end
+
+    def each_connection
+      @connections.each do |num, replicas|
+        replicas.each{|r| yield r}
       end
+    end
+
+    def close_connection
+      each_connection{|c| c.close}
       @connections.clear
     end
 

data/lib/tarantool/em_db.rb

@@ -4,6 +4,22 @@ module Tarantool
     IPROTO_CONNECTION_TYPE = :em_callback
     INITIAL = Object.new.freeze
 
+    def inactivity_timeout
+      @inactivity_timeout ||= 0
+    end
+
+    def inactivity_timeout=(v)
+      @inactivity_timeout = v || 0
+      each_connection do |c|
+        c.comm_inactivity_timeout = @inactivity_timeout
+      end
+    end
+
+    def _tune_new_connection(con)
+      super
+      con.comm_inactivity_timeout = inactivity_timeout
+    end
+
     class Curry1 < Struct.new(:obj, :arg)
       def call
         obj.call arg

data/lib/tarantool/response.rb

@@ -84,103 +84,103 @@ module Tarantool
       end
       orig_data = data.dup
       begin
-        _unpack_tuples(data, fields, tail, tuples_affected)
+        tuples = []
+        serializers = []
+        while tuples_affected > 0
+          byte_size = ::BinUtils.slice_int32_le!(data)
+          fields_num = ::BinUtils.slice_int32_le!(data)
+          tuple_str = data.slice!(0, byte_size)
+          i = 0
+          tuple = []
+          while i < fields_num
+            field = fields[fieldno = i] || fields[fieldno = get_tail_no(fields, i, tail)]
+            tuple << _unpack_field(tuple_str, field, i, fieldno, serializers)
+            i += 1
+          end
+          tuples << tuple
+          tuples_affected -= 1
+        end
+        tuples
       rescue ValueError => e
         $stderr.puts "Value Error: tuples=#{tuples_affected}, data='#{orig_data.each_byte.map{|b| format(X02, b)}.join(' ')}'"
         raise e
       end
     end
 
-    def _unpack_tuples(data, fields, tail, tuples_affected)
-      tuples = []
-      while tuples_affected > 0
-        byte_size = ::BinUtils.slice_int32_le!(data)
-        fields_num = ::BinUtils.slice_int32_le!(data)
-        tuple_str = data.slice!(0, byte_size)
-        i = 0
-        tuple = []
-        while i < fields_num
-          field_size = ::BinUtils.slice_ber!(tuple_str)
+    def _unpack_field(tuple_str, field, i, realfield, serializers)
+      field_size = ::BinUtils.slice_ber!(tuple_str)
+      return nil if field_size == 0
 
-          field = fields[i] || get_tail_item(fields, i, tail)
-
-          tuple << (field_size == 0 ? nil :
-            case field
-            when :int, :integer
-              if field_size != 4
-                raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
-              end
-              ::BinUtils.slice_int32_le!(tuple_str)
-            when :string, :str
-              str = tuple_str.slice!(0, field_size)
-              str[0,1] = EMPTY  if str < ONE
-              str.force_encoding(UTF8)
-            when :int64
-              if field_size != 8
-                raise ValueError, "Bad field size #{field_size} for 64bit integer field ##{i}"
-              end
-              ::BinUtils.slice_int64_le!(tuple_str)
-            when :bytes
-              tuple_str.slice!(0, field_size)
-            when :int16
-              if field_size != 2
-                raise ValueError, "Bad field size #{field_size} for 16bit integer field ##{i}"
-              end
-              ::BinUtils.slice_int16_le!(tuple_str)
-            when :int8
-              if field_size != 1
-                raise ValueError, "Bad field size #{field_size} for 8bit integer field ##{i}"
-              end
-              ::BinUtils.slice_int8!(tuple_str)
-            when :sint
-              if field_size != 4
-                raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
-              end
-              ::BinUtils.slice_sint32_le!(tuple_str)
-            when :sint64
-              if field_size != 8
-                raise ValueError, "Bad field size #{field_size} for 64bit integer field ##{i}"
-              end
-              ::BinUtils.slice_sint64_le!(tuple_str)
-            when :sint16
-              if field_size != 2
-                raise ValueError, "Bad field size #{field_size} for 16bit integer field ##{i}"
-              end
-              ::BinUtils.slice_sint16_le!(tuple_str)
-            when :sint8
-              if field_size != 1
-                raise ValueError, "Bad field size #{field_size} for 8bit integer field ##{i}"
-              end
-              ::BinUtils.slice_sint8!(tuple_str)
-            when :varint
-              case field_size
-              when 8
-                ::BinUtils.slice_int64_le!(tuple_str)
-              when 4
-                ::BinUtils.slice_int32_le!(tuple_str)
-              when 2
-                ::BinUtils.slice_int16_le!(tuple_str)
-              else
-                raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
-              end
-            when :auto
-              str = tuple_str.slice!(0, field_size).force_encoding('utf-8')
-              case field_size
-              when 8, 4, 2
-                Util::AutoType.new(str)
-              else
-                str
-              end
-            else
-              get_serializer(field).decode(tuple_str.slice!(0, field_size))
-            end)
-          i += 1
+      case field
+      when :int, :integer
+        if field_size != 4
+          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
+        end
+        ::BinUtils.slice_int32_le!(tuple_str)
+      when :string, :str
+        str = tuple_str.slice!(0, field_size)
+        str[0,1] = EMPTY  if str < ONE
+        str.force_encoding(UTF8)
+      when :int64
+        if field_size != 8
+          raise ValueError, "Bad field size #{field_size} for 64bit integer field ##{i}"
+        end
+        ::BinUtils.slice_int64_le!(tuple_str)
+      when :bytes
+        tuple_str.slice!(0, field_size)
+      when :int16
+        if field_size != 2
+          raise ValueError, "Bad field size #{field_size} for 16bit integer field ##{i}"
+        end
+        ::BinUtils.slice_int16_le!(tuple_str)
+      when :int8
+        if field_size != 1
+          raise ValueError, "Bad field size #{field_size} for 8bit integer field ##{i}"
+        end
+        ::BinUtils.slice_int8!(tuple_str)
+      when :sint
+        if field_size != 4
+          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
+        end
+        ::BinUtils.slice_sint32_le!(tuple_str)
+      when :sint64
+        if field_size != 8
+          raise ValueError, "Bad field size #{field_size} for 64bit integer field ##{i}"
         end
-        tuples << tuple
-        tuples_affected -= 1
+        ::BinUtils.slice_sint64_le!(tuple_str)
+      when :sint16
+        if field_size != 2
+          raise ValueError, "Bad field size #{field_size} for 16bit integer field ##{i}"
+        end
+        ::BinUtils.slice_sint16_le!(tuple_str)
+      when :sint8
+        if field_size != 1
+          raise ValueError, "Bad field size #{field_size} for 8bit integer field ##{i}"
+        end
+        ::BinUtils.slice_sint8!(tuple_str)
+      when :varint
+        case field_size
+        when 8
+          ::BinUtils.slice_int64_le!(tuple_str)
+        when 4
+          ::BinUtils.slice_int32_le!(tuple_str)
+        when 2
+          ::BinUtils.slice_int16_le!(tuple_str)
+        else
+          raise ValueError, "Bad field size #{field_size} for integer field ##{i}"
+        end
+      when :auto
+        str = tuple_str.slice!(0, field_size).force_encoding('utf-8')
+        case field_size
+        when 8, 4, 2
+          Util::AutoType.new(str)
+        else
+          str
+        end
+      else
+        (serializers[realfield] ||= get_serializer(field)).decode(tuple_str.slice!(0, field_size))
       end
-      tuples
-    end unless method_defined?(:_unpack_tuples)
+    end unless method_defined?(:_unpack_field)
 
     def return_code(data)
       ::BinUtils.slice_int32_le!(data)

data/lib/tarantool/util.rb

@@ -36,6 +36,9 @@ module Tarantool
 
     module TailGetter
       private
+      def get_tail_no(array, index, tail)
+        tail == 1 ? array.size - 1 : array.size - tail + (index - array.size) % tail
+      end
       def get_tail_item(array, index, tail)
         tail == 1 ?
           array.last :

data/lib/tarantool/version.rb

@@ -1,4 +1,4 @@
 module Tarantool
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
   RECORD_VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantool
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Andrew Rudenko
@@ -9,64 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: iproto
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.15
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.15
   type: :runtime
+  name: iproto
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: murmurhash3
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
+  name: murmurhash3
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: sumbur
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
+  name: sumbur
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: bin_utils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
+  name: bin_utils
 description: Tarantool KV-storage client.
 email:
 - ceo@prepor.ru
@@ -115,7 +115,6 @@ files:
 - test/shared_space_array.rb
 - test/shared_space_hash.rb
 - test/tarantool.cfg
-- test/tarantool.log
 - test/tarantool1.cfg
 - test/test_light_record.rb
 - test/test_light_record_callback.rb
@@ -143,17 +142,17 @@ require_paths:
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Tarantool KV-storage client.
@@ -168,7 +167,6 @@ test_files:
 - test/shared_space_array.rb
 - test/shared_space_hash.rb
 - test/tarantool.cfg
-- test/tarantool.log
 - test/tarantool1.cfg
 - test/test_light_record.rb
 - test/test_light_record_callback.rb

data/test/tarantool.log

@@ -1,25 +0,0 @@
-1344852766.959 28990 1/spawner _ C> initialized
-1344852766.975 28988 1/sched _ I> space 0 successfully configured
-1344852766.975 28988 1/sched _ I> space 1 successfully configured
-1344852766.975 28988 1/sched _ I> space 2 successfully configured
-1344852766.975 28988 1/sched _ I> space 3 successfully configured
-1344852766.975 28988 1/sched _ I> recovery start
-1344852766.975 28988 1/sched _ I> recover from `./00000000000000000001.snap'
-1344852766.975 28988 1/sched _ I> snapshot recovered, confirmed lsn: 1
-1344852766.976 28988 1/sched _ I> building secondary indexes
-1344852766.976 28988 1/sched _ I> Building secondary keys in space 0...
-1344852766.976 28988 1/sched _ I> Space 0: done
-1344852766.976 28988 1/sched _ I> Building secondary keys in space 2...
-1344852766.976 28988 1/sched _ I> Space 2: done
-1344852766.976 28988 1/sched _ I> Building secondary keys in space 3...
-1344852766.976 28988 1/sched _ I> Space 3: done
-1344852766.976 28988 101/33013/primary _ I> bound to port 33013
-1344852766.976 28988 101/33013/primary _ I> I am primary
-1344852766.976 28988 102/33014/secondary _ I> bound to port 33014
-1344852766.977 28988 103/33015/admin _ I> bound to port 33015
-1344852766.977 28988 104/33016/replication _ I> bound to port 33016
-1344852766.977 28988 105/init.lua _ I> loading ./init.lua
-1344852766.977 28988 1/sched _ C> log level 4
-1344852766.977 28988 1/sched _ C> entering event loop
-1344852784.410 28988 1/sched _ C> exiting loop
-1344852784.412 28990 1/spawner _ I> Exiting: master shutdown