hashtree 0.0.8 → 0.0.9

data/examples/benchmarks.rb

@@ -3,6 +3,11 @@ require 'benchmark'
 require 'hashtree'
 require 'securerandom'
 require 'digest'
+require 'thread'
+require 'monitor'
+
+@lock = Monitor.new
+@cv = @lock.new_cond
 
 def gen_doc(i)
   name = "John Doe #{i}"
@@ -40,20 +45,20 @@ Benchmark.bm do |x|
     end
   end
 
-  puts "Creating a HashTree with 100.000 documents with 4 Threads"
-  x.report do
-    @htree = HashTree.new
-    t = []
-    4.times do
-      t << Thread.new do
-        25_000.times do |i|
-          key, doc = gen_doc(i)
-          @htree[key] = doc
-        end
-      end
-    end
-    t.each(&:join)
-  end
+#  puts "Creating a HashTree with 100.000 documents with 4 Threads"
+#  x.report do
+#    @htree = HashTree.new
+#    t = []
+#    4.times do
+#      t << Thread.new do
+#        25_000.times do |i|
+#          key, doc = gen_doc(i)
+#          @htree[key] = doc
+#        end
+#      end
+#    end
+#    t.each(&:join)
+#  end
 
   puts "Reading 1.000 random documents"
   x.report do
@@ -79,19 +84,19 @@ Benchmark.bm do |x|
     end
   end
 
-  puts "Reading 100.000 random documents with 4 Threads"
-  x.report do
-    t = []
-    4.times do
-      t << Thread.new do
-        25_000.times do |i|
-          key = "jdoe#{rand(100_000)}"
-          @htree[key]
-        end
-      end
-    end
-    t.each(&:join)
-  end
+#  puts "Reading 100.000 random documents with 4 Threads"
+#  x.report do
+#    t = []
+#    4.times do
+#      t << Thread.new do
+#        25_000.times do |i|
+#          key = "jdoe#{rand(100_000)}"
+#          @htree[key]
+#        end
+#      end
+#    end
+#    t.each(&:join)
+#  end
 
   puts "Doing 1 non-indexed query"
   x.report do
@@ -101,67 +106,67 @@ Benchmark.bm do |x|
     end
   end
 
-  puts "Doing 20 non-indexed queries"
+  puts "Doing 10 non-indexed queries"
   x.report do
-    20.times do |i|
+    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 "Doing 20 non-indexed queries with 4 threads"
-  x.report do
-    t = []
-    4.times do
-      t << Thread.new do
-        5.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
-    end
-    t.each(&:join)
-  end
-
-  puts "Doing 40 non-indexed queries and 40 updates with 4 threads"
-  x.report do
-    t = []
-    2.times do
-      t << Thread.new do
-        20.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
-      t << Thread.new do
-        20.times do |i|
-          key = "jdoe#{rand(100_000)}"
-          @htree[key] = {}
-        end
-      end
-    end
-    t.each(&:join)
-  end
-
-  puts "Doing 100.000 random reads and 40 updates with 4 threads"
-  x.report do
-    t = []
-    2.times do
-      t << Thread.new do
-        20.times do |i|
-          5_000.times{ key = "jdoe#{rand(100_000)}"; @htree[key] }
-        end
-      end
-      t << Thread.new do
-        20.times do |i|
-          key = "jdoe#{rand(100_000)}"
-          @htree[key] = {}
-        end
-      end
-    end
-    t.each(&:join)
-  end
-
+#  puts "Doing 20 non-indexed queries with 4 threads"
+#  x.report do
+#    t = []
+#    4.times do
+#      t << Thread.new do
+#        5.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
+#    end
+#    t.each(&:join)
+#  end
+#
+#  puts "Doing 40 non-indexed queries and 40 updates with 4 threads"
+#  x.report do
+#    t = []
+#    2.times do
+#      t << Thread.new do
+#        20.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
+#      t << Thread.new do
+#        20.times do |i|
+#          key = "jdoe#{rand(100_000)}"
+#          @htree[key] = {}
+#        end
+#      end
+#    end
+#    t.each(&:join)
+#  end
+#
+#  puts "Doing 100.000 random reads and 40 updates with 4 threads"
+#  x.report do
+#    t = []
+#    2.times do
+#      t << Thread.new do
+#        20.times do |i|
+#          5_000.times{ key = "jdoe#{rand(100_000)}"; @htree[key] }
+#        end
+#      end
+#      t << Thread.new do
+#        20.times do |i|
+#          key = "jdoe#{rand(100_000)}"
+#          @htree[key] = {}
+#        end
+#      end
+#    end
+#    t.each(&:join)
+#  end
+#
 #  puts "Doing 100 non-indexed queries"
 #  x.report do
 #    100.times do |i|

data/lib/hashtree.rb

@@ -1,14 +1,12 @@
 require 'rubygems'
 require 'digest'
 require 'securerandom'
-require 'thread'
-require 'monitor'
 
 require "hashtree/version"
 
 class HashTree
 
-  attr_reader :index, :branches, :settings
+  attr_reader :index, :branches, :settings, :reading, :writing
 
   def initialize(settings = {})
     @settings = {
@@ -17,10 +15,6 @@ class HashTree
     @root = {}
     @branches = {}
     @free = {}
-    @lock = Mutex.new
-    @rootcv = ConditionVariable.new
-    @branchcv = ConditionVariable.new
-    @freecv = ConditionVariable.new
   end
 
   def [](key)
@@ -29,23 +23,25 @@ class HashTree
   end
 
   def []=(key, value)
-    @lock.synchronize do
-      id = @root[key]
-      id ? update(id, value) : create(key, value)
-    end
+    id = @root[key]
+    id ? update(id, value) : create(key, value)
   end
 
   def delete(key)
-    @lock.synchronize do
-      id = @root[key]
-      if id
-        doc = read(id)
-        destroy(id)
-        @root.delete(key)
-        return doc
-      else
-        nil
-      end
+    id = @root[key]
+    if id
+      doc = read(id)
+      destroy(id)
+      @root.delete(key)
+      return doc
+    else
+      nil
+    end
+  end
+
+  def select(&block)
+    @root.select do |key, id|
+      yield(key, read(id))
     end
   end
 
@@ -62,26 +58,6 @@ class HashTree
     @root.has_key?(key)
   end
 
-  def select(&block)
-    results = {}
-    keys = @root.keys
-    keys.each do |key|
-     leaf = self[key]
-     results[key] = leaf if yield(key, leaf)
-    end
-    return results
-  end
-
-  def each(&block)
-    results = {}
-    keys = @root.keys
-    keys.each do |key|
-     leaf = self[key]
-     yield(key, leaf)
-    end
-    return results
-  end
-
   def branch(key)
     id = @root[key]
     if id
@@ -94,17 +70,12 @@ class HashTree
 
   private
 
-  def translate_id(id)
-    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_id, leaf_id = id[0..31], id[32..64]
     begin
       @branches[branch_id][leaf_id]
     rescue
@@ -122,7 +93,7 @@ class HashTree
       @free.delete(branch_id) if branch.size >= @settings[:max_branch_size]
     else
       id = generate_id
-      branch_id, leaf_id = translate_id(id)
+      branch_id, leaf_id = id[0..31], id[32..64]
       @root[key] = id
       @branches[branch_id] = {}
       @branches[branch_id][leaf_id] = value
@@ -131,7 +102,7 @@ class HashTree
   end
 
   def update(id, value)
-    branch_id, leaf_id = translate_id(id)
+    branch_id, leaf_id = id[0..31], id[32..64]
     begin
       @branches[branch_id][leaf_id] = value
     rescue
@@ -140,7 +111,7 @@ class HashTree
   end
 
   def destroy(id)
-    branch_id, leaf_id = translate_id(id)
+    branch_id, leaf_id = id[0..31], id[32..64]
     value = @branches[branch_id].delete(leaf_id)
     if @branches[branch_id].size == 0
       @branches.delete(branch_id)

data/lib/hashtree/version.rb

@@ -1,3 +1,3 @@
 class HashTree
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashtree
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec