rhcf-timeseries 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70fa3c86609812b9cc3d5b441d0dad9300b7276
-  data.tar.gz: 4272404e49b127c630dc06f5abb68f5c33877333
+  metadata.gz: 9cef009b581b2e4025db5234bc0ba24cb970503d
+  data.tar.gz: 5168fbcf5b232d4bc3e2687be9b57e4efd6a1cca
 SHA512:
-  metadata.gz: e7f0b61fb3335635e038ff7d7382520eefddd80f2c53a780ae055ff44df6d434775f3f467dd26c73ec447caa7c8967fe2fa310d870d1a3f3d46f873526b0b4cf
-  data.tar.gz: 457437977599b1546fdcb943d4a4a0706a000cad62b8f3580fdda9bdacb6aea86acce30ea1611a6e2afc6ab12e323fa225e896a80143f9a2039e4d213574b162
+  metadata.gz: 2954a59ea1374b1308483c17480463ce3c3e9fc8c34881d9da4aae2728101f50ae44a666b41c0fe424c9475169fb872cf318cad1a771b2c72698fede5943141d
+  data.tar.gz: 6efdacb63cbc3f5f75a9b6568af314ba86f71b0555037daa36f673032de7480b023d3de7a50a1208911c43c9e510e63944d60ee2a281858fe8cd6f939bd7e91a

data/lib/rhcf/timeseries/redis.rb

@@ -105,10 +105,14 @@ module Rhcf
       end
 
       def better_resolution
-        span = @to - @from
+        span = @to.to_time - @from.to_time
+
         resolutions = @series.resolutions.sort_by{|h| h[:span]}.reverse
-        better = resolutions.find{|r| r[:span] < span / 5} || resolutions.last
-        return better
+        5.downto(1) do |div|
+          res = resolutions.find{|r| r[:span] < span / div }
+          return res if res
+        end
+        return nil
       end
     end
 
@@ -152,12 +156,12 @@ module Rhcf
         @connection_to_use || fail("No redis connection given")
       end
 
-      def store(subject, event_point_hash, moment = Time.now)
+      def store(subject, event_point_hash, moment = Time.now, descend_subject = true, descend_event = true)
         resolutions = resolutions_of(moment)
 
-        descend(subject) do |subject_path|
+        descend(subject, descend_subject) do |subject_path|
           event_point_hash.each do |event, point_value|
-            descend(event) do |event_path|
+            descend(event, descend_event) do |event_path|
               resolutions.each do |res|
                 resolution_name, resolution_value = *res
                 store_point_value(subject_path, event_path, resolution_name, resolution_value, point_value)
@@ -167,8 +171,6 @@ module Rhcf
         end
       end
 
-
-
       def resolutions_of(moment)
         @resolution_ids.collect do |res_id|
           [res_id, resolution_value_at(moment, res_id)]
@@ -192,10 +194,10 @@ module Rhcf
         end
       end
 
-      def descend(path, &block)
+      def descend(path, do_descend = true , &block)
         return if path.empty? or path == "."
         block.call(path)
-        descend(File.dirname(path), &block)
+        descend(File.dirname(path), do_descend, &block) if do_descend
       end
 
       def store_point_event( resolution_name, resolution_value, subject_path, event_path)
@@ -252,13 +254,11 @@ module Rhcf
         fail ArgumentError, "Invalid resolution name #{id} for this time series" if res.nil?
         res.merge(:id => id)
       end
+
       def resolutions
-        @resolution_ids.collect do |id|
-          resolution(id)
-        end
+        @_resolutions ||= @resolution_ids.map { |id| resolution(id) }
       end
 
-
       def events_for_subject_on(subject, point, resolution_id)
         key = [@prefix, 'event_set', resolution_id, point, subject].join(NAMESPACE_SEPARATOR)
         logger.debug("EVENTSET SMEMBERS #{key}")

data/lib/rhcf/timeseries/version.rb

@@ -1,5 +1,5 @@
 module Rhcf
   module Timeseries
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/spec/lib/rhcf/timeseries/redis_spec.rb

@@ -14,36 +14,52 @@ describe Rhcf::Timeseries::Redis do
     subject.flush!
   end
 
-  it "should be fast to store and read" do
-    subject.flush!
-    total = 0
-    start_time = Time.now
-
-    bench = Benchmark.measure {
-      profile = StackProf.run(mode: :cpu, out: '/tmp/stackprof-cpu-store.dump') do
-        10000.times do
-          total +=1
-          subject.store("a", {"b" => 1} ) #, time)
+  describe 'descending' do
+    it "is be fast to store and read" do
+      total = 0
+      start_time = Time.now
+
+      bench = Benchmark.measure {
+        StackProf.run(mode: :cpu, out: p('/tmp/stackprof-cpu-store-descend.dump')) do
+          1000.times do
+            total +=1
+            subject.store("a/b", {"e/f" => 1} ) #, time)
+          end
         end
-      end
-    }
+      }
 
 
-    #pp    subject.find("a", start_time - 11100, Time.now + 11100).points(:second)
-    qbench = Benchmark.measure {
-      subject.find("a", start_time - 11100, Time.now + 11100).total['b'].to_i.should == total
-    }
+      Benchmark.measure {
+        expect(subject.find("a", start_time - 11100, Time.now + 11100).total['e'].to_i).to eq(total)
+      }
 
-    qbench_year = Benchmark.measure {
-      subject.find("a", start_time - 100000, Time.now + 100000).total(:year)['b'].to_i.should == total
-    }
+      Benchmark.measure {
+        expect(subject.find("a", start_time - 100000, Time.now + 100000).total(:year)['e/f'].to_i).to eq(total)
+      }
 
-    puts "Write speed %d points/seg | points:%d, duration:%0.3fs | query_time %0.3fs" % [speed = (1.0 * total / (bench.total + 0.00000001)), total, bench.total, qbench.total]
-    speed.should > 400
+      puts "Descend write speed %d points/seg | points:%d, duration:%0.3fs" % [speed = (1.0 * total / (bench.total + 0.00000001)), total, bench.total]
+      expect(speed).to be > 100
+    end
   end
 
+  describe 'not descending' do
+    it "is be fast to store and read" do
+      total = 0
+      bench = Benchmark.measure {
+        StackProf.run(mode: :cpu, out: p('/tmp/stackprof-cpu-store-nodescend.dump')) do
+          10000.times do
+            total +=1
+            subject.store("a/b/c/d", {"e/f/g/h" => 1}  , Time.now, false, false)
+          end
+        end
+      }
+
+      puts "No descend write speed %d points/seg | points:%d, duration:%0.3fs" % [new_speed = (1.0 * total / (bench.total + 0.00000001)), total, bench.total]
+      expect(new_speed).to be > 300
+    end
+  end
 
-  it "should be similar to redistat" do
+  it "is similar to redistat" do
     start_time = Time.parse("2000-01-01 00:00:00")
     Timecop.travel(start_time)
     subject.store("views/product/15", {"web/firefox/3" => 1})
@@ -68,7 +84,7 @@ describe Rhcf::Timeseries::Redis do
     Timecop.travel(15.minutes) #00:00:30
     subject.store("views/product/11", {"web/chrome/11"=> 2})
 
-    subject.find("views/product", start_time, start_time + 55.minutes).total(:ever).should == {
+    expect(subject.find("views/product", start_time, start_time + 55.minutes).total(:ever)).to  eq({
       "web" => 16.0,
       "web/chrome" => 6.0,
       "web/chrome/11" => 6.0,
@@ -77,9 +93,9 @@ describe Rhcf::Timeseries::Redis do
       "web/ie" => 7.0,
       "web/ie/5" => 2.0,
       "web/ie/6" => 5.0
-    }
+    })
 
-    subject.find("views/product", start_time, start_time + 55.minutes).total(:year).should == {
+    expect(subject.find("views/product", start_time, start_time + 55.minutes).total(:year)).to eq({
       "web" => 16.0,
       "web/chrome" => 6.0,
       "web/chrome/11" => 6.0,
@@ -88,59 +104,60 @@ describe Rhcf::Timeseries::Redis do
       "web/ie" => 7.0,
       "web/ie/5" => 2.0,
       "web/ie/6" => 5.0
-    }
+    })
 
-    subject.find("views/product", start_time, start_time + 55.minutes).total.should == {
+    expect( subject.find("views/product", start_time, start_time + 55.minutes).total ).to eq({
       'web' => 8,
       'web/firefox' => 3,
       'web/firefox/3' => 3,
       'web/ie' => 5,
       'web/ie/6' => 5,
-    }
+    })
 
-    subject.find("views/product/15", start_time, start_time + 55.minutes).points(:minute).should == [
+    expect(subject.find("views/product/15", start_time, start_time + 55.minutes).points(:minute)).to eq([
       {:moment=>"2000-01-01T00:00", :values=>{"web/firefox"=>1, "web/firefox/3"=>1, "web"=>1}},
       {:moment=>"2000-01-01T00:30", :values=>{"web"=>3, "web/ie/6"=>3, "web/ie"=>3}},
       {:moment=>"2000-01-01T00:45", :values=>{"web"=>2, "web/ie/6"=>2, "web/ie"=>2}}
-    ]
+    ])
 
-    subject.find("views/product/13", start_time, start_time + 55.minutes).points(:minute).should == [
+    expect(subject.find("views/product/13", start_time, start_time + 55.minutes).points(:minute)).to eq([
       {:moment=>"2000-01-01T00:15", :values=>{"web/firefox"=>2, "web/firefox/3"=>2, "web"=>2}},
-    ]
-
+    ])
 
-
-
-    subject.find("views/product", start_time, start_time + 55.minutes).points(:minute).should == [
+    expect(subject.find("views/product", start_time, start_time + 55.minutes).points(:minute)).to eq([
       {:moment=>"2000-01-01T00:00", :values=>{"web/firefox"=>1, "web/firefox/3"=>1, "web"=>1}},
       {:moment=>"2000-01-01T00:15", :values=>{"web/firefox"=>2, "web/firefox/3"=>2, "web"=>2}},
       {:moment=>"2000-01-01T00:30", :values=>{"web"=>3, "web/ie/6"=>3, "web/ie"=>3}},
       {:moment=>"2000-01-01T00:45", :values=>{"web"=>2, "web/ie/6"=>2, "web/ie"=>2}}
-    ]
+    ])
 
-    subject.find("views", start_time, start_time + 55.minutes).points(:minute).should == [
+    expect(subject.find("views", start_time, start_time + 55.minutes).points(:minute)).to eq([
       {:moment=>"2000-01-01T00:00", :values=>{"web/firefox"=>1, "web/firefox/3"=>1, "web"=>1}},
       {:moment=>"2000-01-01T00:15", :values=>{"web/firefox"=>2, "web/firefox/3"=>2, "web"=>2}},
       {:moment=>"2000-01-01T00:30", :values=>{"web"=>3, "web/ie/6"=>3, "web/ie"=>3}},
       {:moment=>"2000-01-01T00:45", :values=>{"web"=>2, "web/ie/6"=>2, "web/ie"=>2}}
-    ]
-
-    subject.find("views", start_time).points(:hour).should == [{:moment=>"2000-01-01T00",
-                                                                :values=>
-    {"web/ie"=>5.0,
-     "web"=>8.0,
-     "web/firefox"=>3.0,
-     "web/ie/6"=>5.0,
-     "web/firefox/3"=>3.0}},
-     {:moment=>"2000-01-01T01",
-      :values=>
-    {"web/ie"=>2.0,
-     "web/chrome"=>6.0,
-     "web/chrome/11"=>6.0,
-     "web"=>8.0,
-     "web/ie/5"=>2.0}}]
-
-
+    ])
+
+    expect(subject.find("views", start_time).points(:hour)).to eq([
+      {
+        :moment=>"2000-01-01T00",
+        :values=> {
+          "web/ie"=>5.0,
+          "web"=>8.0,
+          "web/firefox"=>3.0,
+          "web/ie/6"=>5.0,
+          "web/firefox/3"=>3.0}
+      },{
+        :moment=>"2000-01-01T01",
+        :values=>{
+          "web/ie"=>2.0,
+          "web/chrome"=>6.0,
+          "web/chrome/11"=>6.0,
+          "web"=>8.0,
+          "web/ie/5"=>2.0
+        }
+      }
+    ])
   end
 
   it "causes no stack overflow" do

data/spec/lib/rhcf/timeseries/result_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'rhcf/timeseries/redis'
+
+
+describe "Query" do
+  describe "#better_resolution" do
+
+let(:redis_connection){nil}
+    describe "When having a smaller then 1/5 " do
+      let(:series) { Rhcf::Timeseries::Redis.new(nil, redis_connection, resolutions: [:hour, :"15minutes", :minute]) }
+      it { expect(series.find('bla', Time.now - 3600, Time.now).better_resolution[:id]).to eq :minute }
+    end
+
+    describe "When having a smaller but greather then 1/5" do
+      let(:series) { Rhcf::Timeseries::Redis.new(nil, redis_connection,  resolutions: [:hour, :"15minutes"]) }
+      it { expect(series.find('bla', Time.now - 3600, Time.now).better_resolution[:id]).to eq :"15minutes" }
+    end
+
+    describe "When having no smaller, only its size" do
+      let(:series) { Rhcf::Timeseries::Redis.new(nil, redis_connection,  resolutions: [:hour]) }
+      it { expect(series.find('bla', DateTime.parse('2015-01-01 01:50:00'), DateTime.parse('2015-01-01 03:10:00')).better_resolution[:id]).to eq :hour }
+    end
+
+    describe "When having only bigger" do
+      let(:series) { Rhcf::Timeseries::Redis.new(nil, redis_connection,  resolutions: [:month]) }
+      it { expect(series.find('bla', DateTime.parse('2015-01-01 01:50:00'), DateTime.parse('2015-01-01 03:10:00')).better_resolution).to be_nil}
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@
 #SimpleCov.start_with?
 require 'timecop'
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhcf-timeseries
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Romeu Fonseca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - rhcf-timeseries.gemspec
 - spec/lib/rhcf/timeseries/TODO
 - spec/lib/rhcf/timeseries/redis_spec.rb
+- spec/lib/rhcf/timeseries/result_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -144,4 +145,5 @@ summary: Redistat inspired redis time series.
 test_files:
 - spec/lib/rhcf/timeseries/TODO
 - spec/lib/rhcf/timeseries/redis_spec.rb
+- spec/lib/rhcf/timeseries/result_spec.rb
 - spec/spec_helper.rb