couchbase 1.2.2-x86-mingw32 → 1.2.3-x86-mingw32

data/CONTRIBUTING.markdown

@@ -0,0 +1,75 @@
+We've decided to use "gerrit" for our code review system, making it
+easier for all of us to contribute with code and comments.
+
+  1. Visit http://review.couchbase.org and "Register" for an account
+  2. Review http://review.couchbase.org/static/individual_agreement.html
+  3. Agree to agreement by visiting http://review.couchbase.org/#/settings/agreements
+  4. If you do not receive an email, please contact us
+  5. Check out the `couchbase-ruby-client` area http://review.couchbase.org/#/q/status:open+project:couchbase-ruby-client,n,z
+  6. Join us on IRC at #libcouchbase on Freenode :-)
+
+We normally don't go looking for stuff in gerrit, so you should add at
+least me `"Sergey Avseyev" <sergey.avseyev@gmail.com>` as a reviewer
+for your patch (and I'll know who else to add and add them for you).
+
+## Contributing Using Repo Tool
+
+Follow ["Uploading Changes" guide][1] on the site if you have some code to contribute.
+
+All you should need to set up your development environment should be:
+
+    ~ % mkdir couchbase-ruby
+    ~ % cd couchbase-ruby
+    ~/couchbase-ruby % repo init -u git://github.com/trondn/manifests.git -m ruby.xml
+    ~/couchbase-ruby % repo sync
+    ~/couchbase-ruby % repo start my-branch-name --all
+    ~/couchbase-ruby % make
+
+This will build the latest version of `libcouchbase`,
+`couchbase-ruby-client` and `couchbase-ruby-client` libraries. You must
+have a C and C++ compiler installed, automake, autoconf.
+
+If you have to make any changes just commit them before you upload
+them to gerrit with the following command:
+
+    ~/couchbase-ruby/client % repo upload
+
+You might experience a problem trying to upload the patches if you've
+selected a different login name at http://review.couchbase.org than
+your login name. Don't worry, all you need to do is to add the
+following to your ~/.gitconfig file:
+
+    [review "review.couchbase.org"]
+        username = YOURNAME
+
+## Contributing Using Plain Git
+
+If you not so familiar with repo tool and its workflow there is
+alternative way to do the same job. Lets assume you have installed
+couchbase gem and libcouchbase from official packages and would you to
+contribute to couchbase-client gem only. Then you just need to complete
+gerrit registration steps above and clone the source repository
+(remember the repository on github.com is just a mirror):
+
+    ~ % git clone ssh://YOURNAME@review.couchbase.org:29418/couchbase-ruby-client.git
+
+Install [`commit-msg` hook][2]:
+
+    ~/couchbase-ruby-client % scp -p -P 29418 YOURNAME@review.couchbase.org:hooks/commit-msg .git/hooks/
+
+Make your changes and upload them for review:
+
+    ~/couchbase-ruby-client % git commit
+    ~/couchbase-ruby-client % git push origin HEAD:refs/for/master
+
+If you need to fix or add something to your patch, do it and re-upload
+the changes (all you need is to keep `Change-Id:` line the same to
+allow gerrit to track the patch.
+
+    ~/couchbase-ruby-client % git commit --amend
+    ~/couchbase-ruby-client % git push origin HEAD:refs/for/master
+
+Happy hacking!
+
+[1]: http://review.couchbase.org/Documentation/user-upload.html
+[2]: http://review.couchbase.org/Documentation/user-changeid.html

data/RELEASE_NOTES.markdown

@@ -3,6 +3,14 @@
 This document is a list of user visible feature changes and important
 bugfixes. Do not forget to update this doc in every important patch.
 
+## 1.2.3 (2013-04-02)
+
+* [major] Make ActiveSupport::Cache::CouchbaseStore threadsafe
+
+* [minor] Check for gethrtime. Needed for solaris/smartos
+
+* [minor] Update documentation bits regarding SET operations
+
 ## 1.2.2 (2013-02-11)
 
 * [minor] Bucket#design_docs will return a Hash with DesignDoc

data/ext/couchbase_ext/extconf.rb

@@ -135,6 +135,7 @@ have_type("st_index_t")
 have_func("clock_gettime")
 have_func("gettimeofday")
 have_func("QueryPerformanceCounter")
+have_func("gethrtime")
 have_func("rb_hash_lookup2")
 have_func("rb_thread_fd_select")
 have_func("rb_thread_blocking_region")

data/ext/couchbase_ext/gethrtime.c

@@ -16,6 +16,9 @@
  */
 
 #include "couchbase_ext.h"
+
+#ifndef HAVE_GETHRTIME
+
 #include <stdlib.h>
 #include <time.h>
 #include <assert.h>
@@ -122,3 +125,5 @@ hrtime_t gethrtime(void)
 #error "I don't know how to build a highres clock..."
 #endif
 }
+
+#endif

data/ext/couchbase_ext/store.c

@@ -228,6 +228,22 @@ cb_bucket_store(lcb_storage_t cmd, int argc, VALUE *argv, VALUE self)
  *   @example Store the key which will be expired in 2 seconds using relative TTL.
  *     c.set("foo", "bar", :ttl => 2)
  *
+ *   @example Perform multi-set operation. It takes a Hash store its keys/values into the bucket
+ *     c.set("foo1" => "bar1", "foo2" => "bar2")
+ *     #=> {"foo1" => cas1, "foo2" => cas2}
+ *
+ *   @example More advanced multi-set using asynchronous mode
+ *     c.run do
+ *       # fire and forget
+ *       c.set("foo1", "bar1", :ttl => 10)
+ *       # receive result into the callback
+ *       c.set("foo2", "bar2", :ttl => 10) do |ret|
+ *         if ret.success?
+ *           puts ret.cas
+ *         end
+ *       end
+ *     end
+ *
  *   @example Store the key which will be expired in 2 seconds using absolute TTL.
  *     c.set("foo", "bar", :ttl => Time.now.to_i + 2)
  *
@@ -235,7 +251,7 @@ cb_bucket_store(lcb_storage_t cmd, int argc, VALUE *argv, VALUE self)
  *     c.set("foo", {"bar" => "baz}, :format => :document)
  *
  *   @example Use hash-like syntax to store the value
- *     c.set["foo"] = {"bar" => "baz}
+ *     c["foo"] = {"bar" => "baz}
  *
  *   @example Use extended hash-like syntax
  *     c["foo", {:flags => 0x1000, :format => :plain}] = "bar"

data/lib/active_support/cache/couchbase_store.rb

@@ -19,6 +19,7 @@ require 'couchbase'
 require 'securerandom'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/cache'
+require 'monitor'
 
 module ActiveSupport
   module Cache
@@ -56,6 +57,7 @@ module ActiveSupport
         options[:key_prefix] ||= options.delete(:namespace)
         args.push(options)
         @data = ::Couchbase::Bucket.new(*args)
+        @lock = Monitor.new
       end
 
       # Fetches data from the cache, using the given key.
@@ -182,7 +184,9 @@ module ActiveSupport
           options[:format] = :plain
         end
         instrument(:read_multi, names, options) do
-          @data.get(names, options)
+          @lock.synchronize do
+            @data.get(names, options)
+          end
         end
       rescue ::Couchbase::Error::Base => e
         logger.error("#{e.class}: #{e.message}") if logger
@@ -243,7 +247,9 @@ module ActiveSupport
         options[:create] = true
         instrument(:increment, name, options) do |payload|
           payload[:amount] = amount if payload
-          @data.incr(name, amount, options)
+          @lock.synchronize do
+            @data.incr(name, amount, options)
+          end
         end
       rescue ::Couchbase::Error::Base => e
         logger.error("#{e.class}: #{e.message}") if logger
@@ -275,7 +281,9 @@ module ActiveSupport
         options[:create] = true
         instrument(:decrement, name, options) do |payload|
           payload[:amount] = amount if payload
-          @data.decr(name, amount, options)
+          @lock.synchronize do
+            @data.decr(name, amount, options)
+          end
         end
       rescue ::Couchbase::Error::Base => e
         logger.error("#{e.class}: #{e.message}") if logger
@@ -289,14 +297,18 @@ module ActiveSupport
       #
       # @return [Hash]
       def stats(*arg)
-        @data.stats(*arg)
+        @lock.synchronize do
+          @data.stats(*arg)
+        end
       end
 
       protected
 
       # Read an entry from the cache.
       def read_entry(key, options) # :nodoc:
-        @data.get(key, options)
+        @lock.synchronize do
+          @data.get(key, options)
+        end
       rescue ::Couchbase::Error::Base => e
         logger.error("#{e.class}: #{e.message}") if logger
         raise if @raise_errors
@@ -313,7 +325,9 @@ module ActiveSupport
         if ttl = options.delete(:expires_in)
           options[:ttl] ||= ttl
         end
-        @data.send(method, key, value, options)
+        @lock.synchronize do
+          @data.send(method, key, value, options)
+        end
       rescue ::Couchbase::Error::Base => e
         logger.error("#{e.class}: #{e.message}") if logger
         raise if @raise_errors
@@ -322,7 +336,9 @@ module ActiveSupport
 
       # Delete an entry from the cache.
       def delete_entry(key, options) # :nodoc:
-        @data.delete(key, options)
+        @lock.synchronize do
+          @data.delete(key, options)
+        end
       rescue ::Couchbase::Error::Base => e
         logger.error("#{e.class}: #{e.message}") if logger
         raise if @raise_errors

data/lib/couchbase.rb

@@ -73,7 +73,18 @@ module Couchbase
 
     # @private the thread local storage
     def thread_storage
-      Thread.current[:couchbase] ||= {}
+      Thread.current[:couchbase] ||= { :pid => Process.pid }
+    end
+
+    # @private resets thread local storage if process ids don't match
+    # see 13.3.1: http://www.modrails.com/documentation/Users%20guide%20Apache.html
+    def verify_connection!
+      reset_thread_storage! if thread_storage[:pid] != Process.pid
+    end
+
+    # @private resets thread local storage
+    def reset_thread_storage!
+      Thread.current[:couchbase] = nil
     end
 
     # The connection instance for current thread
@@ -87,6 +98,7 @@ module Couchbase
     #
     # @return [Bucket]
     def bucket
+      verify_connection!
       thread_storage[:bucket] ||= connect(connection_options)
     end
 
@@ -96,6 +108,7 @@ module Couchbase
     #
     # @return [Bucket]
     def bucket=(connection)
+      verify_connection!
       thread_storage[:bucket] = connection
     end
 

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/tasks/util.rake

@@ -16,6 +16,6 @@
 #
 
 desc 'Start an irb session and load the library.'
-task :console => :compile do
+task :console do
   exec "irb -I lib -rcouchbase"
 end

data/test/test_couchbase.rb

@@ -16,13 +16,62 @@
 #
 
 require File.join(File.dirname(__FILE__), 'setup')
+require 'minitest/mock'
 
 class TestCouchbase < MiniTest::Unit::TestCase
 
+  def teardown
+    Couchbase.reset_thread_storage!
+  end
+
   def test_that_it_create_instance_of_bucket
     with_mock do |mock|
       assert_instance_of Couchbase::Bucket, Couchbase.new("http://#{mock.host}:#{mock.port}/pools/default")
     end
   end
 
+  def test_verify_connection
+    pid = Process.pid
+    assert_equal pid, Couchbase.thread_storage[:pid]
+    Couchbase.verify_connection!
+    assert_equal pid, Couchbase.thread_storage[:pid]
+  end
+
+  def test_verify_connection_when_process_forks
+    pid = Process.pid
+    assert_equal pid, Couchbase.thread_storage[:pid]
+
+    # stub a simulated Kernel#fork
+    Process.stub(:pid, Process.pid + 1) do
+      Couchbase.verify_connection!
+      refute_equal pid, Couchbase.thread_storage[:pid]
+    end
+  end
+
+  def test_new_connection_when_process_forks
+    with_mock do |mock|
+      connection_options = "http://#{mock.host}:#{mock.port}/pools/default"
+      Couchbase.connection_options = connection_options
+      old_bucket_id = Couchbase.bucket.object_id
+
+      Process.stub(:pid, Process.pid + 1) do
+        refute_equal old_bucket_id, Couchbase.bucket.object_id
+      end
+    end
+  end
+
+  def test_new_connection_has_same_configuration_options
+    with_mock do |mock|
+      connection_options = "http://#{mock.host}:#{mock.port}/pools/default"
+      Couchbase.connection_options = connection_options
+      old_bucket = Couchbase.bucket
+
+      Process.stub(:pid, Process.pid + 1) do
+        new_bucket = Couchbase.bucket
+        assert_equal old_bucket.name, new_bucket.name
+        assert_equal old_bucket.hostname, new_bucket.hostname
+      end
+    end
+  end
+
 end

data/test/test_couchbase_rails_cache_store.rb

@@ -280,6 +280,29 @@ class TestCouchbaseRailsCacheStore < MiniTest::Unit::TestCase
     assert_equal({:key => uniq_id, :amount => 1, :create => true}, decrement.payload)
   end
 
+  # Inspiration: https://github.com/mperham/dalli/blob/master/test/test_dalli.rb#L416
+  def test_it_is_threadsafe
+    workers = []
+
+    # Have a bunch of threads perform a bunch of operations at the same time.
+    # Verify the result of each operation to ensure the request and response
+    # are not intermingled between threads.
+    10.times do
+      workers << Thread.new do
+        100.times do
+          store.write('a', 9)
+          store.write('b', 11)
+          assert_equal 9, store.read('a')
+          assert_equal({ 'a' => 9, 'b' => 11 }, store.read_multi('a', 'b'))
+          assert_equal 11, store.read('b')
+          assert_equal %w(a b), store.read_multi('a', 'b', 'c').keys.sort
+        end
+      end
+    end
+
+    workers.each { |w| w.join }
+  end
+
   private
 
   def collect_notifications

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -164,6 +164,7 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- CONTRIBUTING.markdown
 - Gemfile
 - LICENSE
 - Makefile
@@ -255,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3150309656222985130
+      hash: -322659644960790893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3150309656222985130
+      hash: -322659644960790893
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23