hashtree 0.0.7 → 0.0.8

data/examples/benchmarks.rb

@@ -123,6 +123,45 @@ Benchmark.bm do |x|
     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/version.rb

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

data/lib/hashtree.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'digest'
 require 'securerandom'
 require 'thread'
+require 'monitor'
 
 require "hashtree/version"
 
@@ -28,19 +29,23 @@ class HashTree
   end
 
   def []=(key, value)
-    id = @root[key]
-    id ? update(id, value) : create(key, value)
+    @lock.synchronize do
+      id = @root[key]
+      id ? update(id, value) : create(key, value)
+    end
   end
 
   def delete(key)
-    id = @root[key]
-    if id
-      doc = read(id)
-      destroy(id)
-      @root.delete(key)
-      return doc
-    else
-      nil
+    @lock.synchronize do
+      id = @root[key]
+      if id
+        doc = read(id)
+        destroy(id)
+        @root.delete(key)
+        return doc
+      else
+        nil
+      end
     end
   end
 
@@ -59,18 +64,20 @@ class HashTree
 
   def select(&block)
     results = {}
-    @root.select do |key, id|
-      leaf = read(id)
-      results[key] = leaf if yield(key, leaf)
+    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 = {}
-    @root.each do |key, id|
-      leaf = read(id)
-      results[key] = leaf if yield(key, leaf)
+    keys = @root.keys
+    keys.each do |key|
+     leaf = self[key]
+     yield(key, leaf)
     end
     return results
   end
@@ -106,48 +113,42 @@ class HashTree
   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
+    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
 
   def update(id, value)
-    @lock.synchronize do
-      branch_id, leaf_id = translate_id(id)
-      begin
-        @branches[branch_id][leaf_id] = value
-      rescue
-        nil
-      end
+    branch_id, leaf_id = translate_id(id)
+    begin
+      @branches[branch_id][leaf_id] = value
+    rescue
+      nil
     end
   end
 
   def destroy(id)
-    @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
+    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
 
 end

metadata

@@ -1,64 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: hashtree
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease:
+  version: 0.0.8
+  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
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     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,28 +79,27 @@ 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'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   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
-...