quark 0.4.0 → 0.4.1

data/lib/quark/commands/tree.rb

@@ -2,12 +2,24 @@ module Quark
   module CommandProcessor
     def self.process_command_tree(data)
       root, max_age = data.to_s.strip.chomp.split(' ', 2)
-      depth = root.split('.').length
+      max_age ||= 3600
+      depth = (root == '*' ? 0 : root.to_s.split('.').length)
       root = (root.nil? or root.empty? ? '*' : "#{root}.*")
 
-      return @redis.keys("#{@_prefix}:observations:#{root}:*").collect{|i|
-        i.split(':')[2].split('.')[0..depth].join('.')
-      }.compact.sort.uniq()
+      earliest_block = ( ((Time.now.to_i - max_age.to_i) * 1000.0) / Quark::Config.get('quark.blocksize') ).to_i
+      blocks = @redis.smembers("#{@_prefix}:blocks:#{Quark::Config.get('quark.blocksize')}").select{|i|
+        i.to_i >= earliest_block
+      }.sort.uniq
+
+      rv = []
+
+      blocks.each do |block|
+        rv += @redis.keys("#{@_prefix}:observations:#{root}:#{block}").collect{|i|
+          i.split(':')[2].split('.')[0..depth].join('.')
+        }.compact.sort.uniq()
+      end
+
+      return rv
     end
   end
 end

data/lib/quark/version.rb

@@ -1,3 +1,3 @@
 module Quark
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &15032140 !ruby/object:Gem::Requirement
+  requirement: &16866080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *15032140
+  version_requirements: *16866080
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &15031540 !ruby/object:Gem::Requirement
+  requirement: &16864540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15031540
+  version_requirements: *16864540
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &15030220 !ruby/object:Gem::Requirement
+  requirement: &16863580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15030220
+  version_requirements: *16863580
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &15029180 !ruby/object:Gem::Requirement
+  requirement: &16862460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *15029180
+  version_requirements: *16862460
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &15028280 !ruby/object:Gem::Requirement
+  requirement: &16861900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *15028280
+  version_requirements: *16861900
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &15027780 !ruby/object:Gem::Requirement
+  requirement: &16861220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *15027780
+  version_requirements: *16861220
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &15027320 !ruby/object:Gem::Requirement
+  requirement: &16859700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *15027320
+  version_requirements: *16859700
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &14995020 !ruby/object:Gem::Requirement
+  requirement: &16858700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14995020
+  version_requirements: *16858700
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
-  requirement: &14993520 !ruby/object:Gem::Requirement
+  requirement: &16857260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14993520
+  version_requirements: *16857260
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &14992140 !ruby/object:Gem::Requirement
+  requirement: &16844780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14992140
+  version_requirements: *16844780
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com