hashtree 0.0.2 → 0.0.3

data/examples/benchmarks.rb

@@ -64,9 +64,25 @@ Benchmark.bm do |x|
     end
   end
 
+  puts "Doing 1 non-indexed query"
+  x.report do
+    1.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 "Doing 10 non-indexed queries"
+  x.report do
+    10.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
+    lhtree = @htree.clone
     1_000.times do |i|
       key = "jdoe#{rand(100_000)}"
       lhtree.delete(key)
@@ -75,7 +91,7 @@ Benchmark.bm do |x|
 
   puts "Deleting 10.000 random documents"
   x.report do
-    lhtree = @htree
+    lhtree = @htree.clone
     10_000.times do |i|
       key = "jdoe#{rand(100_000)}"
       lhtree.delete(key)
@@ -84,10 +100,11 @@ Benchmark.bm do |x|
 
   puts "Deleting 100.000 random documents"
   x.report do
-    lhtree = @htree
+    lhtree = @htree.clone
     100_000.times do |i|
       key = "jdoe#{rand(100_000)}"
       lhtree.delete(key)
     end
   end
+
 end

data/lib/hashtree/version.rb

@@ -1,3 +1,3 @@
 class HashTree
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/hashtree.rb

@@ -74,6 +74,24 @@ class HashTree
     @index.has_key?(key)
   end
 
+  def select(&block)
+    results = {}
+    @index.select do |key, id|
+      leaf = read(id)
+      results[key] = leaf if yield(key, leaf)
+    end
+    return results
+  end
+
+  def each(&block)
+    results = {}
+    @index.each do |key, id|
+      leaf = read(id)
+      results[key] = leaf if yield(key, leaf)
+    end
+    return results
+  end
+
   def branch(key)
     branch_id = get_branch_id(key)
     @branches[branch_id] if branch_id
@@ -90,15 +108,21 @@ class HashTree
   end
 
   # Private API
-  def read(id)
+  def translate_id(id)
     branch_id, leaf_id = id[0..15], id[16..32]
-    @branches[branch_id][leaf_id]
+    return branch_id, leaf_id
+  end
+
+  def read(id)
+    branch_id, leaf_id = translate_id(id)
+    branch = @branches[branch_id]
+    leaf = branch ? branch[leaf_id] : nil
   end
 
   def update(id, value)
-    branch_id, leaf_id = id[0..15], id[16..32]
-    @branches[branch_id][leaf_id] = value
-    return value
+    leaf = read(id)
+    leaf = value if leaf
+    return ( leaf ? value : nil )
   end
 
   def create(key, value)
@@ -112,15 +136,15 @@ class HashTree
     else
       id = Digest::MD5.hexdigest(SecureRandom.uuid)
       @index[key] = id
-      branch_id, leaf_id = id[0..15], id[16..32]
-      @branches[branch_id] = {}
-      @branches[branch_id][leaf_id] = value
+      branch_id, leaf_id = translate_id(id)
+      branch = { leaf_id => value }
+      @branches[branch_id] = branch
     end
     return value
   end
 
   def destroy(id)
-    branch_id, leaf_id = id[0..15], id[16..32]
+    branch_id, leaf_id = translate_id(id)
     branch = @branches[branch_id]
     destroyed_element = branch.delete(leaf_id)
     if branch.size == 0

metadata

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