couchbase-jruby-client 0.1.7-java → 0.1.8-java

data/lib/couchbase/operations/delete.rb

@@ -59,45 +59,49 @@ module Couchbase::Operations
     #     c.delete("foo", :cas => 123456)    #=> will raise Couchbase::Error::KeyExists
     #     c.delete("foo", :cas => ver)       #=> true
     #
-    def delete(*args, &block)
-      sync_block_error if !async? && block_given?
-      key, options = expand_get_args(args)
-      key, cas     = delete_args_parser(key)
+    def delete(*args)
+      key, cas, options = expand_delete_args(args)
 
       if key.respond_to?(:to_ary)
         delete_multi(key, options)
       else
-        delete_single(key, cas, options, &block)
+        delete_single(key, cas, options)
       end
     end
 
+    def async_delete(*args, &block)
+      key, cas, options = expand_delete_args(args)
+
+      future = client.delete(key)
+      register_future(future, { op: :delete }, &block)
+    end
+
     private
 
-    def delete_args_parser(args)
-      if args.respond_to?(:to_str)
-        [args, nil]
+    def expand_delete_args(args)
+      key, options = expand_get_args(args)
+
+      if key.respond_to?(:to_str)
+        [key, options[:cas], options]
       else
-        cas = if args.size > 1 &&
-                 args.last.respond_to?(:to_int)
-                args.pop
+        cas = if key.size > 1 &&
+                 key.last.respond_to?(:to_int)
+                key.pop
               else
                 nil
               end
 
-        key = args.size == 1 ? args.first : args
+        key = key.size == 1 ? key.first : key
 
-        [key, cas]
+        [key, cas, options]
       end
     end
 
-    def delete_single(key, cas, options, &block)
-      if async?
-        java_async_delete(key, &block)
-      else
-        cas = java_delete(key)
-        not_found_error(!cas, options)
-        cas
-      end
+    def delete_single(key, cas, options)
+      future = cas.nil? ? client.delete(key) : client.delete(key, cas)
+      cas = future_cas(future)
+      not_found_error(!cas, options)
+      cas
     end
 
     def delete_multi(keys, options = {})
@@ -107,15 +111,5 @@ module Couchbase::Operations
         end
       end
     end
-
-    def java_delete(key)
-      future = client.delete(key)
-      future_cas(future)
-    end
-
-    def java_async_delete(key, &block)
-      future = client.delete(key)
-      register_future(future, { op: :delete }, &block)
-    end
   end
 end

data/lib/couchbase/operations/fetch.rb

@@ -21,8 +21,9 @@ module Couchbase::Operations
   module Fetch
 
     def fetch(key, set_options = {}, &block)
-      raise ArgumentError('Must pass a block to #fetch') unless block_given?
-      get(key, :quiet => false)
+      fail ArgumentError 'Must pass a block to #fetch' unless block_given?
+
+      get(key, quiet: false)
     rescue Couchbase::Error::NotFound
       yield(block).tap {|value| set(key, value, set_options) }
     end

data/lib/couchbase/operations/get.rb

@@ -147,13 +147,7 @@ module Couchbase::Operations
     #
     def get(*args, &block)
       key, options = expand_get_args(args)
-
-      if async?
-        async_get(key, &block)
-      else
-        sync_block_error if block_given?
-        get_key(key, options)
-      end
+      get_key(key, options)
     end
 
     def [](key, options = {})
@@ -176,7 +170,9 @@ module Couchbase::Operations
       end
     end
 
-    def async_get(key)
+    def async_get(key, &block)
+      fail ArgumentError, 'Must pass a block to #async_get' unless block_given?
+
       case key
       when String, Symbol
         meta = { op: :get, key: key }
@@ -187,7 +183,7 @@ module Couchbase::Operations
       when Hash
         # async_get_and_touch(key, options, &block)
       end
-      register_future(future, meta, &Proc.new) if block_given?
+      register_future(future, meta, &block)
     end
 
     private

data/lib/couchbase/operations/stats.rb

@@ -19,7 +19,6 @@ module Couchbase::Operations
   module Stats
 
     def stats(statname = nil)
-      sync_block_error if !async? && block_given?
       stats = if statname.nil?
                 client.getStats
               else

data/lib/couchbase/operations/store.rb

@@ -126,19 +126,10 @@ module Couchbase::Operations
     #     c.set("foo", "bar", :observe => {:persisted => 1})
     #
     def set(key, value = nil, options = {})
-      if async?
-        if block_given?
-          async_set(key, value, options, &Proc.new)
-        else
-          async_set(key, value, options)
-        end
-      else
-        sync_block_error if block_given?
-        store_op(:set, key, value, options)
-      end
+      store_op(:set, key, value, options)
     end
 
-    def async_set(key, value, options, &block)
+    def async_set(key, value, options = {}, &block)
       async_store_op(:set, key, value, options, &block)
     end
 
@@ -199,16 +190,7 @@ module Couchbase::Operations
     #     c.add("foo", "bar", :observe => {:persisted => 1})
     #
     def add(key, value = nil, options = {})
-      if async?
-        if block_given?
-          async_add(key, value, options, &Proc.new)
-        else
-          async_add(key, value, options)
-        end
-      else
-        sync_block_error if block_given?
-        store_op(:add, key, value, options)
-      end
+      store_op(:add, key, value, options)
     end
 
     def async_add(key, value, options, &block)
@@ -257,16 +239,7 @@ module Couchbase::Operations
     #     c.replace("foo", "bar", :observe => {:persisted => 1})
     #
     def replace(key, value, options = {})
-      if async?
-        if block_given?
-          async_replace(key, value, options, &Proc.new)
-        else
-          async_replace(key, value, options)
-        end
-      else
-        sync_block_error if block_given?
-        store_op(:replace, key, value, options)
-      end
+      store_op(:replace, key, value, options)
     end
 
     def async_replace(key, value, options, &block)
@@ -347,7 +320,6 @@ module Couchbase::Operations
     #     c.append("foo", "bar", :observe => {:persisted => 1})
     #
     def append(key, value)
-      sync_block_error if block_given?
       store_op(:append, key, value)
     end
 
@@ -404,7 +376,6 @@ module Couchbase::Operations
     #     c.prepend("foo", "bar", :observe => {:persisted => 1})
     #
     def prepend(key, value)
-      sync_block_error if block_given?
       store_op(:prepend, key, value)
     end
 

data/lib/couchbase/operations/touch.rb

@@ -82,22 +82,13 @@ module Couchbase::Operations
     #     c.touch("foo" => 10)             #=> true
     #
     def touch(*args)
-      sync_block_error if !async? && block_given?
       key, ttl, options = expand_touch_args(args)
 
       case key
       when String, Symbol
-        if async?
-          if block_given?
-            async_touch(key, ttl, &Proc.new)
-          else
-            async_touch(key, ttl)
-          end
-        else
-          success = client_touch(key, ttl)
-          not_found_error(!success, options)
-          success
-        end
+        success = client_touch(key, ttl)
+        not_found_error(!success, options)
+        success
       when Hash
         multi_touch_hash(key, options)
       when Array
@@ -105,12 +96,8 @@ module Couchbase::Operations
       end
     end
 
-    def async_touch(key, ttl)
-      if block_given?
-        register_future(client.touch(key, ttl), { op: :touch }, &Proc.new)
-      else
-        client.touch(key, ttl)
-      end
+    def async_touch(key, ttl, &block)
+      register_future(client.touch(key, ttl), { op: :touch }, &block)
     end
 
     private

data/lib/couchbase/operations/utils.rb

@@ -36,10 +36,6 @@ module Couchbase::Operations
       end
     end
 
-    def sync_block_error
-      raise ArgumentError, "synchronous mode doesn't support callbacks"
-    end
-
     def not_found_error(error, options = {})
       if error
         if options.key?(:quiet)

data/lib/couchbase/transcoder.rb

@@ -36,9 +36,11 @@ module Couchbase
 
         MultiJson.load(data)
       rescue MultiJson::LoadError
-        ::Marshal.load(data)
-      rescue TypeError
-        data
+        begin
+          ::Marshal.load(data)
+        rescue TypeError
+          data
+        end
       end
 
       def encode(o)

data/lib/couchbase/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Couchbase
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/couchbase/view.rb

@@ -294,19 +294,9 @@ module Couchbase
       request = @bucket.client.query(view, query.generate)
 
       if block_given?
-        block = Proc.new
-        request.each do |data|
-          doc = @wrapper_class.wrap(@bucket, data)
-          block.call(doc)
-        end
-        nil
+        fetch_block(request, Proc.new)
       else
-        docs = request.to_a.map { |data|
-          @wrapper_class.wrap(@bucket, data)
-        }
-        docs = ArrayWithTotalRows.new(docs)
-        docs.total_rows = request.size
-        docs
+        fetch_array(request)
       end
     end
 
@@ -344,6 +334,27 @@ module Couchbase
 
     private
 
+    def fetch_array(request)
+      docs = request.to_a.map { |data|
+        wrap_or_parse_data(data)
+      }
+      docs = ArrayWithTotalRows.new(docs)
+      docs.total_rows = request.size
+      docs
+    end
+
+    def fetch_block(request, block)
+      request.each do |data|
+        doc = wrap_or_parse_data(data)
+        block.call(doc)
+      end
+      nil
+    end
+
+    def wrap_or_parse_data(data)
+      @wrapper_class.wrap(@bucket, data)
+    end
+
     def send_error(*args)
       if @on_error
         @on_error.call(*args.take(2))

data/lib/couchbase/view_row.rb

@@ -123,13 +123,14 @@ module Couchbase
       @bucket = bucket
       @data   = data
       @key    = data.key
-      @value  = data.value
-      @id     = data.id
       @last   = false
 
       case data
       when ViewRowWithDocs, SpatialViewRowWithDocs
-        @doc   = data.document
+        @id       = data.id
+        @doc      = data.document
+      when ViewRowReduced
+        @value    = MultiJson.load(data.value)
       when SpatialViewRowNoDocs, SpatialViewRowWithDocs
         @geometry = data.geometry
         @bbox     = data.bbox

data/lib/couchbase.rb

@@ -144,7 +144,7 @@ module Couchbase
                  @connection_options[:bucket]
                when String
                  path = URI.parse(@connection_options).path
-                 path[%r(^(/pools/([A-Za-z0-9_.-]+)(/buckets/([A-Za-z0-9_.-]+))?)?), 3] || "default"
+                 path[%r(^(/pools/([A-Za-z0-9_.-]+)(/buckets/([A-Za-z0-9_.-]+))?)?), 3] || 'default'
                else
                  'default'
                end
@@ -161,6 +161,7 @@ module Couchbase
       name = @connection_options && @connection_options[:bucket] || "default"
       @@buckets[name] = connection
     end
+    alias set_bucket bucket=
 
     def connected?
       !!@@buckets.empty?
@@ -169,8 +170,9 @@ module Couchbase
     def disconnect
       @@buckets.each_key do |name|
         bucket = @@buckets.delete(name)
-        bucket.disconnect if connected?
+        bucket.disconnect
       end
+      @@buckets = ThreadSafe::Cache.new
     end
   end
 end

data/tasks/benchmark.rake

@@ -0,0 +1,6 @@
+desc 'Run benchmarks and compare them to memcached and dalli gems'
+task :benchmark => [:clean, :compile] do
+  cd File.expand_path(File.join(__FILE__, '..', '..', 'test', 'profile')) do
+    sh "bundle install && bundle exec ruby benchmark.rb | tee benchmark-#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}.log"
+  end
+end

data/tasks/test.rake

@@ -0,0 +1,34 @@
+# Author:: Couchbase <info@couchbase.com>
+# Copyright:: 2011, 2012 Couchbase, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'rake/testtask'
+require 'rake/clean'
+
+rule 'test/CouchbaseMock.jar' do |task|
+  jar_path = "0.6-SNAPSHOT/CouchbaseMock-0.6-20130903.160518-3.jar"
+  sh %{wget -q -O test/CouchbaseMock.jar http://files.couchbase.com/maven2/org/couchbase/mock/CouchbaseMock/#{jar_path}}
+end
+
+CLOBBER << 'test/CouchbaseMock.jar'
+
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+Rake::Task['test'].prerequisites.unshift('test/CouchbaseMock.jar')

data/tasks/util.rake

@@ -0,0 +1,21 @@
+# Author:: Couchbase <info@couchbase.com>
+# Copyright:: 2011, 2012 Couchbase, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+desc 'Start an irb session and load the library.'
+task :console do
+  exec "irb -I lib -rcouchbase"
+end

data/test/mock.rb

@@ -0,0 +1,85 @@
+class CouchbaseServer
+  attr_accessor :host, :port, :num_nodes, :buckets_spec
+
+  def real?
+    true
+  end
+
+  def initialize(params = {})
+    @host, @port = 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)
+      connection.flush
+    end
+  end
+  def stop; end
+end
+
+require "#{File.dirname(__FILE__)}/CouchbaseMock.jar"
+
+class CouchbaseMock
+  attr_accessor :host, :port, :num_nodes, :buckets_spec, :num_vbuckets
+
+  def real?
+    false
+  end
+
+  def initialize(params = {})
+    @host = 'localhost'
+    @port = 8091
+    @num_nodes = 1
+    @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
+    @mock = Java::OrgCouchbaseMock::CouchbaseMock.new(@host, @port, @num_nodes, @num_vbuckets, @buckets_spec)
+  end
+
+  def start
+    @mock.start
+    @mock.waitForStartup
+  end
+
+  def stop
+    @mock.stop
+  end
+end
+
+def start_mock(params = {})
+  mock = nil
+  if 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

data/test/setup.rb

@@ -18,13 +18,11 @@
 gem 'minitest'
 require 'coveralls'
 Coveralls.wear!
-require 'minitest/autorun'
+require 'minitest'
 require 'couchbase'
-
-require 'socket'
 require 'open-uri'
 require 'ostruct'
-
+require_relative 'mock'
 require 'pry'
 
 # Surpress connection logging
@@ -42,9 +40,7 @@ require 'pry'
 
 # $stderr = StringIO.new
 
-Minitest.after_run { Couchbase.disconnect }
-
-class MiniTest::Test
+class Minitest::Test
 
   def cb
     Couchbase.bucket
@@ -66,3 +62,12 @@ class MiniTest::Test
   end
 
 end
+
+$mock = start_mock
+
+Dir.glob('test/test_store.rb').each { |test| require test }
+exit_code = Minitest.run(ARGV)
+Couchbase.disconnect
+$mock.stop
+java.lang.System.exit(exit_code ? 0 : 1)
+

data/test/test_arithmetic.rb

@@ -112,6 +112,7 @@ class TestArithmetic < MiniTest::Test
   end
 
   def test_decrement_with_absolute_ttl
+    skip unless $mock.real?
     # absolute TTL: one second from now
     exp = Time.now.to_i + 1
     val = cb.decr(uniq_id, 12, :initial => 0, :ttl => exp)