rbbt-util 5.14.1 → 5.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa73fffbfca850f0304a250527157c35aef1dcb5
-  data.tar.gz: aab332c2a7b11e9d7a207f1640af194dc54a9eb1
+  metadata.gz: e22611b53d0c2a89c0e2a3b21317d44247bd015d
+  data.tar.gz: c75e90adddd0e88805458e51bdd28a4b46143b90
 SHA512:
-  metadata.gz: 231c27fb1f1b1f81569c0613c4e3b5b61d5d0873bb085671421962934802be074c4a94155bd251d59a37d3098ce2a3729febc759c0320eefa453f9c731faf907
-  data.tar.gz: 394a55fe8949acea897c028106ac47bff2f3f3828a9fab1b0fc44446c19ce0c6d40ba83d5da4c9bba8709e35d425741984ff04d643c3dd270cb9a4fb89a5d9e6
+  metadata.gz: 02abe6b04eb5877e7be78d8742e861cb21df05694e7e467a12076ca2cb3b9e772f1f30f1f6a9bb21843e6f4e301618c561a6813b3b2fc147530819ea03657c4d
+  data.tar.gz: cba9bdf10dd98e2e8ea022984ca4c74282a74c780431034cd738c48941d5174d0fdae3faeaf47f3a3dcddef09490ec386351f069b944e06cc4a4702967b8408a

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

@@ -62,6 +62,14 @@ module Persist
      
     def add(key, value)
       key = pos_function.call(key) if pos_function 
+      if Fixnum === key
+        @_last ||= -1
+        skipped = key - @_last - 1
+        skipped.times do
+          self.send(:<<, nil)
+        end
+        @_last = key
+      end
       self.send(:<<, value)
     end
 

data/test/rbbt/persist/tsv/test_sharder.rb

@@ -94,7 +94,6 @@ class TestSharder < Test::Unit::TestCase
             v = v 
             chr = "chr" << c.to_s
             key = chr + ":" << v.to_s
-            iii [key, v]
             db << [key, [v*2]]
           end
         end
@@ -119,5 +118,47 @@ class TestSharder < Test::Unit::TestCase
       assert_equal chrs.length*size, sharder.size 
     end
   end
+
+  def test_shard_pki_skip
+    TmpFile.with_file do |dir|
+      shard_function = Proc.new do |key|
+        key[0..(key.index(":")-1)]
+      end
+
+      pos_function = Proc.new do |key|
+        key.split(":").last.to_i
+      end
+
+      size = 10
+      chrs = (1..10).to_a
+      sharder = Persist.persist_tsv(nil, "ShardTest", {}, :pattern => %w(f), :update => true, :range => false, :value_size => 64, :engine => 'pki', :file => dir, :shard_function => shard_function, :pos_function => pos_function, :persist => true, :serializer => :clean) do |db|
+        chrs.each do |c|
+          size.times do |v| 
+            v = v + 1
+            chr = "chr" << c.to_s
+            key = chr + ":" << (v*2).to_s
+            db << [key, [v*2]]
+          end
+        end
+      end
+      sharder.read
+
+      assert_equal dir, sharder.persistence_path
+
+      assert_equal [2.0], sharder["chr2:2"]
+      assert_equal [4.0], sharder["chr2:4"]
+
+      count = 0
+      sharder.through do |k,v|
+        count += 1 unless v.nil?
+      end
+      assert_equal count, size*chrs.length
+
+      sharder = Persist.open_sharder(dir, false, :float, 'fwt', {:range => false, :value_size => 64, :pos_function => pos_function}, &shard_function)
+
+      assert_equal [2.0], sharder["chr2:2"]
+
+    end
+  end
 end
 

data/test/rbbt/workflow/test_step.rb

@@ -47,7 +47,7 @@ class TestStep < Test::Unit::TestCase
     end
   end
 
-  def test_dependency_log_relay
+  def __test_dependency_log_relay
     str = "TEST"
     TmpFile.with_file do |tmpfile|
       task1  = Task.setup :result_type => nil, :name => :task1 do 

metadata

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