rbbt-util 5.27.3 → 5.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7d7e81ee4a7981fd286ef0c5d8435aa482d0598068e7d1d19d526dd17a1e9d
-  data.tar.gz: 070db371b5d3ab7e11e52795b648e65dd5f296863cd516ce830b82e3a20e8471
+  metadata.gz: 002a8471d312055597b78dd78a842b8eca3349ef8330092db66c422b90a395d3
+  data.tar.gz: 04e92168a2ff75cf3352b650b3976eb7f6bc376c0e261cd188c71e172182312d
 SHA512:
-  metadata.gz: 6a7d93d19efeac98230ba8d9ba131a2e670b4ff3421606bdef8b0ec5c004e1e0aee2110dc18c64ca59066b4c3c3feb463ed86cc3295010fdb94fcd6f467e6ea0
-  data.tar.gz: 0a53f17d0bced1858aaaede6b55e30caed1347d87a120ed580a6e7bc8031ac4aba8ede384473ec92327b64d5922093e2fe1e0fa0990baca18b88873364ace8b6
+  metadata.gz: ca14d83e94da469aece65bc92ca4cbdff063ca3bc37d1d86c796eabb3dc8711466a440f8c3faf0686c608cb83a5c3f2b78b3a69479730a51e10ed18ba374dd28
+  data.tar.gz: 8459a174d3767640b701c30ff3b425c3c01f10002a24c88a1e0734dee94f7e9f870d7ac144a39b54dade0d230784ecc22119e9d4e3f004edcd099d14c3280877

data/lib/rbbt/persist/tsv/adapter.rb

@@ -9,15 +9,6 @@ module Persist
       @mutex ||= Mutex.new
     end
 
-    def prefix(key)
-      range(key, 1, key + MAX_CHAR, 1)
-    end
-
-    def get_prefix(key)
-      keys = prefix(key)
-      select(:key => keys)
-    end
-
     def closed?
       @closed
     end
@@ -54,25 +45,14 @@ module Persist
       end
     end
 
-    def collect
-      res = []
-      each do |key, value|
-        res << if block_given?
-                 yield key, value
-        else
-          [key, value]
-        end
-      end
-      res
-    end
-
     def delete(key)
       out(key)
     end
 
     def lock
-      #return yield if @locked
+      return yield if @locked
       lock_filename = Persist.persistence_path(persistence_path, {:dir => TSV.lock_dir})
+      Log.stack caller if $LOG
       Misc.lock(lock_filename) do
         begin
           @locked = true
@@ -155,16 +135,16 @@ module Persist
       end
     end
 
-
     def merge!(hash)
       hash.each do |key,values|
         self[key] = values
       end
     end
 
-
     def range(*args)
-      super(*args) #- TSV::ENTRY_KEYS.to_a
+      self.read_and_close do
+        super(*args)
+      end
     end
 
     def include?(*args)
@@ -187,7 +167,52 @@ module Persist
 
     def keys(*args)
       self.read_and_close do
-        super(*args) #- TSV::ENTRY_KEYS.to_a
+        super(*args)
+      end
+    end
+
+
+    def prefix(key)
+      self.read_and_close do
+        range(key, 1, key + MAX_CHAR, 1)
+      end
+    end
+
+    def get_prefix(key)
+      keys = prefix(key)
+      select(:key => keys)
+    end
+
+
+    def size(*args)
+      self.read_and_close do
+        super(*args)
+      end
+    end
+
+    def each(*args, &block)
+      self.read_and_close do
+        super(*args, &block)
+      end
+    end
+
+    def collect
+      res = []
+      each do |key, value|
+        res << if block_given?
+                 yield key, value
+        else
+          [key, value]
+        end
+      end
+      res
+    end
+
+    def values_at(*keys)
+      self.read_and_close do
+        keys.collect do |k|
+          self[k]
+        end
       end
     end
   end

data/lib/rbbt/persist/tsv/tokyocabinet.rb

@@ -94,8 +94,8 @@ module Persist
     unless serializer == :clean
       TSV.setup database
       database.write_and_read do
-        database.serializer = serializer if serializer 
-      end
+        database.serializer = serializer
+      end if serializer && database.serializer != serializer
     end
 
     database

data/lib/rbbt/tsv/accessor.rb

@@ -366,11 +366,11 @@ module TSV
     keys.length
   end
 
-  def values_at(*keys)
-    keys.collect do |key|
-      self[key]
-    end
-  end
+  #def _values_at(*keys)
+  #  keys.collect do |key|
+  #    self[key]
+  #  end
+  #end
 
   def chunked_values_at(keys, max = 5000)
     Misc.ordered_divide(keys, max).inject([]) do |acc,c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.27.3
+  version: 5.27.4
 platform: ruby
 authors:
 - Miguel Vazquez