quark 0.4.0 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -2,12 +2,24 @@ module Quark
2
2
  module CommandProcessor
3
3
  def self.process_command_tree(data)
4
4
  root, max_age = data.to_s.strip.chomp.split(' ', 2)
5
- depth = root.split('.').length
5
+ max_age ||= 3600
6
+ depth = (root == '*' ? 0 : root.to_s.split('.').length)
6
7
  root = (root.nil? or root.empty? ? '*' : "#{root}.*")
7
8
 
8
- return @redis.keys("#{@_prefix}:observations:#{root}:*").collect{|i|
9
- i.split(':')[2].split('.')[0..depth].join('.')
10
- }.compact.sort.uniq()
9
+ earliest_block = ( ((Time.now.to_i - max_age.to_i) * 1000.0) / Quark::Config.get('quark.blocksize') ).to_i
10
+ blocks = @redis.smembers("#{@_prefix}:blocks:#{Quark::Config.get('quark.blocksize')}").select{|i|
11
+ i.to_i >= earliest_block
12
+ }.sort.uniq
13
+
14
+ rv = []
15
+
16
+ blocks.each do |block|
17
+ rv += @redis.keys("#{@_prefix}:observations:#{root}:#{block}").collect{|i|
18
+ i.split(':')[2].split('.')[0..depth].join('.')
19
+ }.compact.sort.uniq()
20
+ end
21
+
22
+ return rv
11
23
  end
12
24
  end
13
25
  end
@@ -1,3 +1,3 @@
1
1
  module Quark
2
- VERSION = '0.4.0'
2
+ VERSION = '0.4.1'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: quark
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.4.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2014-05-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: multi_json
16
- requirement: &15032140 !ruby/object:Gem::Requirement
16
+ requirement: &16866080 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - =
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.7.9
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *15032140
24
+ version_requirements: *16866080
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: eventmachine
27
- requirement: &15031540 !ruby/object:Gem::Requirement
27
+ requirement: &16864540 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *15031540
35
+ version_requirements: *16864540
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: redis
38
- requirement: &15030220 !ruby/object:Gem::Requirement
38
+ requirement: &16863580 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 3.0.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *15030220
46
+ version_requirements: *16863580
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: hiredis
49
- requirement: &15029180 !ruby/object:Gem::Requirement
49
+ requirement: &16862460 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 0.5.2
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *15029180
57
+ version_requirements: *16862460
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: em-synchrony
60
- requirement: &15028280 !ruby/object:Gem::Requirement
60
+ requirement: &16861900 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.0.3
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *15028280
68
+ version_requirements: *16861900
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: em-websocket
71
- requirement: &15027780 !ruby/object:Gem::Requirement
71
+ requirement: &16861220 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 0.5.1
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *15027780
79
+ version_requirements: *16861220
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: hashlib
82
- requirement: &15027320 !ruby/object:Gem::Requirement
82
+ requirement: &16859700 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.0.35
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *15027320
90
+ version_requirements: *16859700
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: sinatra
93
- requirement: &14995020 !ruby/object:Gem::Requirement
93
+ requirement: &16858700 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *14995020
101
+ version_requirements: *16858700
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: sinatra-cross_origin
104
- requirement: &14993520 !ruby/object:Gem::Requirement
104
+ requirement: &16857260 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *14993520
112
+ version_requirements: *16857260
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: thin
115
- requirement: &14992140 !ruby/object:Gem::Requirement
115
+ requirement: &16844780 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *14992140
123
+ version_requirements: *16844780
124
124
  description: A small service for logging and retrieving timeseries metrics into a
125
125
  Redis server
126
126
  email: garyhetzel@gmail.com