quark 0.3.3 → 0.4.0

data/lib/quark/commands/fetch.rb

@@ -24,8 +24,8 @@ module Quark
       raise Quark::ArgumentError.new("FETCH 'to' argument must be numeric") if not to.nil? and (Integer(to) rescue false) === false
 
     # find all matching keys from all blocks
-      @redis.keys("#{@_prefix}:#{keys}:*").each do |key|
-        x, name, block = key.split(':',3)
+      @redis.keys("#{@_prefix}:observations:#{keys}:*").each do |key|
+        x, y, name, block = key.split(':',4)
         block = block.to_i
 
       # skip keys whose block falls outside of the given time range (if given)

data/lib/quark/commands/list.rb

@@ -5,8 +5,8 @@ module Quark
       fields = fields.to_s.split(',')
       fields = fields.collect{|f| f.split('-',2) }
 
-      return @redis.keys("#{@_prefix}:#{pattern}:*").collect{|i|
-        value = i.split(':')[1]
+      return @redis.keys("#{@_prefix}:observations:#{pattern}:*").collect{|i|
+        value = i.split(':')[2]
 
         if not fields.empty?
           rv = []

data/lib/quark/commands/observe.rb

@@ -15,7 +15,9 @@ module Quark
         puts "OBSERVE #{@_prefix}:#{id}:#{block} #{value} #{timestamp}"
       end
 
-      @redis.hset("#{@_prefix}:#{id}:#{block}", timestamp, value)
+      @redis.hset("#{@_prefix}:observations:#{id}:#{block}", timestamp, value)
+      @redis.sadd("#{@_prefix}:blocks:#{Quark::Config.get("quark.blocksize").to_i}", block)
+
       return ({
         :metric => id,
         :block  => block

data/lib/quark/commands/peek.rb

@@ -2,16 +2,16 @@ module Quark
   module CommandProcessor
     def self.process_command_peek(data)
       rv = {}
-      keys = @redis.keys("#{@_prefix}:#{data}:*")
+      keys = @redis.keys("#{@_prefix}:observations:#{data}:*")
       peek_keys = []
 
     # get unique metric names
       keys.collect{|i|
-        i.split(':')[1]
+        i.split(':')[2]
       }.uniq().each do |name|
       # get most recent bucket for this metric
         peek_keys << keys.select{|i|
-          i.split(':')[1] == name
+          i.split(':')[2] == name
         }.sort.last
       end
 
@@ -21,7 +21,7 @@ module Quark
           a[0] <=> b[0]
         }.last
 
-        rv[peek.split(':')[1]] = [data[0].to_i, data[1].to_f]
+        rv[peek.split(':')[2]] = [data[0].to_i, data[1].to_f]
       end
 
       return rv

data/lib/quark/commands/put.rb

@@ -15,7 +15,8 @@ module Quark
         puts "PUT #{@_prefix}:#{id}:#{block} #{value} #{timestamp}"
       end
 
-      @redis.hset("#{@_prefix}:#{id}:#{block}", timestamp, value)
+      @redis.hset("#{@_prefix}:observations:#{id}:#{block}", timestamp, value)
+      @redis.sadd("#{@_prefix}:blocks:#{Quark::Config.get("quark.blocksize").to_i}", block)
 
       return nil
     end

data/lib/quark/commands/tree.rb

@@ -0,0 +1,13 @@
+module Quark
+  module CommandProcessor
+    def self.process_command_tree(data)
+      root, max_age = data.to_s.strip.chomp.split(' ', 2)
+      depth = root.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()
+    end
+  end
+end

data/lib/quark/server.rb

@@ -80,12 +80,12 @@ module Quark
   # if 'to' is negative, it is assumed to be n-seconds ago
   #
     def self.purge(keys, to=nil)
-      keys = [@_prefix, keys, '*'].join(':') if not keys.start_with?(@_prefix)
+      keys = [@_prefix, 'observations', keys, '*'].join(':') if not keys.start_with?("#{@_prefix}:observations")
       now = (Time.now.to_f * 1000).to_i
       rv = []
 
       @redis.keys(keys).each do |key|
-        x, name, block = key.split(':', 3)
+        x, y, name, block = key.split(':', 4)
         block = block.to_i
 
         if ((to = Integer(to)) rescue false)

data/lib/quark/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   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: &18499280 !ruby/object:Gem::Requirement
+  requirement: &15032140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *18499280
+  version_requirements: *15032140
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &18498640 !ruby/object:Gem::Requirement
+  requirement: &15031540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *18498640
+  version_requirements: *15031540
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &18497700 !ruby/object:Gem::Requirement
+  requirement: &15030220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *18497700
+  version_requirements: *15030220
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &18497220 !ruby/object:Gem::Requirement
+  requirement: &15029180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *18497220
+  version_requirements: *15029180
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &18513140 !ruby/object:Gem::Requirement
+  requirement: &15028280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *18513140
+  version_requirements: *15028280
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &18511860 !ruby/object:Gem::Requirement
+  requirement: &15027780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *18511860
+  version_requirements: *15027780
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &18511420 !ruby/object:Gem::Requirement
+  requirement: &15027320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *18511420
+  version_requirements: *15027320
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &18510840 !ruby/object:Gem::Requirement
+  requirement: &14995020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18510840
+  version_requirements: *14995020
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
-  requirement: &18510100 !ruby/object:Gem::Requirement
+  requirement: &14993520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18510100
+  version_requirements: *14993520
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &18509360 !ruby/object:Gem::Requirement
+  requirement: &14992140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18509360
+  version_requirements: *14992140
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com
@@ -142,6 +142,7 @@ files:
 - lib/quark/commands/fetch.rb
 - lib/quark/commands/observe.rb
 - lib/quark/commands/ping.rb
+- lib/quark/commands/tree.rb
 - lib/quark/commands/list.rb
 - lib/quark/commands/put.rb
 - lib/quark/errors.rb
@@ -174,3 +175,4 @@ signing_key:
 specification_version: 3
 summary: A miniscule timeseries metrics logging service
 test_files: []
+has_rdoc: