ccp 0.3.2 → 0.3.3

data/lib/ccp/kvs/tch.rb

@@ -7,8 +7,10 @@ module Ccp
       def set(k,v) ; W{ super }; end
       def del(k)   ; W{ super }; end
       def count    ; R{ super }; end
-      def keys     ; R{ super }; end
       def read!    ; R{ super }; end
+      def keys     ; R{ super }; end
+      def first_key; R{ super }; end
+      def first    ; R{ super }; end
     end
   end
 end

data/lib/ccp/kvs/tokyo.rb

@@ -3,7 +3,10 @@ require 'tokyocabinet'
 module Ccp
   module Kvs
     module Tokyo
-      Error = Class.new(Ccp::Kvs::Error)
+      Error  = Class.new(Ccp::Kvs::Error)
+      Locked = Class.new(Error)
+
+      CONNECTIONS = {}
     end
   end
 end

data/lib/ccp/kvs/tokyo/base.rb

@@ -33,6 +33,10 @@ module Ccp
             @db.ecode != HDB::ESUCCESS
           end
 
+          def threading_error?
+            @db.ecode == HDB::ETHREAD
+          end
+
           def error_message
             if @db
               # TODO: Where is adb_errmsg?

data/lib/ccp/kvs/tokyo/cabinet.rb

@@ -52,37 +52,69 @@ module Ccp
           return @db.rnum
         end
 
+        ######################################################################
+        ### bulk operations (not DRY but fast)
+
+        def read!
+          tryR("read!")
+          hash = {}
+          @db.iterinit or tokyo_error!("read!: ")
+          while k = @db.iternext
+            v = @db.get(k) or tokyo_error!("get(%s): " % k)
+            hash[k] = decode(v)
+          end
+          return hash
+        end
+
         ######################################################################
         ### iterator
 
         def each(&block)
-          each_keys do |key|
-            block.call(get(key))
-          end
+          each_pair(&block)
         end
 
         def each_pair(&block)
-          each_keys do |key|
+          each_key do |key|
             block.call(key, get(key))
           end
         end
 
-        def each_keys(&block)
-          tryR("each_keys")
-          @db.iterinit
+        def each_key(&block)
+          tryR("each_key")
+          @db.iterinit or tokyo_error!("each_key: ")
           while key = @db.iternext
             block.call(key)
           end
         end
 
+        def each_keys(&block)
+          STDERR.puts "DEPRECATION WARNING: #{self.class}#each_keys is deprecated and will be removed in 0.4.0, use each_key instead"
+          each_key(&block)
+        end
+
         def keys
           array = []
-          each_keys do |key|
+          each_key do |key|
             array << key
           end
           return array
         end
 
+        def first_key
+          tryR("first_key")
+          @db.iterinit or tokyo_error!("first_key: ")
+          return @db.iternext
+        end
+
+        def first
+          key = first_key
+          if key
+            return [key, get(key)]
+          else
+            return nil
+          end
+        end
+
       end
     end
   end

data/lib/ccp/kvs/tokyo/state_machine.rb

@@ -15,9 +15,41 @@ module Ccp
           @state || CLOSED
         end
 
+        def locker_info
+          pretty = proc{|c| Array(c).find{|i| i !~ %r{/ruby/[^/]+/gems/}} || c}
+
+          if CONNECTIONS[@source]
+            return pretty[CONNECTIONS[@source]]
+          end
+
+          target = File.basename(@source)
+          CONNECTIONS.each_pair do |file, reason|
+            return pretty[reason] if File.basename(file) == target
+          end
+
+          if CONNECTIONS.any?
+            return CONNECTIONS.inspect
+          else
+            return 'no brockers. maybe locked by other systems?'
+          end
+        end
+
         def open(mode)
           Pathname(@source.to_s).parent.mkpath
-          @db.open(@source.to_s, mode) or tokyo_error!("%s#open(%s,%s): " % [self.class, @source, mode])
+
+          # open and mark filename for threading error
+          if @db.open(@source.to_s, mode)
+            CONNECTIONS[@db.path.to_s] = (caller rescue "???")
+          elsif threading_error?
+            raise Tokyo::Locked, "%s is locked by %s" % [@source, locker_info]
+          else
+            tokyo_error!("%s#open(%s,%s): " % [self.class, @source, mode])
+          end
+        end
+
+        def __close__
+          @db.close
+          CONNECTIONS[@db.path] = nil
         end
 
         def close
@@ -28,7 +60,7 @@ module Ccp
           case state
           when CLOSED   ; # NOP
           when READABLE,
-               WRITABLE ; @db.close; @state = CLOSED
+               WRITABLE ; __close__; @state = CLOSED
           else          ; raise "unknown state: #{state}"
           end
         end

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/kvs/tokyo/cabinet_spec.rb

@@ -205,6 +205,35 @@ describe Ccp::Kvs::Tokyo::Cabinet do
     end
   end
 
+  ######################################################################
+  ### read!
+
+  describe "#read!" do
+    specify do
+      put(:foo, 1)
+      put(:bar, 2)
+
+      kvs.R!
+      kvs.read!.should == {"foo" => "1", "bar" => "2"}
+    end
+  end
+
+  ######################################################################
+  ### each
+
+  describe "#each" do
+    specify do
+      put(:foo, 1)
+      put(:bar, 2)
+
+      kvs.R!
+
+      hash = {}
+      kvs.each{|k,v| hash[k] = v}
+      hash.should == {"foo" => "1", "bar" => "2"}
+    end
+  end
+
   ######################################################################
   ### keys
 
@@ -218,4 +247,32 @@ describe Ccp::Kvs::Tokyo::Cabinet do
       kvs.keys.sort.should == %w( bar baz foo )
     end
   end
+
+  ######################################################################
+  ### first
+
+  describe "#first" do
+    specify do
+      put(:foo, 1)
+      put(:bar, 2)
+
+      kvs.R!
+      first = kvs.first
+      first.should be_kind_of(Array)
+      first.size.should == 2
+      first[0].should =~ /^(foo|bar)$/
+      first[1].should =~ /^(1|2)$/
+    end
+  end
+
+  describe "#first_key" do
+    specify do
+      put(:foo, 1)
+      put(:bar, 2)
+
+      kvs.R!
+      kvs.first_key.should =~ /^(foo|bar)$/
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-26 00:00:00 Z
+date: 2013-08-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport