lru_redux 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78eae8fc324be527cb810fa0346fc009f4bee816
-  data.tar.gz: dcc9a4af9681636d338ebdeca2e2eef99152dd06
+  metadata.gz: af4d80362e99b12a12ab32c6a8274f216195d666
+  data.tar.gz: 1d68495be201eadc3c851b4efdfb6efb7128e710
 SHA512:
-  metadata.gz: 8c55ef7737644cdc0bdc25abbb3d4756eeef996e179ec31871f22925abd370c43e6070b513cf6bbc82afb31782430534111a32f2fab31a576d0892b8fef87241
-  data.tar.gz: f11d972cd374a60163cf0430d6727755bb652a490fec1a0b36de96045faf35c5b7fab45ef8598f3a3223253141f851135e86cb23c741a6eee64bff854172f1b4
+  metadata.gz: a836ef1195b172d1d3bf9f4091e8fbfd5802546ef45504f75d0db2842d1943a83df9df83b0138eb199deea1e52449bb7ef2613a8bfb386b5e81c8d42df7a7d5a
+  data.tar.gz: 25cce1c929ad8eda1975d3af356b9705f114042f85d14a5b4aa7a128be89f12dc3cfe6b8a93837a692a9f7932efd6ff753592e216972760c1e20b61e4736b557

data/README.md

@@ -45,19 +45,19 @@ see: benchmark directory
 ```
 sam@ubuntu:~/Source/lru_redux/bench$ ruby ./bench.rb
 Rehearsal ---------------------------------------------------------
-thread safe lru        27.940000   0.020000  27.960000 ( 28.000938)
-lru gem                 2.300000   0.000000   2.300000 (  2.305732)
-lru_cache gem           1.960000   0.010000   1.970000 (  1.975683)
-lru_redux gem           1.710000   0.000000   1.710000 (  1.704134)
-lru_redux thread safe   2.830000   0.000000   2.830000 (  2.837608)
------------------------------------------------ total: 36.770000sec
+thread safe lru        27.640000   0.370000  28.010000 ( 28.049021)
+lru gem                 2.460000   0.000000   2.460000 (  2.454292)
+lru_cache gem           2.170000   0.000000   2.170000 (  2.174306)
+lru_redux gem           1.530000   0.020000   1.550000 (  1.552481)
+lru_redux thread safe   2.610000   0.070000   2.680000 (  2.684895)
+----------------------------------------------- total: 36.870000sec
 
                             user     system      total        real
-thread safe lru        27.740000   0.000000  27.740000 ( 27.756163)
-lru gem                 2.250000   0.000000   2.250000 (  2.252772)
-lru_cache gem           1.960000   0.000000   1.960000 (  1.963679)
-lru_redux gem           1.710000   0.000000   1.710000 (  1.712147)
-lru_redux thread safe   2.750000   0.000000   2.750000 (  2.752526)
+thread safe lru        28.170000   0.280000  28.450000 ( 28.465008)
+lru gem                 2.330000   0.000000   2.330000 (  2.328316)
+lru_cache gem           2.140000   0.000000   2.140000 (  2.142749)
+lru_redux gem           1.640000   0.000000   1.640000 (  1.643732)
+lru_redux thread safe   2.590000   0.000000   2.590000 (  2.600422)
 
 ```
 
@@ -72,6 +72,11 @@ lru_redux thread safe   2.750000   0.000000   2.750000 (  2.752526)
 
 ## Changlog
 
-###verson 0.0.2 - 23-April-2013
+###version 0.0.2 - 23-April-2013
 
 - Added .clear method
+
+###version 0.0.3 - 23-April-2013
+
+- Added .max_size= so you can resize caches on demand
+- Added implemented using arrays for extra perf

data/lib/lru_redux/cache.rb

@@ -2,6 +2,8 @@ class LruRedux::Cache
 
   # for high efficiency nodes in double linked list are stored in arrays
   # [prev,key,val,next]
+  #
+  # This makes this much more annoying to code, but gives us a 5-10% edge
 
   def initialize(max_size)
     @max_size = max_size
@@ -10,11 +12,17 @@ class LruRedux::Cache
     @tail = nil
   end
 
+  def max_size=(size)
+    @max_size = size
+    while pop_tail
+    end
+  end
+
   def [](key)
     node = @data[key]
     if node
       move_to_head(node)
-      node.value
+      node[2]
     end
   end
 
@@ -22,7 +30,7 @@ class LruRedux::Cache
     node = @data[key]
     if node
       move_to_head(node)
-      node.value = val
+      node[2] = val
     else
       pop_tail
       @data[key] = add_to_head(key,val)
@@ -33,8 +41,8 @@ class LruRedux::Cache
   def each
     if n = @head
       while n
-        yield [n.key, n.value]
-        n = n.prev
+        yield [n[1], n[2]]
+        n = n[0]
       end
     end
   end
@@ -54,11 +62,11 @@ class LruRedux::Cache
     node = @data[k]
     if node
       @data.delete(k)
-      prev = node.prev
-      nex = node.next
+      prev = node[0]
+      nex = node[3]
 
-      prev.next = nex if prev
-      nex.prev = prev if nex
+      prev[3] = nex if prev
+      nex[0] = prev if nex
     end
   end
 
@@ -74,60 +82,53 @@ class LruRedux::Cache
   # for cache validation only, ensures all is sound
   def valid?
     expected = {}
+
+    count = 0
     self.each_unsafe do |k,v|
-      expected[k] = v
+      return false if @data[k][2] != v
+      count += 1
     end
-    expected == @data
+    count == @data.count
   end
 
   protected
 
   def add_to_head(key,val)
     if @head.nil?
-      @tail = @head = Node.new(key,val,nil,nil)
+      @tail = @head = [nil,key,val,nil]
     else
-      node = Node.new(key,val,@head,nil)
-      @head = @head.next = node
+      node = [@head,key,val,nil]
+      @head = @head[3] = node
     end
   end
 
   def move_to_head(node)
-    return unless @head && node != @head
+    return unless @head && node[1] != @head[1]
 
-    prev = node.prev
-    nex = node.next
+    prev = node[0]
+    nex = node[3]
 
     if prev
-      prev.next = nex
+      prev[3] = nex
     else
       @tail = nex
     end
 
     if nex
-      nex.prev = prev
+      nex[0] = prev
     end
 
-    @head.next = node
-    node.prev = @head
+    @head[3] = node
+    node[0] = @head
     @head = node
   end
 
   def pop_tail
-    if @data.length == @max_size
-      @data.delete(@tail.key)
-      @tail = @tail.next
-      @tail.prev = nil
+    if @data.length >= @max_size
+      @data.delete(@tail[1])
+      @tail = @tail[3]
+      @tail[0] = nil
     end
   end
 
-
-  class Node
-    attr_accessor :key, :value, :next, :prev
-    def initialize(key,value,prev,nex)
-      self.key = key
-      self.value = value
-      self.prev = prev
-      self.next = nex
-    end
-  end
 end

data/lib/lru_redux/thread_safe_cache.rb

@@ -15,6 +15,6 @@ class LruRedux::ThreadSafeCache < LruRedux::Cache
     end
   end
 
-  synchronize :[], :[]=, :each, :to_a, :delete, :count, :valid?
+  synchronize :[], :[]=, :each, :to_a, :delete, :count, :valid?, :max_size
 
 end

data/lib/lru_redux/version.rb

@@ -1,3 +1,3 @@
 module LruRedux
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/cache_test.rb

@@ -7,6 +7,10 @@ class CacheTest < MiniTest::Unit::TestCase
     @c = LruRedux::Cache.new(3)
   end
 
+  def teardown
+    assert_equal true, @c.valid?
+  end
+
   def test_drops_old
     @c[:a] = 1
     @c[:b] = 2
@@ -56,4 +60,21 @@ class CacheTest < MiniTest::Unit::TestCase
     @c.clear
     assert_equal [], @c.to_a
   end
+
+  def test_grow
+    @c[:a] = 1
+    @c[:b] = 2
+    @c[:c] = 3
+    @c.max_size = 4
+    @c[:d] = 4
+    assert_equal [[:d,4],[:c,3],[:b,2],[:a,1]], @c.to_a
+  end
+
+  def test_shrink
+    @c[:a] = 1
+    @c[:b] = 2
+    @c[:c] = 3
+    @c.max_size = 2
+    assert_equal [[:c,3],[:b,2]], @c.to_a
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lru_redux
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sam Saffron
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: An efficient implementation of an lru cache