radix_tree 1.1.0.dev → 1.1.0

data/README

@@ -16,6 +16,12 @@ to avoid DoS via Algorithmic Complexity Attacks.
 See comments in lib/radix_tree.rb
 
 
+== History
+
+ * 1.0.0 - Initial release.
+ * 1.1.0 - 1.8 support, speed/memory perf improvement.
+
+
 == Author
 
 Name:: Hiroshi Nakamura

data/lib/radix_tree.rb

@@ -90,11 +90,11 @@ class RadixTree
       collect { |k, v| v }
     end
 
-    def store(key, value)
+    def store(key, head, value)
       if same_key?(key)
         @value = value
       else
-        pos = head_match_length(key)
+        pos = head_match_size(key, head)
         if pos == @index
           push(key, value)
         else
@@ -108,31 +108,30 @@ class RadixTree
       end
     end
 
-    def retrieve(key)
+    def retrieve(key, head)
       if same_key?(key)
         @value
-      elsif !@children
-        UNDEFINED
       else
-        pos = head_match_length(key)
-        if child = find_child(key[pos])
-          child.retrieve(key)
-        else
-          UNDEFINED
+        if @children
+          pos = head_match_size(key, head)
+          if child = find_child(key[pos])
+            return child.retrieve(key, @index)
+          end
         end
+        UNDEFINED
       end
     end
 
-    def delete(key)
+    def delete(key, head)
       if same_key?(key)
         value, @value = @value, UNDEFINED
         value
       elsif !@children
         nil
       else
-        pos = head_match_length(key)
+        pos = head_match_size(key, head)
         if child = find_child(key[pos])
-          value = child.delete(key)
+          value = child.delete(key, @index)
           if value and child.undefined?
             reap(child)
           end
@@ -172,7 +171,7 @@ class RadixTree
 
     def push(key, value)
       if @children && child = find_child(key[@index])
-        child.store(key, value)
+        child.store(key, @index, value)
       else
         add_child(Node.new(key, key.size, value))
       end
@@ -194,8 +193,8 @@ class RadixTree
       end
     end
 
-    def head_match_length(check)
-      0.upto(@index) do |idx|
+    def head_match_size(check, head)
+      head.upto(@index) do |idx|
         if check[idx] != @key[idx]
           return idx
         end
@@ -290,17 +289,17 @@ class RadixTree
   end
 
   def []=(key, value)
-    @root.store(key.to_s, value)
+    @root.store(key.to_s, 0, value)
   end
   alias store []=
 
   def key?(key)
-    @root.retrieve(key.to_s) != Node::UNDEFINED
+    @root.retrieve(key.to_s, 0) != Node::UNDEFINED
   end
   alias has_key? key?
 
   def [](key)
-    value = @root.retrieve(key.to_s)
+    value = @root.retrieve(key.to_s, 0)
     if value == Node::UNDEFINED
       if @default != DEFAULT
         @default
@@ -315,7 +314,7 @@ class RadixTree
   end
 
   def delete(key)
-    @root.delete(key.to_s)
+    @root.delete(key.to_s, 0)
   end
 
   def dump_tree(io = '')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: radix_tree
 version: !ruby/object:Gem::Version
-  version: 1.1.0.dev
-  prerelease: 6
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Hiroshi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org
@@ -33,12 +33,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2336052632168712106
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 2336052632168712106
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11