couchbase-jruby-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cec53577bf9d3e2636d2b23c743e3ac1e3b28c6
-  data.tar.gz: e9ea82a72e30c618b76245bf4489f179bd45691e
+  metadata.gz: b70e454af837900912ab334c577374656157b1df
+  data.tar.gz: cd773d813f362ffd5eb695458800fab40ff2d3f0
 SHA512:
-  metadata.gz: ed49ef81b60faadd9542d19f747eb1cd5ed9a8eb8527be7669b976edfb744888144523bbd6d7744d4273628976c20a25f84f6f6a1a85666f603007144418f65d
-  data.tar.gz: 0b4dfb1870cebcd69f8e5d9ddd74768b28e9ec4d75a9bf7a6820490eb566522f3d0b333175354447b199540f104443db7507b8fb5dc3c31905dd46fc0b19f44a
+  metadata.gz: cee4caac6a388131d089bac920d651240710b59caeac1dfa8595e301cad01ff0a89f49953b6657ce641831e1f36f25acf7d8678bb0f53d88311e2881b8b5b9b3
+  data.tar.gz: 8c8127b194702f2a58237f2f71f6064e2782cb89c07365adb5217804c3df2c7eec9ceb32bfdbed9ca2d1c625856740376b5914da2bdcb53d1dbc06c49bf0ef4a

data/couchbase-jruby-client.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'multi_json',    '~> 1.0'
-  s.add_runtime_dependency 'atomic',        '~> 1.1.14'
+  s.add_runtime_dependency 'thread_safe',   '~> 0.1.2'
 
   s.add_development_dependency 'bundler',   '~> 1.3'
   s.add_development_dependency 'rake'

data/lib/couchbase.rb

@@ -30,7 +30,7 @@ require 'jars/spymemcached-2.10.0.jar'
 require 'jars/httpcore-nio-4.1.1.jar'
 require 'couchbase/version'
 require 'uri'
-require 'atomic'
+require 'thread_safe'
 require 'couchbase/transcoder'
 require 'couchbase/async'
 require 'couchbase/operations'
@@ -57,7 +57,7 @@ end
 # Couchbase jruby client
 module Couchbase
 
-  @@buckets = Atomic.new({})
+  @@buckets = ThreadSafe::Cache.new
 
   class << self
 
@@ -85,9 +85,6 @@ module Couchbase
     # @return [Bucket] connection instance
     def connect(*options)
       Bucket.new(*(options.flatten))
-      # disconnect
-      # @@bucket.update { |bucket| bucket ||= Bucket.new(*(options.flatten)) }
-      # @@bucket.value
     end
     alias :new :connect
 
@@ -100,7 +97,15 @@ module Couchbase
     #   Couchbase.bucket.name     #=> "blog"
     #
     # @return [Hash, String]
-    attr_accessor :connection_options
+    attr_reader :connection_options
+
+    def connection_options=(options)
+      @connection_options = normalize_connection_options(options)
+    end
+
+    def normalize_connection_options(options)
+      Hash[ options.map { |k, v| [k.to_sym, v] } ]
+    end
 
     # The connection instance for current thread
     #
@@ -143,10 +148,10 @@ module Couchbase
                  path = URI.parse(@connection_options).path
                  path[%r(^(/pools/([A-Za-z0-9_.-]+)(/buckets/([A-Za-z0-9_.-]+))?)?), 3] || "default"
                else
-                 "default"
+                 'default'
                end
-      @@buckets.update { |buckets| buckets[name] ||= connect(connection_options.merge(bucket: name)) }
-      @@buckets.value[name]
+
+      @@buckets[name] ||= connect(connection_options)
     end
 
     # Set a connection instance for current thread
@@ -155,18 +160,19 @@ module Couchbase
     #
     # @return [Bucket]
     def bucket=(connection)
-      name ||= @connection_options && @connection_options[:bucket] || "default"
-      @@buckets.update { |buckets| buckets[name] = connection }
-      @@buckets.value[name]
+      name = @connection_options && @connection_options[:bucket] || "default"
+      @@buckets[name] = connection
     end
 
     def connected?
-      !!@@buckets.value.empty?
+      !!@@buckets.empty?
     end
 
     def disconnect
-      @@buckets.value.each(&:disconnect) if connected?
-      @@buckets = Atomic.new({})
+      @@buckets.each_key do |name|
+        bucket = @@buckets.delete(name)
+        bucket.disconnect if connected?
+      end
     end
   end
 end

data/lib/couchbase/bucket.rb

@@ -36,11 +36,39 @@ module Couchbase
     include Couchbase::Async
 
     attr_accessor :quiet, :hostname, :port, :pool, :bucket, :username,
-                  :password, :default_ttl, :timeout,
+                  :password, :default_ttl, :timeout, :default_format,
                   :default_arithmetic_init, :transcoder
 
     attr_reader :client, :key_prefix, :default_format
 
+    DEFAULT_OPTIONS = {
+      type:                      nil,
+      quiet:                     false,
+      hostname:                  'localhost',
+      port:                      8091,
+      pool:                      'default',
+      bucket:                    'default',
+      password:                  '',
+      engine:                    nil,
+      default_ttl:               0,
+      async:                     false,
+      default_arithmetic_init:   0,
+      default_flags:             0,
+      default_format:            :document,
+      default_observe_timeout:   2_500_000,
+      on_error:                  nil,
+      on_connect:                nil,
+      timeout:                   0,
+      environment:               nil,
+      key_prefix:                nil,
+      node_list:                 nil,
+      destroying:                0,
+      connected:                 0,
+      on_connect_proc:           nil,
+      async_disconnect_hook_set: 0,
+      connected:                 false
+    }.freeze
+
     # Initialize new Bucket.
     #
     # @since 1.0.0
@@ -134,52 +162,20 @@ module Couchbase
     # @return [Bucket]
     #
     def initialize(url = nil, options = {})
-      default_options = {
-        type:                      nil,
-        quiet:                     false,
-        hostname:                  'localhost',
-        port:                      8091,
-        pool:                      'default',
-        bucket:                    'default',
-        password:                  '',
-        engine:                    nil,
-        default_ttl:               0,
-        async:                     false,
-        default_arithmetic_init:   0,
-        default_flags:             0,
-        default_format:            :document,
-        default_observe_timeout:   2500000,
-        on_error:                  nil,
-        on_connect:                nil,
-        timeout:                   0,
-        environment:               nil,
-        key_prefix:                nil,
-        node_list:                 nil,
-        destroying:                0,
-        connected:                 0,
-        on_connect_proc:           nil,
-        async_disconnect_hook_set: 0,
-        connected:                 false
-      }
-
       url_options = if url.is_a? String
                       fail ArgumentError.new unless url =~ /^http:\/\//
-
                       uri = URI.new(url)
-
-                      {
-                        host: uri.host,
-                        port: uri.port,
-                      }.merge(path_to_pool_and_bucket(uri.path))
+                      { hostname: uri.host, port: uri.port }.
+                        merge(path_to_pool_and_bucket(uri.path))
                     elsif url.nil?
                       {}
                     else
                       url
                     end
 
-      options = Hash[ options.map { |k, v| [k.to_sym, v] } ]
+      options = Couchbase.normalize_connection_options(options)
 
-      connection_options = default_options.merge(options).merge(url_options)
+      connection_options = DEFAULT_OPTIONS.merge(url_options).merge(options)
 
       connection_options.each_pair do |key, value|
         instance_variable_set("@#{key}", value)
@@ -191,8 +187,6 @@ module Couchbase
         plain:    Transcoder::Plain.new
       }
 
-      @transcoder = @transcoders[@default_format]
-
       connect unless async?
     end
 
@@ -213,12 +207,12 @@ module Couchbase
 
       begin
         builder = CouchbaseConnectionFactoryBuilder.new
-        builder.setTranscoder(@transcoder)
+        builder.setTranscoder(transcoder)
         connection_factory = builder.buildCouchbaseConnection(uris, bucket.to_java_string, password.to_java_string)
         @client = CouchbaseClient.new(connection_factory)
         @connected = true
       rescue Java::ComCouchbaseClientVbucket::ConfigurationException
-        fail Couchbase::Error::Auth
+        fail Couchbase::Error::Auth, 'Couchbase configurations are incorrect.'
       rescue java.net.ConnectException => e
         fail Couchbase::Error::Connect
       end
@@ -254,6 +248,10 @@ module Couchbase
       end
     end
 
+    def transcoder
+      @transcoders[@default_format]
+    end
+
     def on_connect(&block)
       @on_connect = block
     end

data/lib/couchbase/operations/store.rb

@@ -407,7 +407,7 @@ module Couchbase::Operations
     def store_args_parser(key, value, options)
       key = key.to_str if key.respond_to?(:to_str)
       ttl = options.delete(:ttl) || default_ttl
-      transcoder = @transcoders[options.delete(:format)] || @transcoder
+      transcoder = @transcoders[options.delete(:format)] || self.transcoder
 
       [key, value, ttl, transcoder]
     end

data/lib/couchbase/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Couchbase
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/test/setup.rb

@@ -21,6 +21,7 @@ require 'couchbase'
 
 require 'socket'
 require 'open-uri'
+require 'ostruct'
 
 require 'pry'
 
@@ -41,153 +42,18 @@ require 'pry'
 
 Minitest.after_run { Couchbase.disconnect }
 
-class CouchbaseServer
-  attr_accessor :host, :port, :num_nodes, :buckets_spec
-
-  def real?
-    true
-  end
-
-  def initialize(params = {})
-    @host, @port = ['localhost', 8091] #ENV['COUCHBASE_SERVER'].split(':')
-    @port = @port.to_i
-
-    if @host.nil? || @host.empty? || @port == 0
-      raise ArgumentError, "Check COUCHBASE_SERVER variable. It should be hostname:port"
-    end
-
-    @config = MultiJson.load(open("http://#{@host}:#{@port}/pools/default"))
-    @num_nodes = @config["nodes"].size
-    @buckets_spec = params[:buckets_spec] || "default:"  # "default:,protected:secret,cache::memcache"
-  end
-
-  def start
-    # flush all buckets
-    @buckets_spec.split(',') do |bucket|
-      name, password, _ = bucket.split(':')
-      connection = Couchbase.new(:hostname => @host,
-                                 :port => @port,
-                                 :username => name,
-                                 :bucket => name,
-                                 :password => password)
-      begin
-        connection.flush
-      rescue Couchbase::Error::NotSupported
-        # on recent server flush is disabled
-      ensure
-        connection.disconnect
-      end
-    end if ENV['COUCHBASE_FLUSH_BUCKETS']
-  end
-
-  def stop
-  end
-end
-
-class CouchbaseMock
-  Monitor = Struct.new(:pid, :client, :socket, :port)
-
-  attr_accessor :host, :port, :buckets_spec, :num_nodes, :num_vbuckets
-
-  def real?
-    false
-  end
-
-  def initialize(params = {})
-    @host = "127.0.0.1"
-    @port = 0
-    @num_nodes = 10
-    @num_vbuckets = 4096
-    @buckets_spec = "default:"  # "default:,protected:secret,cache::memcache"
-    params.each do |key, value|
-      send("#{key}=", value)
-    end
-    yield self if block_given?
-    if @num_vbuckets < 1 || (@num_vbuckets & (@num_vbuckets - 1) != 0)
-      raise ArgumentError, "Number of vbuckets should be a power of two and greater than zero"
-    end
-  end
-
-  def start
-    @monitor = Monitor.new
-    @monitor.socket = TCPServer.new(nil, 0)
-    @monitor.socket.listen(10)
-    _, @monitor.port, _, _ = @monitor.socket.addr
-    trap("CLD") do
-      puts "CouchbaseMock.jar died unexpectedly during startup"
-      exit(1)
-    end
-    @monitor.pid = fork
-    if @monitor.pid.nil?
-      rc = exec(command_line("--harakiri-monitor=:#{@monitor.port}"))
-    else
-      trap("CLD", "SIG_DFL")
-      @monitor.client, _ = @monitor.socket.accept
-      @port = @monitor.client.recv(100).to_i
-    end
-  end
-
-  def stop
-    @monitor.client.close
-    @monitor.socket.close
-    Process.kill("TERM", @monitor.pid)
-    Process.wait(@monitor.pid)
-  end
-
-  def failover_node(index, bucket = "default")
-    @monitor.client.send("failover,#{index},#{bucket}", 0)
-  end
-
-  def respawn_node(index, bucket = "default")
-    @monitor.client.send("respawn,#{index},#{bucket}", 0)
-  end
-
-  protected
-
-  def command_line(extra = nil)
-    cmd = "java -jar #{File.dirname(__FILE__)}/CouchbaseMock.jar"
-    cmd << " --host #{@host}" if @host
-    cmd << " --port #{@port}" if @port
-    cmd << " --nodes #{@num_nodes}" if @num_nodes
-    cmd << " --vbuckets #{@num_vbuckets}" if @num_vbuckets
-    cmd << " --buckets #{@buckets_spec}" if @buckets_spec
-    cmd << " #{extra}"
-    cmd
-  end
-end
-
 class MiniTest::Test
 
-  def start_mock(params = {})
-    mock = nil
-    if true # ENV['COUCHBASE_SERVER']
-      mock = CouchbaseServer.new(params)
-      if (params[:port] && mock.port != params[:port]) ||
-        (params[:host] && mock.host != params[:host]) ||
-        mock.buckets_spec != "default:"
-        skip("Unable to configure real cluster. Requested config is: #{params.inspect}")
-      end
-    else
-      mock = CouchbaseMock.new(params)
-    end
-    mock.start
-    mock
-  end
-
-  def stop_mock(mock)
-    assert(mock)
-    mock.stop
+  def cb
+    Couchbase.bucket
   end
 
-  def with_mock(params = {})
-    return
-    mock = nil
-    if block_given?
-      mock = start_mock(params)
-      yield mock
+  def with_configs(configs = {})
+    configs = Couchbase::Bucket::DEFAULT_OPTIONS.merge(configs)
+    if configs[:host].nil?
+      configs[:host] = configs[:hostname]
     end
-  ensure
-    stop_mock(mock) if mock
+    yield OpenStruct.new(configs)
   end
 
   def uniq_id(*suffixes)
@@ -197,7 +63,4 @@ class MiniTest::Test
     [test_id, @ids[test_id]].join("_")
   end
 
-  def after_teardown
-    GC.start
-  end
 end

data/test/test_arithmetic.rb

@@ -19,159 +19,136 @@ require File.join(File.dirname(__FILE__), 'setup')
 
 class TestArithmetic < MiniTest::Test
 
-  def setup
-    @mock = start_mock
-  end
-
-  def teardown
-    stop_mock(@mock)
-  end
-
   def test_trivial_incr_decr
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-
-    connection.set(uniq_id, 1)
-    val = connection.incr(uniq_id)
+    cb.set(uniq_id, 1)
+    val = cb.incr(uniq_id)
     assert_equal 2, val
-    val = connection.get(uniq_id)
+    val = cb.get(uniq_id)
     assert_equal 2, val
 
-    connection.set(uniq_id, 7)
-    val = connection.decr(uniq_id)
+    cb.set(uniq_id, 7)
+    val = cb.decr(uniq_id)
     assert_equal 6, val
-    val = connection.get(uniq_id)
+    val = cb.get(uniq_id)
     assert_equal 6, val
   end
 
   def test_it_fails_to_incr_decr_missing_key
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-
     assert_raises(Couchbase::Error::NotFound) do
-      connection.incr(uniq_id(:missing))
+      cb.incr(uniq_id(:missing))
     end
     assert_raises(Couchbase::Error::NotFound) do
-      connection.decr(uniq_id(:missing))
+      cb.decr(uniq_id(:missing))
     end
   end
 
   def test_it_allows_to_make_increments_less_verbose_by_forcing_create_by_default
-    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port,
-                                   :default_arithmetic_init => true)
+    cb.default_arithmetic_init = true
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(uniq_id)
+      cb.get(uniq_id)
     end
-    assert_equal 0, connection.incr(uniq_id), "return value"
-    assert_equal 0, connection.get(uniq_id), "via get command"
+    assert_equal 0, cb.incr(uniq_id), "return value"
+    assert_equal 0, cb.get(uniq_id), "via get command"
+  ensure
+    cb.default_arithmetic_init = 0
   end
 
   def test_it_allows_to_setup_initial_value_during_connection
-    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port,
-                                   :default_arithmetic_init => 10)
+    cb.default_arithmetic_init = 10
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(uniq_id)
+      cb.get(uniq_id)
     end
 
-    assert_equal 10, connection.incr(uniq_id), "return value"
-    assert_equal 10, connection.get(uniq_id), "via get command"
+    assert_equal 10, cb.incr(uniq_id), "return value"
+    assert_equal 10, cb.get(uniq_id), "via get command"
+  ensure
+    cb.default_arithmetic_init = 0
   end
 
   def test_it_allows_to_change_default_initial_value_after_connection
-    connection = Couchbase.connect(:hostname => @mock.host, :port => @mock.port)
-
-    assert_equal 0, connection.default_arithmetic_init
+    assert_equal 0, cb.default_arithmetic_init
     assert_raises(Couchbase::Error::NotFound) do
-      connection.incr(uniq_id)
+      cb.incr(uniq_id)
     end
 
-    connection.default_arithmetic_init = 10
-    assert_equal 10, connection.default_arithmetic_init
+    cb.default_arithmetic_init = 10
+    assert_equal 10, cb.default_arithmetic_init
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(uniq_id)
+      cb.get(uniq_id)
     end
-    assert_equal 10, connection.incr(uniq_id), "return value"
-    assert_equal 10, connection.get(uniq_id), "via get command"
+    assert_equal 10, cb.incr(uniq_id), "return value"
+    assert_equal 10, cb.get(uniq_id), "via get command"
+  ensure
+    cb.default_arithmetic_init = 0
   end
 
   def test_it_creates_missing_key_when_initial_value_specified
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-
-    val = connection.incr(uniq_id(:missing), :initial => 5)
+    val = cb.incr(uniq_id(:missing), :initial => 5)
     assert_equal 5, val
-    val = connection.incr(uniq_id(:missing), :initial => 5)
+    val = cb.incr(uniq_id(:missing), :initial => 5)
     assert_equal 6, val
-    val = connection.get(uniq_id(:missing))
+    val = cb.get(uniq_id(:missing))
     assert_equal 6, val
   end
 
   def test_it_uses_zero_as_default_value_for_missing_keys
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-
-    val = connection.incr(uniq_id(:missing), :create => true)
+    val = cb.incr(uniq_id(:missing), :create => true)
     assert_equal 0, val
-    val = connection.incr(uniq_id(:missing), :create => true)
+    val = cb.incr(uniq_id(:missing), :create => true)
     assert_equal 1, val
-    val = connection.get(uniq_id(:missing))
+    val = cb.get(uniq_id(:missing))
     assert_equal 1, val
   end
 
   def test_it_allows_custom_ttl
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-
-    val = connection.incr(uniq_id(:missing), :create => true, :ttl => 1)
+    val = cb.incr(uniq_id(:missing), :create => true, :ttl => 1)
     assert_equal 0, val
-    val = connection.incr(uniq_id(:missing), :create => true)
+    val = cb.incr(uniq_id(:missing), :create => true)
     assert_equal 1, val
     sleep(2)
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(uniq_id(:missing))
+      cb.get(uniq_id(:missing))
     end
   end
 
   def test_decrement_with_absolute_ttl
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     # absolute TTL: one second from now
     exp = Time.now.to_i + 1
-    val = connection.decr(uniq_id, 12, :initial => 0, :ttl => exp)
+    val = cb.decr(uniq_id, 12, :initial => 0, :ttl => exp)
     assert_equal 0, val
-    assert_equal 0, connection.get(uniq_id)
+    assert_equal 0, cb.get(uniq_id)
     sleep(3)
     assert_raises(Couchbase::Error::NotFound) do
-      connection.get(uniq_id)
+      cb.get(uniq_id)
     end
   end
 
   def test_it_allows_custom_delta
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-
-    connection.set(uniq_id, 12)
-    val = connection.incr(uniq_id, 10)
+    cb.set(uniq_id, 12)
+    val = cb.incr(uniq_id, 10)
     assert_equal 22, val
   end
 
   def test_it_allows_to_specify_delta_in_options
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-
-    connection.set(uniq_id, 12)
+    cb.set(uniq_id, 12)
     options = {:delta => 10}
-    val = connection.incr(uniq_id, options)
+    val = cb.incr(uniq_id, options)
     assert_equal 22, val
   end
 
   def test_multi_incr
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-    connection.set(uniq_id(:foo) => 1, uniq_id(:bar) => 1)
+    cb.set(uniq_id(:foo) => 1, uniq_id(:bar) => 1)
 
-    assert_equal [2, 2],   connection.incr(uniq_id(:foo), uniq_id(:bar)).values.sort
-    assert_equal [12, 12], connection.incr(uniq_id(:foo), uniq_id(:bar), :delta => 10).values.sort
-    assert_equal [14, 15], connection.incr(uniq_id(:foo) => 2, uniq_id(:bar) => 3).values.sort
+    assert_equal [2, 2],   cb.incr(uniq_id(:foo), uniq_id(:bar)).values.sort
+    assert_equal [12, 12], cb.incr(uniq_id(:foo), uniq_id(:bar), :delta => 10).values.sort
+    assert_equal [14, 15], cb.incr(uniq_id(:foo) => 2, uniq_id(:bar) => 3).values.sort
   end
 
   def test_multi_decr
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-    connection.set(uniq_id(:foo) => 14, uniq_id(:bar) => 15)
+    cb.set(uniq_id(:foo) => 14, uniq_id(:bar) => 15)
 
-    assert_equal [12, 12], connection.decr(uniq_id(:foo) => 2, uniq_id(:bar) => 3).values.sort
-    assert_equal [2, 2],   connection.decr(uniq_id(:foo), uniq_id(:bar), :delta => 10).values.sort
-    assert_equal [1, 1],   connection.decr(uniq_id(:foo), uniq_id(:bar)).values.sort
+    assert_equal [12, 12], cb.decr(uniq_id(:foo) => 2, uniq_id(:bar) => 3).values.sort
+    assert_equal [2, 2],   cb.decr(uniq_id(:foo), uniq_id(:bar), :delta => 10).values.sort
+    assert_equal [1, 1],   cb.decr(uniq_id(:foo), uniq_id(:bar)).values.sort
   end
 end