skydb 0.2.2 → 0.2.3

data/lib/skydb/query/on_condition.rb

@@ -0,0 +1,53 @@
+class SkyDB
+  class Query
+    # The 'on' condition filters a selection and leaves the cursor on the
+    # current matching event.
+    class OnCondition < SkyDB::Query::Condition
+      ##########################################################################
+      #
+      # Constructor
+      #
+      ##########################################################################
+
+      def initialize(action=nil, options={})
+        options.merge!(action.is_a?(Hash) ? action : {:action => action})
+        super(options)
+      end
+    
+
+      ##########################################################################
+      #
+      # Methods
+      #
+      ##########################################################################
+
+      ##################################
+      # Codegen
+      ##################################
+
+      # Generates Lua code to match a given action.
+      def codegen(options={})
+        header, body, footer = "function #{function_name.to_s}(cursor, data)\n", [], "end\n"
+      
+        # If the action is :enter then just check for the beginning of a session.
+        if action == :enter
+          body << "return (cursor.session_event_index == 0)"
+        else
+          # Only move to the next event if directed to by the options.
+          body << "if cursor:eos() or cursor:eof() then return false end"
+          body << "repeat"
+          body << "  if cursor.event.action_id == #{action.id.to_i} then"
+          body << "    return true"
+          body << "  end"
+          body << "until not cursor:next()"
+          body << "return false"
+        end
+
+        # Indent body and return.
+        body.map! {|line| "  " + line}
+        return header + body.join("\n") + "\n" + footer
+      end
+    end
+  end
+end
+

data/lib/skydb/query/selection.rb

@@ -73,8 +73,10 @@ class SkyDB
       ##########################################################################
 
       def initialize(options={})
+        self.query = options[:query]
         self.fields = options[:fields] || []
         self.groups = options[:groups] || []
+        self.conditions = options[:conditions] || []
       end
     
 
@@ -84,12 +86,19 @@ class SkyDB
       #
       ##########################################################################
 
+      # The query this selection is attached to.
+      attr_accessor :query
+
       # A list of fields that will be returned from the server.
       attr_accessor :fields
 
       # A list of expressions to group the returned data by.
       attr_accessor :groups
 
+      # A list of conditions that must be fulfilled before performing a
+      # selection.
+      attr_accessor :conditions
+
 
       ##########################################################################
       #
@@ -139,6 +148,31 @@ class SkyDB
         return self
       end
 
+      # Adds an 'after' condition to the query.
+      #
+      # @param [Hash] options  The options to pass to the 'after' condition.
+      #
+      # @return [Query]  The query object is returned.
+      def after(options={})
+        conditions << SkyDB::Query::AfterCondition.new(options)
+        return self
+      end
+
+      # Adds an 'on' condition to the query.
+      #
+      # @param [Hash] options  The options to pass to the 'on' condition.
+      #
+      # @return [Query]  The query object is returned.
+      def on(options={})
+        conditions << SkyDB::Query::OnCondition.new(options)
+        return self
+      end
+
+      # Executes the parent query.
+      def execute()
+        return query.execute
+      end
+
 
       ####################################
       # Validation
@@ -165,6 +199,16 @@ class SkyDB
       # Codegen
       ####################################
 
+      # Generates Lua code for the entire selection including conditions and
+      # merging.
+      def codegen
+        return [
+          codegen_select(),
+          codegen_select_all(),
+          codegen_merge()
+          ].join("\n")
+      end
+
       # Generates Lua code for the aggregation based on the selection.
       def codegen_select
         header, body, footer = "function select(cursor, data)\n", [], "end\n"
@@ -176,7 +220,7 @@ class SkyDB
         # Initialize groups.
         groups.each do |group|
           body << "group_value = #{group.accessor}"
-          body << "if cursor:eos() or cursor:eof() then group_value = -1 end" if group.expression == 'action_id'
+          body << "if cursor:eos() or cursor:eof() then group_value = 'exit' end" if group.expression == 'action_id'
           body << "if target[group_value] == nil then"
           body << "  target[group_value] = {}"
           body << "end"
@@ -213,6 +257,42 @@ class SkyDB
         return header + body.join("\n") + "\n" + footer
       end
 
+      # Generates Lua code for the aggregation based on the selection.
+      def codegen_select_all
+        header, body, footer = "function select_all(cursor, data)\n", [], "end\n"
+      
+        # Generate the invocation of the conditions.
+        conditional_functions = codegen_conditional_functions()
+        conditionals = conditions.map {|condition| "#{condition.function_name}(cursor, data)"}.join(' and ')
+        conditionals = "true" if conditions.length == 0
+        
+        body << "while cursor:next_session() do"
+        body << "  while cursor:next() do"
+        body << "    if #{conditionals} then"
+        body << "      select(cursor, data)"
+        body << "    end"
+        body << "  end"
+        body << "end"
+
+        # Indent body and return.
+        body.map! {|line| "  " + line}
+        return conditional_functions + "\n" + header + body.join("\n") + "\n" + footer
+      end
+
+      # Generates Lua code for the conditional functions.
+      def codegen_conditional_functions
+        code = []
+        
+        # Generate condition functions.
+        conditions.each_with_index do |condition, index|
+          condition.function_name ||= "__condition#{query.nextseq}"
+          code << condition.codegen
+        end
+
+        return code.join("\n")
+      end
+
+
       # Generates Lua code for the merge function.
       def codegen_merge
         header, body, footer = "function merge(results, data)\n", [], "end\n"
@@ -262,6 +342,56 @@ class SkyDB
         body.map! {|line| "  " + line}
         return header + body.join("\n") + "\n" + footer
       end
+
+
+      ####################################
+      # Serialization
+      ####################################
+    
+      # Serializes the selection object into a JSON string.
+      def to_json(*a); to_hash.to_json(*a); end
+
+      # Serializes the selection object into a hash.
+      def to_hash(*a)
+        {
+          'fields' => fields.to_a.map {|f| f.to_hash},
+          'groups' => groups.to_a.map {|g| g.to_hash},
+          'conditions' => conditions.to_a.map {|c| c.to_hash}
+        }
+      end
+    
+      # Deserializes the selection object from a hash.
+      def from_hash(hash, *a)
+        return nil if hash.nil?
+        self.fields = hash['fields'].to_a.map {|h| SkyDB::Query::SelectionField.new.from_hash(h, *a)}
+        self.groups = hash['groups'].to_a.map {|h| SkyDB::Query::SelectionGroup.new.from_hash(h, *a)}
+        self.conditions = hash['conditions'].to_a.map do |h|
+          if h['type'] == 'on'
+            SkyDB::Query::OnCondition.new.from_hash(h, *a)
+          else
+            SkyDB::Query::AfterCondition.new.from_hash(h, *a)
+          end
+        end
+        return self
+      end
+
+
+      ####################################
+      # Identifier Management
+      ####################################
+
+      # Retrieves a list of all action objects.
+      def get_identifiers
+        actions = []
+        
+        conditions.each do |condition|
+          if condition.action.is_a?(SkyDB::Action) && condition.action.id.to_i == 0
+            actions << condition.action
+          end
+        end
+        
+        return actions
+      end
     end
   end
 end

data/lib/skydb/query/selection_field.rb

@@ -69,6 +69,31 @@ class SkyDB
           raise SkyDB::Query::ValidationError.new("Invalid expression for selection field: '#{expression.to_s}'")
         end
       end
+
+      ####################################
+      # Serialization
+      ####################################
+    
+      # Serializes the selection field object into a JSON string.
+      def to_json(*a); to_hash.to_json(*a); end
+
+      # Serializes the selection field object into a hash.
+      def to_hash(*a)
+        {
+          'expression' => expression.to_s,
+          'aliasName' => alias_name.to_s,
+          'aggregationType' => aggregation_type.to_s
+        }.delete_if {|k,v| v == ''}
+      end
+
+      # Deserializes the selection field object from a hash.
+      def from_hash(hash, *a)
+        return nil if hash.nil?
+        self.expression = hash['expression']
+        self.alias_name = hash['aliasName']
+        self.aggregation_type = hash['aggregationType'].to_s != '' ? hash['aggregationType'].to_s.to_sym : nil
+        return self
+      end
     end
   end
 end

data/lib/skydb/query/selection_group.rb

@@ -52,6 +52,27 @@ class SkyDB
           raise SkyDB::Query::ValidationError.new("Invalid expression for selection group: '#{expression.to_s}'")
         end
       end
+
+      ####################################
+      # Serialization
+      ####################################
+    
+      # Serializes the selection group into a JSON string.
+      def to_json(*a); to_hash.to_json(*a); end
+
+      # Serializes the selection group into a hash.
+      def to_hash(*a)
+        {
+          'expression' => expression.to_s
+        }.delete_if {|k,v| v == ''}
+      end
+
+      # Deserializes the selection field object from a hash.
+      def from_hash(hash, *a)
+        return nil if hash.nil?
+        self.expression = hash['expression']
+        return self
+      end
     end
   end
 end

data/lib/skydb/table.rb

@@ -65,5 +65,12 @@ class SkyDB
         tablet_count: tablet_count
       }.to_msgpack
     end
+
+    # Encodes the table into JSON format.
+    def to_json(*a)
+      {
+        'name' => name
+      }.to_json(*a)
+    end
   end
 end

data/lib/skydb/version.rb

@@ -1,3 +1,3 @@
 class SkyDB
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/integration/query_test.rb

@@ -0,0 +1,102 @@
+require 'test_helper'
+
+class TestQuery < MiniTest::Unit::TestCase
+  ##############################################################################
+  #
+  # Setup / Teardown
+  #
+  ##############################################################################
+
+  def setup
+    @query = SkyDB::Query.new()
+  end
+
+
+  ##############################################################################
+  #
+  # Tests
+  #
+  ##############################################################################
+
+  ######################################
+  # Aggregation
+  ######################################
+
+  def test_select_count
+    import("integration/query/count.json")
+    results = SkyDB.select('count()').execute()
+    assert_equal ({"count" => 7}), results
+  end
+
+  def test_select_count_by_action_id
+    import("integration/query/count.json")
+    results = SkyDB.select('count()').group_by("action_id").execute()
+    assert_equal({
+      1=>{"count"=>2},  # /
+      2=>{"count"=>1},  # /signup
+      3=>{"count"=>2},  # /login
+      4=>{"count"=>1},  # /about
+      5=>{"count"=>1}   # /cancel_account
+    }, results)
+  end
+
+
+  ######################################
+  # Sessions
+  ######################################
+
+  def test_select_count_by_action_id_on_enter
+    import("integration/query/count.json")
+    results = SkyDB.select('count()')
+      .group_by("action_id")
+      .on(:enter)
+      .execute()
+    assert_equal ({1 => {"count" => 2}}), results
+  end
+
+  def test_select_count_by_action_id_on_enter_and_after
+    import("integration/query/count.json")
+    results = SkyDB.select('count()')
+      .group_by("action_id")
+      .on(:enter)
+      .after("/")
+      .execute()
+    assert_equal ({2=>{"count"=>1}, 3=>{"count"=>1}}), results
+  end
+
+  def test_select_count_by_action_id_on_enter_and_after_sessionized
+    import("integration/query/count.json")
+    query = SkyDB.query.session(7200)
+    results = query.select('count()')
+      .group_by("action_id")
+      .on(:enter)
+      .after("/login")
+      .execute()
+    assert_equal ({"exit"=>{"count"=>1}, 5=>{"count"=>1}}), results
+  end
+
+  def test_select_count_by_action_id_on_enter_and_after_within_sessionized
+    import("integration/query/count.json")
+    query = SkyDB.query.session(7200)
+    results = query.select('count()')
+      .group_by("action_id")
+      .on(:enter)
+      .after(:action => "/", :within => {:quantity => 1, :unit => 'step'})
+      .after(:action => "/login", :within => {:quantity => 1, :unit => 'step'})
+      .execute()
+    assert_equal ({5=>{"count"=>1}}), results
+  end
+
+  def test_double_after
+    import("integration/query/double_after.json")
+    query = SkyDB.query.session(7200)
+    results = query.select('count()')
+      .group_by("action_id")
+      .on(:enter)
+      .after(:action => "/", :within => {:quantity => 1, :unit => 'step'})
+      .after(:action => "/login", :within => {:quantity => 1, :unit => 'step'})
+      .after(:action => "/login", :within => {:quantity => 1, :unit => 'step'})
+      .execute()
+    assert_equal ({"exit"=>{"count"=>1}}), results
+  end
+end

data/test/test_helper.rb

@@ -1,15 +1,56 @@
+require 'simplecov'
+SimpleCov.start do
+  add_group "Query", "skydb/query"
+end
+
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'mocha'
 require 'unindentable'
+require "stringio"
 require 'skydb'
 require 'skydb/import'
 
 class MiniTest::Unit::TestCase
+  # The name of the table to import into.
+  def default_table_name; "sky-integration-tests"; end
+
   def assert_bytes exp, act, msg = nil
     exp = exp.to_hex
     act = act.string.to_hex
     assert_equal(exp, act, msg)
   end
-end
 
+  # Captures STDIN & STDERR and returns them as strings.
+  def capture_io
+    _stdout, $stdout = $stdout, StringIO.new
+    _stderr, $stderr = $stderr, StringIO.new
+    yield
+    [$stdout.string, $stderr.string]
+  ensure
+    $stdout = _stdout
+    $stderr = _stderr
+  end
+
+  def import(filename, options={})
+    # Default options.
+    options = {
+      :table_name => default_table_name,
+      :transform => 'sky'
+    }.merge(options)
+    
+    # Prepend fixture directory.
+    filename = File.expand_path(File.join(File.dirname(__FILE__), "../fixtures", filename))
+    
+    # Delete the table if it exists.
+    table = SkyDB.get_table(options[:table_name])
+    SkyDB.delete_table(SkyDB::Table.new(options[:table_name])) unless table.nil?
+    SkyDB.create_table(SkyDB::Table.new(options[:table_name]))
+
+    # Import.
+    importer = SkyDB::Import::Importer.new()
+    importer.table_name = options[:table_name]
+    importer.load_transform_file(options[:transform]) unless options[:transform].nil?
+    importer.import([filename], :progress_bar => false)
+  end
+end