tabs 0.8.1 → 0.8.2

data/README.md

@@ -276,6 +276,20 @@ enumerable and most existing code utilizing tabs should continue to
 function.  However, please review the docs for more information if you
 encounter issues when upgrading.
 
+### Breaking Changes in v0.8.2
+
+In version 0.8.2 and higher the storage keys for value metrics have been
+changed.  Originally the various pieces (avg, sum, count, etc) were
+stored in a JSON serialized string in a single key.  The intent was that
+this would comprise a poor-mans transaction of sorts.  The downside
+however was a major hit on performance when doing a lot of writes or
+reading stats for a large date range.  In v0.8.2 these component values
+are stored in a real Redis hash and updated atomically when a value is
+recorded.  In future versions this will be changed to use a MULTI
+statement to simulate a transaction.  Value data that was recorded prior
+to v0.8.2 will not be accessible in this or future versions so please
+continue to use v0.8.1 or lower if that is an issue.
+
 ## Contributing
 
 1. Fork it

data/lib/tabs/helpers.rb

@@ -18,5 +18,10 @@ module Tabs
       period_end = Tabs::Resolution.normalize(resolution, period.last.utc)
       (period_start..period_end)
     end
+
+    def to_numeric(v)
+      ((float = Float(v)) && (float % 1.0 == 0) ? float.to_i : float) rescue v
+    end
+
   end
 end

data/lib/tabs/metrics/value.rb

@@ -23,11 +23,13 @@ module Tabs
       def stats(period, resolution)
         timestamps = timestamp_range period, resolution
         keys = timestamps.map do |ts|
-          "stat:value:#{key}:data:#{Tabs::Resolution.serialize(resolution, ts)}"
+          formatted_time = Tabs::Resolution.serialize(resolution, ts)
+          "stat:value:#{key}:data:#{formatted_time}"
         end
 
         values = mget(*keys).map do |v|
-          value = v.nil? ? default_value(0) : JSON.parse(v)
+          value = v.nil? ? default_value(0) : v
+          value = Hash[value.map { |k, i| [k, to_numeric(i)] }]
           value["timestamp"] = timestamps.shift
           value.with_indifferent_access
         end
@@ -42,35 +44,34 @@ module Tabs
       private
 
       def update_values(stat_key, value)
-        hash = get_current_hash(stat_key)
-        increment(hash, value)
-        update_min(hash, value)
-        update_max(hash, value)
-        update_avg(hash)
-        set(stat_key, JSON.generate(hash))
+        count = update_count(stat_key)
+        sum = update_sum(stat_key, value)
+        update_min(stat_key, value)
+        update_max(stat_key, value)
+        update_avg(stat_key, sum, count)
       end
 
-      def get_current_hash(stat_key)
-        hash = get(stat_key)
-        return JSON.parse(hash) if hash
-        default_value
+      def update_count(stat_key)
+        hincrby(stat_key, "count", 1)
       end
 
-      def increment(hash, value)
-        hash["count"] += 1
-        hash["sum"] += value
+      def update_sum(stat_key, value)
+        hincrby(stat_key, "sum", value)
       end
 
-      def update_min(hash, value)
-        hash["min"] = value if hash["min"].nil? || value < hash["min"]
+      def update_min(stat_key, value)
+        min = (hget(stat_key, "min") || 0).to_i
+        hset(stat_key, "min", value) if value < min || min == 0
       end
 
-      def update_max(hash, value)
-        hash["max"] = value if hash["max"].nil? || value > hash["max"]
+      def update_max(stat_key, value)
+        max = (hget(stat_key, "max") || 0).to_i
+        hset(stat_key, "max", value) if value > max || max == 0
       end
 
-      def update_avg(hash)
-        hash["avg"] = hash["sum"] / hash["count"]
+      def update_avg(stat_key, sum, count)
+        avg = sum.to_f / count.to_f
+        hset(stat_key, "avg", avg)
       end
 
       def default_value(nil_value=nil)

data/lib/tabs/storage.rb

@@ -71,5 +71,13 @@ module Tabs
       redis.hkeys("tabs:#{key}")
     end
 
+    def hincrby(key, field, value)
+      redis.hincrby("tabs:#{key}", field, value)
+    end
+
+    def hgetall(key)
+      redis.hgetall("tabs:#{key}")
+    end
+
   end
 end

data/lib/tabs/version.rb

@@ -1,3 +1,3 @@
 module Tabs
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/lib/tabs/metrics/value_spec.rb

@@ -16,7 +16,7 @@ describe Tabs::Metrics::Value do
       metric.record(42)
       time = Time.utc(now.year, now.month, now.day, now.hour)
       stats = metric.stats(((now - 2.hours)..(now + 4.hours)), :hour)
-      expect(stats).to include({ "timestamp"=>time, "count"=>2, "min"=>17, "max"=>42, "sum"=>59, "avg"=>29})
+      expect(stats).to include({ "timestamp"=>time, "count"=>2, "min"=>17, "max"=>42, "sum"=>59, "avg"=>29.5})
     end
 
     it "applys the value to the specified timestamp if one is supplied" do
@@ -58,42 +58,42 @@ describe Tabs::Metrics::Value do
       create_span(:minutes)
       stats = metric.stats(now..(now + 7.minutes), :minute)
       expect(stats).to include({ "timestamp" => (now + 3.minutes), "count"=>1, "min"=>10, "max"=>10, "sum"=>10, "avg"=>10})
-      expect(stats).to include({ "timestamp" => (now + 6.minutes), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17})
+      expect(stats).to include({ "timestamp" => (now + 6.minutes), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17.5})
     end
 
     it "returns the expected results for an hourly metric" do
       create_span(:hours)
       stats = metric.stats(now..(now + 7.hours), :hour)
       expect(stats).to include({ "timestamp" => (now + 3.hours), "count"=>1, "min"=>10, "max"=>10, "sum"=>10, "avg"=>10})
-      expect(stats).to include({ "timestamp" => (now + 6.hours), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17})
+      expect(stats).to include({ "timestamp" => (now + 6.hours), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17.5})
     end
 
     it "returns the expected results for a daily metric" do
       create_span(:days)
       stats = metric.stats(now..(now + 7.days), :day)
       expect(stats).to include({ "timestamp" => (now + 3.days), "count"=>1, "min"=>10, "max"=>10, "sum"=>10, "avg"=>10})
-      expect(stats).to include({ "timestamp" => (now + 6.days), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17})
+      expect(stats).to include({ "timestamp" => (now + 6.days), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17.5})
     end
 
     it "returns the expected results for a weekly metric" do
       create_span(:weeks)
       stats = metric.stats(now..(now + 7.weeks), :week)
       expect(stats).to include({ "timestamp" => (now + 3.weeks).beginning_of_week, "count"=>1, "min"=>10, "max"=>10, "sum"=>10, "avg"=>10})
-      expect(stats).to include({ "timestamp" => (now + 6.weeks).beginning_of_week, "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17})
+      expect(stats).to include({ "timestamp" => (now + 6.weeks).beginning_of_week, "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17.5})
     end
 
     it "returns the expected results for a monthly metric" do
       create_span(:months)
       stats = metric.stats(now..(now + 7.months), :month)
       expect(stats).to include({ "timestamp" => (now + 3.months), "count"=>1, "min"=>10, "max"=>10, "sum"=>10, "avg"=>10})
-      expect(stats).to include({ "timestamp" => (now + 6.months), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17})
+      expect(stats).to include({ "timestamp" => (now + 6.months), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17.5})
     end
 
     it "returns the expected results for a yearly metric" do
       create_span(:years)
       stats = metric.stats(now..(now + 7.years), :year)
       expect(stats).to include({ "timestamp" => (now + 3.years), "count"=>1, "min"=>10, "max"=>10, "sum"=>10, "avg"=>10})
-      expect(stats).to include({ "timestamp" => (now + 6.years), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17})
+      expect(stats).to include({ "timestamp" => (now + 6.years), "count"=>2, "min"=>15, "max"=>20, "sum"=>35, "avg"=>17.5})
     end
   end
 

data/tabs.gemspec

@@ -20,11 +20,25 @@ Gem::Specification.new do |gem|
 
   gem.post_install_message = <<EOS
 Tabs v0.8.0 - BREAKING CHANGES:
-The get_stats method now returns a more robust object instead of just
-an array of hashes.  Existing data will continue to work (no changes were
-made to the underlying Redis keys).  However, application code using
-tabs may need to be changed.  Please review the README after installing
+In version 0.8.0 and higher the get_stats method returns a more robust
+object instead of just an array of hashes.  These stats objects are
+enumerable and most existing code utilizing tabs should continue to
+function.  However, please review the docs for more information if you
+encounter issues when upgrading.  Please review the README if installing
 v0.8.0 or higher.
+
+Tabs v0.8.2 - BREAKING CHANGES:
+In version 0.8.2 and higher the storage keys for value metrics have been
+changed.  Originally the various pieces (avg, sum, count, etc) were
+stored in a JSON serialized string in a single key.  The intent was that
+this would comprise a poor-mans transaction of sorts.  The downside
+however was a major hit on performance when doing a lot of writes or
+reading stats for a large date range.  In v0.8.2 these component values
+are stored in a real Redis hash and updated atomically when a value is
+recorded.  In future versions this will be changed to use a MULTI
+statement to simulate a transaction.  Value data that was recorded prior
+to v0.8.2 will not be accessible in this or future versions so please
+continue to use v0.8.1 or lower if that is an issue.
 EOS
 
   gem.add_dependency "activesupport", ">= 3.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabs
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -186,16 +186,43 @@ homepage: https://github.com/thegrubbsian/tabs
 licenses: []
 post_install_message: ! 'Tabs v0.8.0 - BREAKING CHANGES:
 
-  The get_stats method now returns a more robust object instead of just
+  In version 0.8.0 and higher the get_stats method returns a more robust
 
-  an array of hashes.  Existing data will continue to work (no changes were
+  object instead of just an array of hashes.  These stats objects are
 
-  made to the underlying Redis keys).  However, application code using
+  enumerable and most existing code utilizing tabs should continue to
 
-  tabs may need to be changed.  Please review the README after installing
+  function.  However, please review the docs for more information if you
+
+  encounter issues when upgrading.  Please review the README if installing
 
   v0.8.0 or higher.
 
+
+  Tabs v0.8.2 - BREAKING CHANGES:
+
+  In version 0.8.2 and higher the storage keys for value metrics have been
+
+  changed.  Originally the various pieces (avg, sum, count, etc) were
+
+  stored in a JSON serialized string in a single key.  The intent was that
+
+  this would comprise a poor-mans transaction of sorts.  The downside
+
+  however was a major hit on performance when doing a lot of writes or
+
+  reading stats for a large date range.  In v0.8.2 these component values
+
+  are stored in a real Redis hash and updated atomically when a value is
+
+  recorded.  In future versions this will be changed to use a MULTI
+
+  statement to simulate a transaction.  Value data that was recorded prior
+
+  to v0.8.2 will not be accessible in this or future versions so please
+
+  continue to use v0.8.1 or lower if that is an issue.
+
 '
 rdoc_options: []
 require_paths: