nightfury 0.6.3 → 0.7.0

data/lib/nightfury/metric/avg_time_series.rb

@@ -2,20 +2,26 @@ module Nightfury
   module Metric
     class AvgTimeSeries < TimeSeries
 
-      def default_meta
-        {'count' => 0.0, 'total' => 0.0}
-      end
-
       protected
 
-      def before_set(value)
-        updated_count = meta['count'].to_f + 1.0
-        updated_total = meta['total'].to_f + value
+      def before_set(value, time)
+        step_time = get_step_time(time).to_i
+        data_point, meta_value = get_exact(step_time, true)
+        current_count = current_total = 0.0
+        unless data_point.nil?
+          current_count = meta_value[:current_count].to_f
+          current_total = meta_value[:current_total].to_f
+        end
+        updated_count = current_count + 1.0
+        updated_total = current_total + value
         result = updated_total / updated_count
-        meta['count'] = updated_count
-        meta['total'] = updated_total
-        save_meta
-        result
+        result = "#{updated_count},#{updated_total},#{result}"
+        [result, time]
+      end
+
+      def decode_data_point(data_point)
+        current_count, current_total, data = data_point[0].split(',')
+        [data_point[1], data, {current_count: current_count, current_total: current_total}]
       end
     end
   end

data/lib/nightfury/metric/time_series.rb

@@ -12,7 +12,7 @@ module Nightfury
       end
 
       def set(value, time=Time.now, options={})
-        value = before_set(value) unless options[:skip_before_set]
+        value, time = before_set(value, time) unless options[:skip_before_set]
         # make sure the time_series is initialized.
         # It will not if the metric is removed and 
         # set is called on the smae object
@@ -20,7 +20,7 @@ module Nightfury
         add_value_to_timeline(value, time)
       end
       
-      def get(timestamp=nil)
+      def get(timestamp=nil, get_meta=false)
         return nil unless redis.exists(redis_key)
         data_point = ''
         if timestamp
@@ -32,11 +32,21 @@ module Nightfury
           data_point = data_point.each_slice(2).map {|pair| pair }.last
         end
       
-        return nil if data_point.nil?
-        return nil if data_point[1] == "0"
+        return get_meta ? [nil, {}] : nil if data_point.nil?
+        return get_meta ? [nil, {}] : nil if data_point[1] == "0"
 
-        time, data = decode_data_point(data_point)
-        {time => data}
+        time, data, meta_value = decode_data_point(data_point)
+        get_meta ? [{time => data}, meta_value] : {time => data}
+      end
+
+      def get_exact(timestamp, get_meta=false)
+        return nil unless redis.exists(redis_key)
+        timestamp = get_step_time(timestamp).to_i
+        data_point = redis.zrangebyscore(redis_key, timestamp, timestamp, withscores: true)
+        data_point = data_point.each_slice(2).map {|pair| pair }.last
+        return get_meta ? [nil, {}] : nil if data_point.nil?
+        time, data, meta_value = decode_data_point(data_point)
+        result = get_meta ? [{time => data}, meta_value] : {time => data}
       end
 
       def get_range(start_time, end_time)
@@ -72,8 +82,26 @@ module Nightfury
 
       protected
 
-      def before_set(value)
-        value
+      def before_set(value, time)
+        [value, time]
+      end
+
+      def decode_data_point(data_point)
+        [data_point[1], data_point[0], {}]
+      end
+
+      def round_time(time, seconds=60)
+        self.class.round_time(time, seconds)
+      end
+
+      def get_step_time(time)
+        case step
+          when :minute then round_time(time, 60)
+          when :hour then round_time(time, 1.hour)
+          when :day then round_time(time, 1.day)
+          when :week then round_time(time, 1.week)
+          when :month then round_time(time, Time.days_in_month(time.month, time.year))
+        end
       end
 
       private
@@ -91,11 +119,7 @@ module Nightfury
           result[time] = data
         end
         result
-      end
-
-      def decode_data_point(data_point)
-        [data_point[1], data_point[0]]
-      end
+      end 
 
       def save_meta
         redis.zremrangebyscore redis_key, 0, 0
@@ -106,19 +130,6 @@ module Nightfury
         redis.zadd redis_key, 0, default_meta.to_json
       end
 
-      def round_time(time, seconds=60)
-        self.class.round_time(time, seconds)
-      end
-
-      def get_step_time(time)
-        case step
-          when :minute then round_time(time, 60)
-          when :hour then round_time(time, 1.hour)
-          when :day then round_time(time, 1.day)
-          when :week then round_time(time, 1.week)
-          when :month then round_time(time, Time.days_in_month(time.month, time.year))
-        end
-      end
     end
   end
 end

data/lib/nightfury/version.rb

@@ -1,3 +1,3 @@
 module Nightfury
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

data/spec/nightfury/metric/avg_time_series_spec.rb

@@ -1,24 +1,22 @@
 require 'spec_helper'
 
 describe Nightfury::Metric::AvgTimeSeries do
-  it "should have the right default meta" do
+  it "should calculate avg in buckets defined by step" do
     avg_metric = Nightfury::Metric::AvgTimeSeries.new(:avg)
-    avg_metric.default_meta.should == { 'count' => 0.0, 'total' => 0.0 }
-  end
+    first_bucket_time = Time.now
+    next_bucket_time = first_bucket_time + 61 # step is 60 seconds by default
+  
+    # Add to first bucket
+    avg_metric.set(3, first_bucket_time)
+    avg_metric.set(2, first_bucket_time)
+    avg_metric.set(4, first_bucket_time)
+    avg_metric.set(11, first_bucket_time)
 
-  it "should calculate avg before saving" do
-    avg_metric = Nightfury::Metric::AvgTimeSeries.new(:avg)
-    avg_metric.set(3)
-    avg_metric.set(2)
-    avg_metric.set(4)
-    avg_metric.set(11)
-    avg_metric.get.values.first.should == "5.0"
-  end
+    # Add to next bucket
+    avg_metric.set(3, next_bucket_time)
+    avg_metric.set(2, next_bucket_time)
 
-  it "should update meta update count" do
-    avg_metric = Nightfury::Metric::AvgTimeSeries.new(:avg)
-    avg_metric.set(1)
-    avg_metric.set(2)
-    avg_metric.meta['count'].should == 2
+    avg_metric.get(first_bucket_time).values.first.should == "5.0"
+    avg_metric.get(next_bucket_time).values.first.should == "2.5"
   end
 end

data/spec/nightfury/metric/time_series_spec.rb

@@ -27,6 +27,15 @@ describe Nightfury::Metric::TimeSeries do
         ts_metric.get.should be_nil
       end
 
+      context "with meta" do
+        it "should also return the meta part of the data point" do
+          ts_metric = Nightfury::Metric::TimeSeries.new(:time)
+          time_now = Time.now
+          ts_metric.set(1, time_now)
+          ts_metric.get(time_now, true)[1].should == {}
+        end
+      end
+
       context "without timestamp" do
         it "should get the most recent data point" do
           ts_metric = Nightfury::Metric::TimeSeries.new(:time)
@@ -72,6 +81,39 @@ describe Nightfury::Metric::TimeSeries do
       end
     end
 
+    describe "#get_exact" do
+      it "should get the data_point at the timestamp" do
+        ts_metric = Nightfury::Metric::TimeSeries.new(:time)
+        time = Time.now
+        ts_metric.set(1, time)
+        result = ts_metric.get_exact(time)
+        result.values.first.should == '1'
+      end
+
+      it "should return data point's meta if specified" do
+        ts_metric = Nightfury::Metric::TimeSeries.new(:time)
+        time = Time.now
+        ts_metric.set(1, time)
+        result = ts_metric.get_exact(time, true)
+        result[1].should == {}
+      end
+
+      it "should return nil if there is no data_point at the timestamp" do
+        ts_metric = Nightfury::Metric::TimeSeries.new(:time)
+        time = Time.now
+        ts_metric.set(1, time)
+        result = ts_metric.get_exact(time+61)
+        result.should be_nil
+      end
+
+      it "should retrun nil if metric key on redis is empty" do
+        ts_metric = Nightfury::Metric::TimeSeries.new(:time)
+        # delete redis key
+        ts_metric.redis.del ts_metric.redis_key
+        ts_metric.get_exact(Time.now).should be_nil
+      end      
+    end
+
     describe "#get_range" do
       it "should retrun nil if metric key on redis is empty" do
         ts_metric = Nightfury::Metric::TimeSeries.new(:time)
@@ -136,8 +178,9 @@ describe Nightfury::Metric::TimeSeries do
     describe "before set" do
       it "should call before_set, before adding the value to the timeline" do
         ts_metric = Nightfury::Metric::TimeSeries.new(:avg_time)
-        flexmock(ts_metric).should_receive(:before_set).with(1).once
-        ts_metric.set(1)
+        time = Time.now
+        flexmock(ts_metric).should_receive(:before_set).with(1, time).once
+        ts_metric.set(1, time)
       end
     
       it "should not call before_set, before adding the value to the timeline if optiond ':skip_before_set' is provided" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nightfury
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors: