hashtree 0.0.6 → 0.0.7

data/examples/benchmarks.rb

@@ -40,6 +40,21 @@ 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 "Reading 1.000 random documents"
   x.report do
     1_000.times do |i|
@@ -64,6 +79,20 @@ 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 "Doing 1 non-indexed query"
   x.report do
     1.times do |i|
@@ -72,22 +101,36 @@ Benchmark.bm do |x|
     end
   end
 
-  puts "Doing 10 non-indexed queries"
+  puts "Doing 20 non-indexed queries"
   x.report do
-    10.times do |i|
+    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
 
-  puts "Doing 100 non-indexed queries"
+  puts "Doing 20 non-indexed queries with 4 threads"
   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) }
+    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 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.6"
+  VERSION = "0.0.7"
 end

data/lib/hashtree.rb

@@ -13,37 +13,31 @@ class HashTree
     @settings = {
       max_branch_size: 16
     }.merge(settings)
-    @index = {}
+    @root = {}
     @branches = {}
     @free = {}
     @lock = Mutex.new
-    @cv = ConditionVariable.new
+    @rootcv = ConditionVariable.new
+    @branchcv = ConditionVariable.new
+    @freecv = ConditionVariable.new
   end
 
   def [](key)
-    id = @index[key]
-    if id
-      read(id)
-    else
-      nil
-    end
+    id = @root[key]
+    id ? read(id) : nil
   end
 
   def []=(key, value)
-    id = @index[key]
-    if id
-      update(id, value)
-    else
-      create(key, value)
-    end
+    id = @root[key]
+    id ? update(id, value) : create(key, value)
   end
 
   def delete(key)
-    id = @index[key]
+    id = @root[key]
     if id
       doc = read(id)
       destroy(id)
-      @index.delete(key)
+      @root.delete(key)
       return doc
     else
       nil
@@ -51,21 +45,21 @@ class HashTree
   end
 
   def clear
-    @index = {}
+    @root = {}
     @branches = {}
   end
 
   def count
-    @index.count
+    @root.count
   end
 
   def has_key?(key)
-    @index.has_key?(key)
+    @root.has_key?(key)
   end
 
   def select(&block)
     results = {}
-    @index.select do |key, id|
+    @root.select do |key, id|
       leaf = read(id)
       results[key] = leaf if yield(key, leaf)
     end
@@ -74,7 +68,7 @@ class HashTree
 
   def each(&block)
     results = {}
-    @index.each do |key, id|
+    @root.each do |key, id|
       leaf = read(id)
       results[key] = leaf if yield(key, leaf)
     end
@@ -82,7 +76,7 @@ class HashTree
   end
 
   def branch(key)
-    id = @index[key]
+    id = @root[key]
     if id
       branch_id = id[0..31]
       @branches[branch_id]
@@ -102,24 +96,6 @@ class HashTree
     Digest::SHA256.hexdigest(SecureRandom.uuid)
   end
 
-  def create(key, value)
-    free_branch_id = @free.keys.sample
-    if free_branch_id
-      leaf_id = generate_id[0..31]
-      id = free_branch_id + leaf_id
-      @index[key] = id
-      @branches[free_branch_id][leaf_id] = value
-      @free.delete(branch_id) if branch.size >= @settings[:max_branch_size]
-    else
-      id = generate_id
-      branch_id, leaf_id = translate_id(id)
-      @index[key] = id
-      @branches[branch_id] = {}
-      @branches[branch_id][leaf_id] = value
-    end
-    return value
-  end
-
   def read(id)
     branch_id, leaf_id = translate_id(id)
     begin
@@ -129,25 +105,49 @@ class HashTree
     end
   end
 
+  def create(key, value)
+    @lock.synchronize do
+      free_branch_id = @free.keys.sample
+      if free_branch_id
+        leaf_id = generate_id[0..31]
+        id = free_branch_id + leaf_id
+        @root[key] = id
+        @branches[free_branch_id][leaf_id] = value
+        @free.delete(branch_id) if branch.size >= @settings[:max_branch_size]
+      else
+        id = generate_id
+        branch_id, leaf_id = translate_id(id)
+        @root[key] = id
+        @branches[branch_id] = {}
+        @branches[branch_id][leaf_id] = value
+      end
+      return value
+    end
+  end
+
   def update(id, value)
-    branch_id, leaf_id = translate_id(id)
-    begin
-      @branches[branch_id][leaf_id] = value
-    rescue
-      nil
+    @lock.synchronize do
+      branch_id, leaf_id = translate_id(id)
+      begin
+        @branches[branch_id][leaf_id] = value
+      rescue
+        nil
+      end
     end
   end
 
   def destroy(id)
-    branch_id, leaf_id = translate_id(id)
-    value = @branches[branch_id].delete(leaf_id)
-    if @branches[branch_id].size == 0
-      @branches.delete(branch_id)
-      @free.delete(branch_id)
-    elsif branch.size > 0 and branch.size < @settings[:max_branch_size]
-      @free[branch_id] = nil
+    @lock.synchronize do
+      branch_id, leaf_id = translate_id(id)
+      value = @branches[branch_id].delete(leaf_id)
+      if @branches[branch_id].size == 0
+        @branches.delete(branch_id)
+        @free.delete(branch_id)
+      elsif branch.size > 0 and branch.size < @settings[:max_branch_size]
+        @free[branch_id] = nil
+      end
+      return value
     end
-    return value
   end
 
 end

metadata

@@ -1,64 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: hashtree
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
+  prerelease:
 platform: ruby
 authors:
 - Marcelo Wiermann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 description: HashTree that has a Hash-like interface and stores data into blocks
 email:
 - marcelo.wiermann@gmail.com
@@ -79,27 +79,28 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: HashTree
 test_files:
 - spec/spec_helper.rb
+...