tarantool16 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a5d736d466e1c713051fc111c67e3e938bf745
-  data.tar.gz: 29bbca98c7773046dff52f466fad62ff02126137
+  metadata.gz: 4708dae76a87bea3c57671ad97120d4a60ecf5a6
+  data.tar.gz: 16d47be30532317b0e29380952baaf90e8c2817f
 SHA512:
-  metadata.gz: a56d98dd3030cf79931a9820f8109eb0eaa89b1fceca8b73915642429409e3a597bb80c819aaf7a2eb74f366d0ed8e1dc1098d1c4037f6cbbe4ed8bb463e2630
-  data.tar.gz: cc7c4d07c41ad772b38a4a3cd4fb8c0ed7b533116a444cdddc5c21e2b3f2d5f6e54178ea9fa50d866126c49e963ab0f304e13958790e32ad6f2b74c1a2399b9a
+  metadata.gz: 6577b96200a9cca5e14e5acba0203e14423e505a02219164716f49ec1160d1b1073c59170ac0227753dce09a040e1960524c2edee88efcc892ad68fd7ae731c3
+  data.tar.gz: d51b72462995c71820cc174c459b1fc2848b0a03cd2b74067bbf7d9d17e5b7a89b8e4cab4f02317cf98396e003fa9072975b93c85daebc754cac4e6449e83aad

data/.gitignore

@@ -6,6 +6,8 @@
 /doc/
 /pkg/
 /spec/reports/
+/test/*.log
+/test/run/
 /tmp/
 *.bundle
 *.so

data/Rakefile

@@ -1,2 +1,5 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new
 

data/lib/tarantool16.rb

@@ -5,7 +5,7 @@ module Tarantool16
   autoload :DumbDB, 'tarantool16/dumb_db'
   def self.new(opts = {})
     opts = opts.dup
-    hosts = opts[:host]
+    hosts = [opts[:host], opts[:port]].compact.join(':')
     type = opts[:type] && opts[:type].to_s || 'dumb'
     case type
     when 'dumb'

data/lib/tarantool16/schema.rb

@@ -124,7 +124,7 @@ module Tarantool16
       elsif index = @index_names[ino]
         yield index.pos, index.map_key(key)
       else
-        cb.call(Option.error(SchemaError, "Could not find index #{ino} for spacefor fields #{key.keys}"))
+        cb.call(Option.error(SchemaError, "Could not find index #{ino} for fields #{Hash===key ? key.keys : key.inspect} in #{name_sid}"))
       end
     end
 
@@ -215,7 +215,7 @@ module Tarantool16
       attr :name, :pos, :parts, :type, :part_names, :part_positions
       ITERS = {
         tree:   (ITERATOR_EQ..ITERATOR_GT).freeze,
-        hash:   [ITERATOR_ALL, ITERATOR_EQ, ITERATOR_GT].freeze,
+        hash:   [ITERATOR_ALL, ITERATOR_EQ].freeze,
         bitset: [ITERATOR_ALL, ITERATOR_EQ, ITERATOR_BITS_ALL_SET,
                  ITERATOR_BITS_ANY_SET, ITERATOR_BITS_ALL_NOT_SET].freeze,
         rtree:  [ITERATOR_ALL, ITERATOR_EQ, ITERATOR_GT, ITERATOR_GE, ITERATOR_LT, ITERATOR_LE,

data/lib/tarantool16/version.rb

@@ -1,3 +1,3 @@
 module Tarantool16
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/config.lua

@@ -0,0 +1,33 @@
+local log = require 'log'
+box.cfg{
+    listen = 33013,
+    wal_dir='.',
+    snap_dir='.',
+}
+if not box.space.test then
+    local s1 = box.schema.space.create('test', {id = 513, if_not_exists = true})
+    local ip = s1:create_index('primary', {type = 'hash', parts = {1, 'NUM'}, if_not_exists = true})
+    local iname = s1:create_index('name', {type = 'tree', parts = {2, 'STR'}, if_not_exists = true})
+    local irtree = s1:create_index('point', {type = 'rtree', unique=false, parts = {3, 'ARRAY'}, if_not_exists = true})
+    local ipname = s1:create_index('id_name', {type = 'tree', parts = {1, 'NUM', 2, 'STR'}})
+end
+
+function reseed()
+    local s1 = box.space.test
+    s1:truncate()
+    s1:insert{1, "hello", {1, 2}}
+    s1:insert{2, "world", {3, 4}}
+end
+
+pcall(function()
+box.schema.user.grant('guest', 'read,write,execute', 'universe')
+end)
+
+if not box.schema.user.exists('tester') then
+    box.schema.user.create('tester', {password='testpass'})
+    box.schema.user.grant('tester', 'read,write,execute', 'universe')
+end
+
+local console = require 'console'
+console.listen '0.0.0.0:33015'
+

data/test/helper.rb

@@ -0,0 +1,134 @@
+$: << File.expand_path('../../lib', __FILE__)
+require 'minitest/spec'
+require 'fileutils'
+require 'tarantool16'
+require 'socket'
+
+
+class Spawn
+  DIR = File.expand_path('..', __FILE__)
+  include FileUtils
+  Dir[File.join(DIR, "tarantool*.log")].each{|f| File.unlink(f)}
+
+  attr :port
+  def initialize(opts={})
+    @name = opts[:name] or raise "no name"
+    @port = opts[:port] || 16788
+    @admin_port = opts[:admin_port] || 16789
+    @binary = opts[:binary] || 'tarantool'
+    @instance = opts[:instance] || 'main'
+    @config = opts[:config] || 'config.lua'
+  end
+
+  def fjoin(*args)
+    File.join(*args.map(&:to_s))
+  end
+
+  def dir
+    fjoin(DIR, "run", ["tarantool", @instance].compact.join('_'))
+  end
+
+  def clear
+    return unless @dir
+    stop
+    rm_rf(dir)
+  end
+
+  def stop
+    return unless @pid
+    Process.kill('INT', @pid)
+    Process.wait2(@pid)
+    @pid = nil
+  end
+
+  def prepare
+    return if @dir
+    clear
+    @dir = dir
+    mkdir_p(@dir)
+    conf = File.read(fjoin(DIR, @config))
+    conf.sub!(/listen = \d+/, "listen = #{@port}")
+    conf.sub!(/listen '0\.0\.0\.0:\d+'/, "listen '0.0.0.0:#{@admin_port}'")
+    if block_given?
+      yield conf
+    end
+    File.open(fjoin(@dir, 'config.lua'), 'w'){|f| f.write(conf)}
+  end
+
+  def run
+    return if @pid
+    prepare
+    log = File.open(fjoin(DIR, "tarantool_#{@name}.log"), 'ab')
+    Dir.chdir(@dir) do
+      @pid = spawn(@binary, 'config.lua', {out: log, err: log})
+    end
+    sleep(0.25)
+  end
+
+  def reseed
+    run
+    s = TCPSocket.new '127.0.0.1', @admin_port
+    s.send("reseed()\n", 0)
+    sleep(0.004)
+    s.read_nonblock(1000)
+    s.close
+  end
+
+  CONF = {
+    main: {conf:{}}
+  }
+
+  AT_EXIT_CALLED = [false]
+  def self.inst(what=:main)
+    CONF[what][:inst] ||= new(CONF[what][:conf].merge(name: what.to_s))
+    CONF[what][:inst]
+  end
+
+  def self.run(what=:main)
+    inst(what).run
+  end
+
+  def self.reseed(what=:main)
+    inst(what).reseed
+  end
+
+  def self.stop(what=:main)
+    if inst = CONF[what][:inst]
+      inst.stop
+    end
+  end
+
+  def self.clear(what=:main)
+    if inst = CONF[what][:inst]
+      inst.clear
+    end
+  end
+
+  at_exit do
+    CONF.each_key{|name| clear(name)}
+    FileUtils.rm_rf(File.join(DIR, "run"))
+  end
+end
+
+class Object
+  def deep_freeze
+    case self
+    when String
+      freeze
+    when Array
+      each{|v| v.deep_freeze}
+      freeze
+    when Hash
+      each_value{|v| v.deep_freeze}
+      freeze
+    else
+      if respond_to?(:freeze)
+        freeze
+      else
+        self
+      end
+    end
+  end
+end
+
+require 'minitest/autorun'

data/test/test_dumb.rb

@@ -0,0 +1,60 @@
+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 }
+
+  it "should select by pk" do
+    db.select(:test, 1).must_equal [r1]
+    db.select(513, 2).must_equal [r2]
+  end
+
+  it "should select by secondary index" do
+    db.select(:test, "hello", index: 1).must_equal [r1]
+    db.select(:test, "world", index: 'name').must_equal [r2]
+    db.select(:test, ["hello"], index: 1).must_equal [r1]
+
+    db.select(:test, [[1,2]], index: 2).must_equal [r1]
+  end
+
+  it "should iterate" do
+    db.select(:test, 1, iterator: :>=, index: 3).must_equal [r1, r2]
+    db.select(:test, 1, iterator: :>, index: 3).must_equal [r2]
+    db.select(:test, 1, iterator: :<, index: 3).must_equal []
+    db.select(:test, 1, iterator: :<=, index: 3).must_equal [r1]
+    db.select(:test, 2, iterator: :>=, index: 3).must_equal [r2]
+    db.select(:test, 2, iterator: :>, index: 3).must_equal []
+    db.select(:test, 2, iterator: :<, index: 3).must_equal [r1]
+    db.select(:test, 2, iterator: :<=, index: 3).must_equal [r2, r1]
+
+    db.select(:test, 'hello', index: 1, iterator: :>).must_equal [r2]
+
+    db.select(:test, [[0,0]], index: 2, iterator: "<->").must_equal [r1, r2]
+    db.select(:test, [[4,4]], index: 2, iterator: "<->").must_equal [r2, r1]
+  end
+
+  it "should insert" do
+    db.insert(:test, [4, "johny", [5,6]])
+    db.select(513, 4).must_equal [[4, "johny", [5,6]]]
+  end
+
+  describe "with field names" do
+    before {
+      db.define_fields(:test, [[:id, :int], [:name, :str], [:point, :array]])
+    }
+    let(:h1){ {id:1, name:'hello', point:[1,2]}.deep_freeze }
+    let(:h2){ {id:2, name:'world', point:[3,4]}.deep_freeze }
+
+    it "should select by hash" do
+      db.select(:test, {id: 1}).must_equal [h1]
+      db.select(:test, {name: "world"}).must_equal [h2]
+    end
+
+    it "should iterate" do
+      db.select(:test, {id: 0}, iterator: :>).must_equal [h1, h2]
+      db.select(:test, {id: 4}, iterator: :<).must_equal [h2, h1]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarantool16
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sokolov Yura aka funny_falcon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,9 @@ files:
 - lib/tarantool16/schema.rb
 - lib/tarantool16/version.rb
 - tarantool16.gemspec
+- test/config.lua
+- test/helper.rb
+- test/test_dumb.rb
 homepage: https://github.com/funny-falcon/tarantool16-ruby
 licenses:
 - MIT
@@ -97,8 +100,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: adapter for Tarantool 1.6
-test_files: []
+test_files:
+- test/config.lua
+- test/helper.rb
+- test/test_dumb.rb