couchbase 1.1.5-x86-mingw32 → 1.2.0.beta-x86-mingw32

data/test/test_delete.rb

@@ -31,17 +31,20 @@ class TestStore < MiniTest::Unit::TestCase
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
     connection.set(uniq_id, "bar")
     assert connection.delete(uniq_id)
-    refute connection.delete(uniq_id)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.delete(uniq_id)
+    end
   end
 
   def test_delete_missing
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-    refute connection.delete(uniq_id(:missing))
-    connection.quiet = false
     assert_raises(Couchbase::Error::NotFound) do
       connection.delete(uniq_id(:missing))
     end
     refute connection.delete(uniq_id(:missing), :quiet => true)
+    refute connection.quiet?
+    connection.quiet = true
+    refute connection.delete(uniq_id(:missing))
   end
 
   def test_delete_with_cas
@@ -60,4 +63,58 @@ class TestStore < MiniTest::Unit::TestCase
     assert connection.delete(uniq_id, cas)
   end
 
+  def test_delete_with_prefix
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :key_prefix => "prefix:")
+    connection.set(uniq_id(:foo), "bar")
+    assert connection.delete(uniq_id(:foo))
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id(:foo))
+    end
+  end
+
+  def test_simple_multi_delete
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => true)
+    connection.set(uniq_id(1) => "bar", uniq_id(2) => "foo")
+    res = connection.delete(uniq_id(1), uniq_id(2))
+    assert res.is_a?(Hash)
+    assert res[uniq_id(1)]
+    assert res[uniq_id(2)]
+  end
+
+  def test_simple_multi_delete_missing
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => true)
+    connection.set(uniq_id(1) => "bar", uniq_id(2) => "foo")
+    res = connection.delete(uniq_id(1), uniq_id(:missing), :quiet => true)
+    assert res.is_a?(Hash)
+    assert res[uniq_id(1)]
+    refute res[uniq_id(:missing)]
+  end
+
+  def test_multi_delete_with_cas_check
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => true)
+    cas = connection.set(uniq_id(1) => "bar", uniq_id(2) => "foo")
+    res = connection.delete(uniq_id(1) => cas[uniq_id(1)], uniq_id(2) => cas[uniq_id(2)])
+    assert res.is_a?(Hash)
+    assert res[uniq_id(1)]
+    assert res[uniq_id(2)]
+  end
+
+  def test_multi_delete_missing_with_cas_check
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => true)
+    cas = connection.set(uniq_id(1) => "bar", uniq_id(2) => "foo")
+    res = connection.delete(uniq_id(1) => cas[uniq_id(1)], uniq_id(:missing) => cas[uniq_id(2)])
+    assert res.is_a?(Hash)
+    assert res[uniq_id(1)]
+    refute res[uniq_id(:missing)]
+  end
+
+  def test_multi_delete_with_cas_check_mismatch
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => true)
+    cas = connection.set(uniq_id(1) => "bar", uniq_id(2) => "foo")
+
+    assert_raises(Couchbase::Error::KeyExists) do
+      connection.delete(uniq_id(1) => cas[uniq_id(1)] + 1,
+                        uniq_id(2) => cas[uniq_id(2)])
+    end
+  end
 end

data/test/test_format.rb

@@ -46,29 +46,31 @@ class TestFormat < MiniTest::Unit::TestCase
   end
 
   def test_it_raises_error_for_document_format_when_neither_to_json_nor_to_s_defined
-    orig_doc = SkinyClass.new("Twoflower", "The tourist")
-    refute orig_doc.respond_to?(:to_s)
-    refute orig_doc.respond_to?(:to_json)
+    if (MultiJson.respond_to?(:engine) ? MultiJson.engine : MultiJson.adapter).name =~ /Yajl$/
+      orig_doc = SkinyClass.new("Twoflower", "The tourist")
+      refute orig_doc.respond_to?(:to_s)
+      refute orig_doc.respond_to?(:to_json)
 
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :document)
-    assert_raises(Couchbase::Error::ValueFormat) do
-      connection.set(uniq_id, orig_doc)
-    end
+      connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :document)
+      assert_raises(Couchbase::Error::ValueFormat) do
+        connection.set(uniq_id, orig_doc)
+      end
 
-    class << orig_doc
-      def to_json
-        JSON.dump(:name => name, :role => role)
+      class << orig_doc
+        def to_json
+          MultiJson.dump(:name => name, :role => role)
+        end
       end
-    end
-    connection.set(uniq_id, orig_doc) # OK
+      connection.set(uniq_id, orig_doc) # OK
 
-    class << orig_doc
-      undef to_json
-      def to_s
-        JSON.dump(:name => name, :role => role)
+      class << orig_doc
+        undef to_json
+        def to_s
+          MultiJson.dump(:name => name, :role => role)
+        end
       end
+      connection.set(uniq_id, orig_doc) # OK
     end
-    connection.set(uniq_id, orig_doc) # OK
   end
 
   def test_it_could_dump_arbitrary_class_using_marshal_format
@@ -95,4 +97,13 @@ class TestFormat < MiniTest::Unit::TestCase
     end
   end
 
+  def test_bignum_conversion
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :plain)
+    cas = 0xffff_ffff_ffff_ffff
+    assert cas.is_a?(Bignum)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.delete(uniq_id => cas)
+    end
+  end
+
 end

data/test/test_get.rb

@@ -82,7 +82,10 @@ class TestGet < MiniTest::Unit::TestCase
     assert_equal "foo1", results[uniq_id(1)]
     assert_equal "foo2", results[uniq_id(2)]
     sleep(2)
-    assert connection.get(uniq_id(1), uniq_id(2)).compact.empty?
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id(1), uniq_id(2))
+    end
+    assert connection.get(uniq_id(1), uniq_id(2), :quiet => true).compact.empty?
   end
 
   def test_multi_get_and_touch_extended
@@ -104,11 +107,13 @@ class TestGet < MiniTest::Unit::TestCase
     assert results.is_a?(Hash)
     assert_equal "foo1", results[uniq_id]
     sleep(2)
-    refute = connection.get(uniq_id)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
   end
 
   def test_missing_in_quiet_mode
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => true)
     cas1 = connection.set(uniq_id(1), "foo1")
     cas2 = connection.set(uniq_id(2), "foo2")
 
@@ -169,7 +174,6 @@ class TestGet < MiniTest::Unit::TestCase
       conn.get(uniq_id) {|ret| res << ret}
       handler = lambda {|ret| res << ret}
       conn.get(uniq_id, &handler)
-      assert_equal 3, conn.seqno
     end
 
     checks = lambda do
@@ -198,7 +202,6 @@ class TestGet < MiniTest::Unit::TestCase
     res = {}
     connection.run do |conn|
       conn.get(uniq_id(1), uniq_id(2)) {|ret| res[ret.key] = ret.value}
-      assert_equal 2, conn.seqno
     end
 
     assert res[uniq_id(1)]
@@ -231,9 +234,15 @@ class TestGet < MiniTest::Unit::TestCase
       missing.clear
       conn.get(uniq_id(:missing1), &get_handler)
       conn.get(uniq_id, uniq_id(:missing2), &get_handler)
-      assert 3, conn.seqno
     end
 
+    connection.run(&suite)
+    refute res.has_key?(uniq_id(:missing1))
+    refute res.has_key?(uniq_id(:missing2))
+    assert_equal [uniq_id(:missing1), uniq_id(:missing2)], missing.sort
+    assert_equal "foo", res[uniq_id]
+
+    connection.quiet = true
     connection.run(&suite)
     assert_equal "foo", res[uniq_id]
     assert res.has_key?(uniq_id(:missing1)) # handler was called with nil
@@ -241,14 +250,6 @@ class TestGet < MiniTest::Unit::TestCase
     assert res.has_key?(uniq_id(:missing2))
     refute res[uniq_id(:missing2)]
     assert_empty missing
-
-    connection.quiet = false
-
-    connection.run(&suite)
-    refute res.has_key?(uniq_id(:missing1))
-    refute res.has_key?(uniq_id(:missing2))
-    assert_equal [uniq_id(:missing1), uniq_id(:missing2)], missing.sort
-    assert_equal "foo", res[uniq_id]
   end
 
   def test_get_using_brackets
@@ -327,4 +328,80 @@ class TestGet < MiniTest::Unit::TestCase
     end
   end
 
+  # http://www.couchbase.com/issues/browse/RCBC-31
+  def test_consistent_behaviour_for_arrays
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+
+    cas = connection.set(uniq_id("foo"), "foo")
+    connection.set(uniq_id("bar"), "bar")
+
+    assert_equal "foo", connection.get(uniq_id("foo"))
+    assert_equal ["foo"], connection.get([uniq_id("foo")])
+    assert_equal ["foo", "bar"], connection.get([uniq_id("foo"), uniq_id("bar")])
+    assert_equal ["foo", "bar"], connection.get(uniq_id("foo"), uniq_id("bar"))
+    expected = {uniq_id("foo") => ["foo", 0x00, cas]}
+    assert_equal expected, connection.get([uniq_id("foo")], :extended => true)
+    assert_raises TypeError do
+      connection.get([uniq_id("foo"), uniq_id("bar")], [uniq_id("foo")])
+    end
+  end
+
+  def test_get_with_lock_trivial
+    if @mock.real?
+      connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+      connection.set(uniq_id, "foo")
+      assert_equal "foo", connection.get(uniq_id, :lock => 1)
+      assert_raises Couchbase::Error::KeyExists do
+        connection.set(uniq_id, "bar")
+      end
+      sleep(2)
+      connection.set(uniq_id, "bar")
+    else
+      skip("implement GETL in CouchbaseMock.jar")
+    end
+  end
+
+  def test_multi_get_with_lock
+    if @mock.real?
+      connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+      connection.set(uniq_id(1), "foo1")
+      connection.set(uniq_id(2), "foo2")
+      assert_equal ["foo1", "foo2"], connection.get([uniq_id(1), uniq_id(2)], :lock => 1)
+      assert_raises Couchbase::Error::KeyExists do
+        connection.set(uniq_id(1), "bar")
+      end
+      assert_raises Couchbase::Error::KeyExists do
+        connection.set(uniq_id(2), "bar")
+      end
+    else
+      skip("implement GETL in CouchbaseMock.jar")
+    end
+  end
+
+  def test_multi_get_with_custom_locks
+    if @mock.real?
+      connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+      connection.set(uniq_id(1), "foo1")
+      connection.set(uniq_id(2), "foo2")
+      expected = {uniq_id(1) => "foo1", uniq_id(2) => "foo2"}
+      assert_equal expected, connection.get({uniq_id(1) => 1, uniq_id(2) => 2}, :lock => true)
+      assert_raises Couchbase::Error::KeyExists do
+        connection.set(uniq_id(1), "foo")
+      end
+      assert_raises Couchbase::Error::KeyExists do
+        connection.set(uniq_id(2), "foo")
+      end
+    else
+      skip("implement GETL in CouchbaseMock.jar")
+    end
+  end
+
+  def test_multi_get_result_hash_assembling
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
+    connection.set(uniq_id(1), "foo")
+    connection.set(uniq_id(2), "bar")
+
+    expected = {uniq_id(1) => "foo", uniq_id(2) => "bar"}
+    assert_equal expected, connection.get(uniq_id(1), uniq_id(2), :assemble_hash => true)
+  end
 end

data/test/test_store.rb

@@ -113,7 +113,6 @@ class TestStore < MiniTest::Unit::TestCase
     connection.run do |conn|
       conn.set(uniq_id("1"), "foo1") {|res| ret = res}
       conn.set(uniq_id("2"), "foo2") # ignore result
-      assert_equal 2, conn.seqno
     end
     assert ret.is_a?(Couchbase::Result)
     assert ret.success?
@@ -160,6 +159,18 @@ class TestStore < MiniTest::Unit::TestCase
     assert_equal "barfoo", val
   end
 
+  def test_set_with_prefix
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :key_prefix => "prefix:")
+    connection.set(uniq_id(:foo), "bar")
+    assert_equal "bar", connection.get(uniq_id(:foo))
+    expected = {uniq_id(:foo) => "bar"}
+    assert_equal expected, connection.get(uniq_id(:foo), :assemble_hash => true)
+
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :key_prefix => nil)
+    expected = {"prefix:#{uniq_id(:foo)}" => "bar"}
+    assert_equal expected, connection.get("prefix:#{uniq_id(:foo)}", :assemble_hash => true)
+  end
+
   ArbitraryData = Struct.new(:baz)
 
   def test_set_using_brackets
@@ -183,4 +194,23 @@ class TestStore < MiniTest::Unit::TestCase
       EOC
     end
   end
+
+  def test_multi_store
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :default_format => :plain)
+    connection.add(uniq_id(:a) => "bbb", uniq_id(:z) => "yyy")
+    assert_equal ["bbb", "yyy"], connection.get(uniq_id(:a), uniq_id(:z))
+
+    connection.prepend(uniq_id(:a) => "aaa", uniq_id(:z) => "xxx")
+    assert_equal ["aaabbb", "xxxyyy"], connection.get(uniq_id(:a), uniq_id(:z))
+
+    connection.append(uniq_id(:a) => "ccc", uniq_id(:z) => "zzz")
+    assert_equal ["aaabbbccc", "xxxyyyzzz"], connection.get(uniq_id(:a), uniq_id(:z))
+
+    connection.replace(uniq_id(:a) => "foo", uniq_id(:z) => "bar")
+    assert_equal ["foo", "bar"], connection.get(uniq_id(:a), uniq_id(:z))
+
+    res = connection.set(uniq_id(:a) => "bar", uniq_id(:z) => "foo")
+    assert_equal ["bar", "foo"], connection.get(uniq_id(:a), uniq_id(:z))
+    assert res.is_a?(Hash)
+  end
 end

data/test/{test_flush.rb → test_timer.rb}

@@ -1,5 +1,5 @@
 # Author:: Couchbase <info@couchbase.com>
-# Copyright:: 2011, 2012 Couchbase, Inc.
+# Copyright:: 2012 Couchbase, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,33 +17,26 @@
 
 require File.join(File.dirname(__FILE__), 'setup')
 
-class TestFlush < MiniTest::Unit::TestCase
+class TestTimer < MiniTest::Unit::TestCase
 
   def setup
-    @mock = start_mock(:num_nodes => 7)
+    @mock = start_mock
   end
 
   def teardown
     stop_mock(@mock)
   end
 
-  def test_trivial_flush
+  def test_initialization
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-    assert connection.flush
-  end
+    num = 0
+    connection.run do
+      assert Couchbase::Timer.new(connection, 100)  { num += 1}
+      assert connection.create_timer(100)           { num += 1}
 
-  def test_flush_with_block
-    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port)
-    flushed = {}
-    on_node_flush = lambda{|res| flushed[res.node] = res.success?}
-    connection.run do |conn|
-      conn.flush(&on_node_flush)
-    end
-    assert_equal @mock.num_nodes, flushed.size
-    flushed.each do |node, res|
-      assert node.is_a?(String)
-      assert res
+      assert Couchbase::Timer.new(connection, 100, :periodic => true)  {|t| num += 1; t.cancel}
+      assert connection.create_periodic_timer(100)                     {|t| num += 1; t.cancel}
     end
+    assert_equal 4, num
   end
-
 end

data/test/test_touch.rb

@@ -34,7 +34,9 @@ class TestTouch < MiniTest::Unit::TestCase
     sleep(1)
     assert connection.get(uniq_id)
     sleep(2)
-    refute connection.get(uniq_id)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
   end
 
   def test_multi_touch
@@ -45,8 +47,12 @@ class TestTouch < MiniTest::Unit::TestCase
     assert ret[uniq_id(1)]
     assert ret[uniq_id(2)]
     sleep(2)
-    refute connection.get(uniq_id(1))
-    refute connection.get(uniq_id(2))
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id(1))
+    end
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id(2))
+    end
   end
 
   def test_it_uses_default_ttl_for_touch
@@ -54,7 +60,9 @@ class TestTouch < MiniTest::Unit::TestCase
     connection.set(uniq_id, "bar", :ttl => 10)
     connection.touch(uniq_id)
     sleep(2)
-    refute connection.get(uniq_id)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
   end
 
   def test_it_accepts_ttl_for_get_command
@@ -63,7 +71,27 @@ class TestTouch < MiniTest::Unit::TestCase
     val = connection.get(uniq_id, :ttl => 1)
     assert_equal "bar", val
     sleep(2)
-    refute connection.get(uniq_id)
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.get(uniq_id)
+    end
+  end
+
+  def test_missing_in_quiet_mode
+    connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => true)
+    cas1 = connection.set(uniq_id(1), "foo1")
+    cas2 = connection.set(uniq_id(2), "foo2")
+
+    assert_raises(Couchbase::Error::NotFound) do
+      connection.touch(uniq_id(:missing), :quiet => false)
+    end
+
+    val = connection.touch(uniq_id(:missing))
+    refute(val)
+
+    ret = connection.touch(uniq_id(1), uniq_id(:missing), uniq_id(2))
+    assert_equal true, ret[uniq_id(1)]
+    assert_equal false, ret[uniq_id(:missing)]
+    assert_equal true, ret[uniq_id(2)]
   end
 
 end