ustate-client 0.0.7 → 0.0.8

data/lib/ustate/aggregator.rb

@@ -22,6 +22,17 @@ module UState
         State.average states, *a
       end
     end
+    
+    # Average states with the same service across varying hosts.
+    # Useful when you don't know the exact services you'd like to fold.
+    # The resulting host for each folded state will be nil.
+    def average_over_hosts(query)
+      fold query do |states|
+        State.partition(states, :service).values.map do |slice|
+          State.sum slice, {host: nil}
+        end
+      end
+    end
 
     # Combines states matching query with the given block. The block
     # receives an array of states which presently match.
@@ -51,8 +62,13 @@ module UState
             @folds.each do |f, query|
               matching = @index.query(Query.new(string: query))
               unless matching.empty?
-                if combined = f[matching]
+                case combined = f[matching]
+                when State
                   @index << combined
+                when Array
+                  combined.each do |s|
+                    @index << s
+                  end
                 end
               end
               sleep interval
@@ -71,5 +87,15 @@ module UState
         State.sum states, *a
       end
     end
+
+    # Sum states with the same service across varying hosts.
+    # Useful when you don't know the exact services you'd like to fold.
+    def sum_over_hosts(query)
+      fold query do |states|
+        State.partition(states, :service).values.map do |slice|
+          State.sum slice, {host: nil}
+        end
+      end
+    end
   end
 end

data/lib/ustate/client.rb

@@ -42,6 +42,11 @@ class UState::Client
     end
   end
 
+  # Returns an array of states matching query.
+  def [](query)
+    query(query).states || []
+  end
+
   def connect
     @socket = TCPSocket.new(@host, @port)
   end

data/lib/ustate/dash/helper/renderer.rb

@@ -80,6 +80,7 @@ module UState
         rescue ZeroDivisionError
           0
         end
+        size = "%.2f" % size
 
         tag opts[:tag], h(text), 
           :class => "state #{s.state}", 

data/lib/ustate/query/and.rb

@@ -1,16 +1,11 @@
 class UState::Query
   class And < Node
-    def initialize(a,b)
-      @a = a
-      @b = b
-    end
+    include Narity
 
     def ===(state)
-      @a === state and @b === state
-    end
-
-    def inspect
-      inspect_helper @a, @b
+      as.all? do |a|
+        a === state
+      end
     end
   end
 end

data/lib/ustate/query/approximately.rb

@@ -1,8 +1,10 @@
 class UState::Query
   class Approximately < Node
+    include Binarity
+    
     def initialize(field, value)
-      @field = field
-      @value = case value
+      @a = field
+      @b = case value
         when String
           r = value.chars.inject('') do |r, c|
             if c == '%'
@@ -18,11 +20,7 @@ class UState::Query
     end
 
     def ===(state)
-      @value === state.send(@field) 
-    end
-
-    def inspect
-      inspect_helper @field, @value
+      @b === state.send(@a) 
     end
   end
 end

data/lib/ustate/query/ast.rb

@@ -1,4 +1,7 @@
 require 'ustate/query/node'
+require 'ustate/query/binarity'
+require 'ustate/query/narity'
+
 require 'ustate/query/and'
 require 'ustate/query/approximately'
 require 'ustate/query/equals'

data/lib/ustate/query/binarity.rb

@@ -0,0 +1,41 @@
+module UState::Query::Binarity
+  def initialize(a, b)
+    @a = a
+    @b = b
+  end
+
+  def ==(o)
+    self.class == o.class and
+    a == o.a and
+    b == o.b
+  end
+
+  def a
+    @a
+  end
+  
+  def b
+    @b
+  end
+
+  def children
+    [@a, @b]
+  end
+
+  def children=(c)
+    raise ArgumentError unless c.size == 2
+    @a, @b = c
+  end
+
+  def inspect
+    inspect_helper @a, @b
+  end
+
+  def mass
+    1 + (@a.mass rescue 1) + (@b.mass rescue 1)
+  end
+
+  def to_s
+    "(#{@a} #{self.class.to_s.split('::').last.downcase} #{@b})"
+  end
+end

data/lib/ustate/query/equals.rb

@@ -1,16 +1,8 @@
 class UState::Query
   class Equals < Node
-    def initialize(field, value)
-      @field = field
-      @value = value
-    end
-    
+    include Binarity
     def ===(state)
-      state.send(@field) == @value
-    end
-
-    def inspect
-      inspect_helper @field, @value
+      state.send(@a) == @b
     end
   end
 end

data/lib/ustate/query/false.rb

@@ -1,10 +1,15 @@
 class UState::Query
   class False < Node
-    def initialize
+    def ==(other)
+      other.kind_of? False
     end
 
     def ===(state)
       false
     end
+
+    def to_s
+      false
+    end
   end
 end

data/lib/ustate/query/greater.rb

@@ -1,16 +1,9 @@
 class UState::Query
   class Greater < Node
-    def initialize(field, value)
-      @field = field
-      @value = value
-    end
+    include Binarity
     
     def ===(state)
-      x = state.send(@field) and x > @value
-    end
-
-    def inspect
-      inspect_helper @field, @value
+      x = state.send(@a) and x > @b
     end
   end
 end

data/lib/ustate/query/greater_equal.rb

@@ -1,16 +1,9 @@
 class UState::Query
   class GreaterEqual < Node
-    def initialize(field, value)
-      @field = field
-      @value = value
-    end
+    include Binarity
     
     def ===(state)
-      x = state.send(@field) and x >= @value
-    end
-
-    def inspect
-      inspect_helper @field, @value
+      x = state.send(@a) and x >= @b
     end
   end
 end

data/lib/ustate/query/less.rb

@@ -1,16 +1,9 @@
 class UState::Query
   class Less < Node
-    def initialize(field, value)
-      @field = field
-      @value = value
-    end
+    include Binarity
     
     def ===(state)
-      x = state.send(@field) and x < @value
-    end
-
-    def inspect
-      inspect_helper @field, @value
+      x = state.send(@a) and x < @b
     end
   end
 end

data/lib/ustate/query/less_equal.rb

@@ -1,16 +1,9 @@
 class UState::Query
   class LessEqual < Node
-    def initialize(field, value)
-      @field = field
-      @value = value
-    end
-    
-    def ===(state)
-      x = state.send(@field) and x <= @value
-    end
+    include Binarity
 
-    def inspect
-      inspect_helper @field, @value
+    def ===(state)
+      x = state.send(@a) and x <= @b
     end
   end
 end

data/lib/ustate/query/narity.rb

@@ -0,0 +1,42 @@
+module UState::Query::Narity
+  def initialize(*as)
+    @as = as.to_set
+  end
+ 
+  def ==(o)
+    self.class == o.class and
+    a == o.a
+  end
+
+  def as
+    @as
+  end
+
+  def as=(as)
+    @as = as.to_set
+  end
+  
+  def children
+    @as
+  end
+
+  def children=(c)
+    @as = c.to_set
+  end
+
+  def inspect
+    inspect_helper *@as
+  end
+
+  def mass
+    @as.inject(1) do |sum, a|
+      sum + (a.mass rescue 1)
+    end
+  end
+  
+  def to_s
+    "(" + @as.map do |a|
+      a.to_s
+    end.join(" #{self.class.to_s.split("::").last.downcase} ") + ")"
+  end
+end

data/lib/ustate/query/node.rb

@@ -1,4 +1,6 @@
 class UState::Query
+  require 'set'
+
   class Node
     def indent(s, d = 1)
       ("  " * d) + s.gsub("\n", "\n" + ("  " * d))
@@ -11,5 +13,9 @@ class UState::Query
     def inspect
       inspect_helper
     end
+    
+    def mass
+      1
+    end
   end
 end

data/lib/ustate/query/not.rb

@@ -1,15 +1,32 @@
 class UState::Query
   class Not < Node
+    attr_reader :a
     def initialize(a)
       @a = a
     end
 
+    def ==(o)
+      o.kind_of? Not and @a == o.a
+    end
+
     def ===(state)
       not @a === state
     end
 
+    def children
+      [@a]
+    end
+
+    def children=(c)
+      raise ArgumentError unless c.size == 1
+    end
+
     def inspect
       inspect_helper @a
     end
+
+    def mass
+      1 + @a.mass
+    end
   end
 end

data/lib/ustate/query/not_equals.rb

@@ -1,16 +1,9 @@
 class UState::Query
   class NotEquals < Node
-    def initialize(field, value)
-      @field = field
-      @value = value
-    end
+    include Binarity
 
     def ===(state)
-      state.send(@field) != @value
-    end
-
-    def inspect
-      inspect_helper @field, @value
+      state.send(@a) != @b
     end
   end
 end

data/lib/ustate/query/optimizer.rb

@@ -0,0 +1,113 @@
+class UState::Query
+  class Optimizer
+    def self.[](node)
+      new.optimize node
+    end
+
+    def initialize
+    end
+
+    # Remove true and false from and/or
+    def collapse_boolean_literals(node)
+      map node do |n|
+        case n
+        when And
+          if n.children.any? do |c|
+              False === c
+          end
+            puts "Collapsing and(false)"
+            False.new
+          else
+            n.children.delete_if do |c|
+              True === c
+            end
+            n
+          end
+        when Or
+          if n.children.any? do |c|
+              True === c
+          end
+            puts "Collapsing or(true)"
+            True.new
+          else
+            n.children.delete_if do |c|
+              False === c
+            end
+            n
+          end
+        else
+          n
+        end
+      end
+    end
+
+    # Eliminate useless ands/ors
+    def deref_ands_ors(node)
+      map node do |n|
+        case n
+        when And
+          case n.children.size
+          when 0
+            True.new
+          when 1
+            n.children.first
+          else
+            n
+          end
+        when Or
+          case n.children.size
+          when 0
+            False.new
+          when 1
+            n.children.first
+          else
+            n
+          end
+        else
+          n
+        end
+      end
+    end
+
+    def optimize(node)
+      mass = node.mass + 1
+      
+      while node.mass < mass
+        mass = node.mass
+        node = transform node
+      end
+
+      node
+    end
+
+    def map(node, &block)
+      # Transform node
+      puts "Map #{node}"
+      node = block[node] or raise RuntimeError "Mapped to nil"
+      puts "Node is now #{node}"
+
+      # Apply map to children
+      if node.respond_to? :children
+        puts "Node has children"
+        node.children.map! do |n|
+          map n, &block
+        end
+      end
+
+      # Return node
+      node
+    end
+
+    def traverse(node, &block)
+      block[node]
+      node.children.each do |child|
+        traverse child, &block
+      end
+    end
+
+    def transform(node)
+      puts "Transform ------------\n#{node.inspect}"
+      deref_ands_ors collapse_boolean_literals node
+    end
+  end
+end

data/lib/ustate/query/or.rb

@@ -1,16 +1,11 @@
 class UState::Query
   class Or < Node
-    def initialize(a,b)
-      @a = a
-      @b = b
-    end
-
+    include Narity
+    
     def ===(state)
-      @a === state or @b === state
-    end
-
-    def inspect
-      inspect_helper @a, @b
+      @as.any? do |a|
+        a === state
+      end
     end
   end
 end

data/lib/ustate/query/true.rb

@@ -1,10 +1,15 @@
 class UState::Query
   class True < Node
-    def initialize
+    def ==(o)
+      o.kind_of? True
     end
 
     def ===(state)
       true
     end
+
+    def to_s
+      true
+    end
   end
 end

data/lib/ustate/state.rb

@@ -122,8 +122,14 @@ module UState
     # Partition a list of states by a field
     # Returns a hash of field_value => state
     def self.partition(states, field)
-      states.inject(Hash.new { [] }) do |p, state|
-        p[state.send(field)] << state
+      states.inject({}) do |p, state|
+        k = state.send field
+        if p.include? k
+          p[k] << state
+        else
+          p[k] = [state]
+        end
+        p
       end
     end
 

data/lib/ustate/version.rb

@@ -1,3 +1,3 @@
 module UState
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ustate-client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
-  requirement: &17908120 !ruby/object:Gem::Requirement
+  requirement: &73289770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *17908120
+  version_requirements: *73289770
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &17907540 !ruby/object:Gem::Requirement
+  requirement: &73289260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *17907540
+  version_requirements: *73289260
 - !ruby/object:Gem::Dependency
   name: mtrc
-  requirement: &17907040 !ruby/object:Gem::Requirement
+  requirement: &73276480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +43,7 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *17907040
+  version_requirements: *73276480
 description: 
 email: aphyr@aphyr.com
 executables: []
@@ -52,53 +51,55 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ustate.rb
-- lib/ustate/query/not_equals.rb
-- lib/ustate/query/equals.rb
-- lib/ustate/query/false.rb
-- lib/ustate/query/node.rb
-- lib/ustate/query/true.rb
-- lib/ustate/query/or.rb
-- lib/ustate/query/approximately.rb
-- lib/ustate/query/greater.rb
-- lib/ustate/query/and.rb
-- lib/ustate/query/less.rb
-- lib/ustate/query/ast.rb
-- lib/ustate/query/less_equal.rb
-- lib/ustate/query/greater_equal.rb
-- lib/ustate/query/not.rb
+- lib/ustate/graphite.rb
 - lib/ustate/query_string.treetop
-- lib/ustate/server.rb
+- lib/ustate/message.rb
 - lib/ustate/auto_state.rb
-- lib/ustate/emailer.rb
-- lib/ustate/query.rb
-- lib/ustate/version.rb
-- lib/ustate/aggregator.rb
-- lib/ustate/state.rb
-- lib/ustate/reaper.rb
-- lib/ustate/graphite.rb
-- lib/ustate/client/query.rb
 - lib/ustate/metric_thread.rb
-- lib/ustate/query_string.rb
-- lib/ustate/server/index.rb
+- lib/ustate/aggregator.rb
+- lib/ustate/version.rb
+- lib/ustate/server/graphite.rb
 - lib/ustate/server/backends.rb
-- lib/ustate/server/backends/tcp.rb
 - lib/ustate/server/backends/base.rb
-- lib/ustate/server/graphite.rb
+- lib/ustate/server/backends/tcp.rb
+- lib/ustate/server/index.rb
 - lib/ustate/server/connection.rb
+- lib/ustate/reaper.rb
+- lib/ustate/server.rb
+- lib/ustate/dash.rb
+- lib/ustate/state.rb
+- lib/ustate/query.rb
+- lib/ustate/client/query.rb
 - lib/ustate/client.rb
-- lib/ustate/message.rb
-- lib/ustate/dash/helper/renderer.rb
-- lib/ustate/dash/views/css.scss
+- lib/ustate/dash/rack/static.rb
 - lib/ustate/dash/views/index.erubis
 - lib/ustate/dash/views/layout.erubis
-- lib/ustate/dash/rack/static.rb
+- lib/ustate/dash/views/css.scss
 - lib/ustate/dash/controller/index.rb
 - lib/ustate/dash/controller/css.rb
 - lib/ustate/dash/config.rb
-- lib/ustate/dash.rb
+- lib/ustate/dash/helper/renderer.rb
+- lib/ustate/query/or.rb
+- lib/ustate/query/not_equals.rb
+- lib/ustate/query/ast.rb
+- lib/ustate/query/optimizer.rb
+- lib/ustate/query/less_equal.rb
+- lib/ustate/query/equals.rb
+- lib/ustate/query/binarity.rb
+- lib/ustate/query/approximately.rb
+- lib/ustate/query/true.rb
+- lib/ustate/query/greater_equal.rb
+- lib/ustate/query/node.rb
+- lib/ustate/query/not.rb
+- lib/ustate/query/less.rb
+- lib/ustate/query/and.rb
+- lib/ustate/query/false.rb
+- lib/ustate/query/greater.rb
+- lib/ustate/query/narity.rb
+- lib/ustate/query_string.rb
+- lib/ustate/emailer.rb
 - LICENSE
 - README.markdown
-has_rdoc: true
 homepage: https://github.com/aphyr/ustate
 licenses: []
 post_install_message: 
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ustate-client
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Client for the distributed state server ustate.