hashtree 0.0.4 → 0.0.5

data/examples/benchmarks.rb

@@ -80,6 +80,14 @@ Benchmark.bm do |x|
     end
   end
 
+  puts "Doing 100 non-indexed queries"
+  x.report do
+    100.times do |i|
+      query = proc{ |key,doc| doc[:email] == "john.doe.#{rand(100000)}@example.com" }
+      @htree.select{ |key, doc| query.call(key,doc) }
+    end
+  end
+
   puts "Deleting 1.000 random documents"
   x.report do
     lhtree = @htree.clone

data/lib/hashtree/version.rb

@@ -1,3 +1,3 @@
 class HashTree
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/hashtree.rb

@@ -18,30 +18,21 @@ class HashTree
     }
   end
 
-  # Public API
   def [](key)
-    begin
-      id = @index[key]
-      if id
-        read(id)
-      else
-        nil
-      end
-    rescue
+    id = @index[key]
+    if id
+      read(id)
+    else
       nil
     end
   end
 
   def []=(key, value)
-    begin
-      id = @index[key]
-      if id
-        update(id, value)
-      else
-        create(key, value)
-      end
-    rescue
-      nil
+    id = @index[key]
+    if id
+      update(id, value)
+    else
+      create(key, value)
     end
   end
 
@@ -107,38 +98,40 @@ class HashTree
     end
   end
 
-  # Private API
   def translate_id(id)
-    branch_id, leaf_id = id[0..31], id[33..64]
+    branch_id, leaf_id = id[0..31], id[32..64]
     return branch_id, leaf_id
   end
 
+  def generate_id
+    Digest::SHA256.hexdigest(SecureRandom.uuid)
+  end
+
   def read(id)
     branch_id, leaf_id = translate_id(id)
-    branch = @branches[branch_id]
-    leaf = branch ? branch[leaf_id] : nil
+    @branches[branch_id][leaf_id]
   end
 
   def update(id, value)
-    leaf = read(id)
-    leaf = value if leaf
-    return ( leaf ? value : nil )
+    branch_id, leaf_id = translate_id(id)
+    @branches[branch_id][leaf_id] = value
+    return value
   end
 
   def create(key, value)
     free_branch_id = @branches[:free].keys.sample
     if free_branch_id
-      leaf_id = Digest::SHA2.hexdigest(SecureRandom.uuid)[0..31]
-      @index[key] = free_branch_id + leaf_id
-      branch = @branches[free_branch_id]
-      branch[leaf_id] = value
+      leaf_id = generate_id[0..31]
+      id = free_branch_id + leaf_id
+      @index[key] = id
+      @branches[free_branch_id][leaf_id] = value
       @branches[:free].delete(branch_id) if branch.size >= @settings[:max_branch_size]
     else
-      id = Digest::SHA2.hexdigest(SecureRandom.uuid)
-      @index[key] = id
+      id = generate_id
       branch_id, leaf_id = translate_id(id)
-      branch = { leaf_id => value }
-      @branches[branch_id] = branch
+      @index[key] = id
+      @branches[branch_id] = {}
+      @branches[branch_id][leaf_id] = value
     end
     return value
   end
@@ -150,7 +143,7 @@ class HashTree
     if branch.size == 0
       @branches.delete(branch_id)
       @branches[:free].delete(branch_id)
-    elsif branch.size > 0 and branch.size < 16
+    elsif branch.size > 0 and branch.size < @settings[:max_branch_size]
       @branches[:free][branch_id] = nil
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashtree
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: