activecube 0.1.17 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba2ca856a96d75c2628e55d650d8151b8a7a21b4f403e147d9d1f84f19a94b8
-  data.tar.gz: ea75a5c6d7fa9471213788d65be3c55e5a4b0587af8c53c14b79d7c02f40d554
+  metadata.gz: 94f1e4575a041108004194789f85b9c030c6f7f94083677dee253de3cc878966
+  data.tar.gz: b182640a584166cefc17b7b26e7add652600b0c937f08b83689a02f819bb2bb9
 SHA512:
-  metadata.gz: 92fec873743db10f2f2b7b9bbd919e96d960ade4a3abf2dd0fd82f32e5642ff0eddccfd78ec66a787e62a1de5958b12143410899edd7a80251525cb907dbc29a
-  data.tar.gz: 1006ba66ef723a95503b61d1598226358f1c0a8fbff3946a4a0ea7aa6f34408c016a817e3a7a8bfd35588b9b49aac45a7feed8058e7db47792eedcd367167256
+  metadata.gz: ab68fd59fdbffe5e0b3d4b8f0523d351b5a6c2840090328af0e78ed10c7fc23e402335f99f05d114da175c57d0b12f0d4fa02195a89ab52108af451b2dae0445
+  data.tar.gz: ace9d8f215cb59e930cf66249211405408c2bce905166fbe59370708dea17502d40d2416611297a1d6c06d0f6930ee3e73460775cfe1ad32895030db22a49c65

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    activecube (0.1.16)
+    activecube (0.1.24)
       activerecord (>= 5.2)
 
 GEM

data/lib/activecube.rb

@@ -3,6 +3,7 @@ require 'activecube/active_record_extension'
 
 require 'activecube/input_argument_error'
 require 'activecube/base'
+require 'activecube/view'
 require 'activecube/dimension'
 require 'activecube/metric'
 require 'activecube/selector'

data/lib/activecube/cube_definition.rb

@@ -18,7 +18,7 @@ module Activecube
 
     end
 
-    attr_reader :dimensions, :metrics, :selectors, :models
+    attr_reader :dimensions, :metrics, :selectors, :models, :options
 
     def inspect
       name +
@@ -46,6 +46,10 @@ module Activecube
       store_definition_array! 'model', (@models ||= []), [*args].flatten.map{|t| t }
     end
 
+    def option *args
+      store_definition_array! 'option', (@options ||= []), [*args].flatten.map{|t| t }
+    end
+
     def dim_column column_name
       Class.new(Activecube::Dimension) do
         column column_name

data/lib/activecube/processor/composer.rb

@@ -7,13 +7,13 @@ require 'activecube/query/measure_nothing'
 module Activecube::Processor
   class Composer
 
-    attr_reader :cube_query, :models
+    attr_reader :cube_query, :models, :query
     def initialize cube_query
       @cube_query = cube_query
     end
 
     def build_query
-      compose_queries optimize! ranked_tables
+      @query = compose_queries optimize! ranked_tables
     end
 
     def connection
@@ -41,7 +41,7 @@ module Activecube::Processor
       end
       after = total_cost measure_tables
 
-      raise "Optimizer made it worth #{before} -> #{after} for #{cost_matrix}" unless after <= before
+      raise "Optimizer made it worse #{before} -> #{after} for #{cost_matrix}" unless after <= before
       measure_tables
 
     end

data/lib/activecube/processor/optimizer.rb

@@ -27,8 +27,8 @@ module Activecube::Processor
 
     private
 
-
     def do_optimize
+
       @tables_by_metrics = []
 
       # sort metrics from low min cost to higher min costs ( by all applicable tables )
@@ -91,13 +91,13 @@ module Activecube::Processor
               else
                 # table to unused table if
                 # cost now > new cost + max other cost in table now
-                old_cost > new_cost + ( prev_step.select.with_index{|c,i| c==c_i && i!=m_i }.max || UNLIM_COST )
+                old_cost > new_cost + ( prev_step.select.with_index{|c,i| c==c_i && i!=m_i }.map{|c| cost_matrix[m_i][c]}.max || UNLIM_COST )
               end
             else
               if new_table_included_times>0
                 # unused table to table if
                 # new cost <  cost now + max other cost in new table
-                old_cost > new_cost - ( prev_step.select{|c| c==c_n }.max || UNLIM_COST )
+                old_cost > new_cost - ( prev_step.select{|c| c==c_n }.map{|c| cost_matrix[m_i][c]}.max || UNLIM_COST )
               else
                 # unused to unused
                 # cost now > new cost
@@ -107,7 +107,7 @@ module Activecube::Processor
 
           }
 
-          step << c_i || new_c_i
+          step << (new_c_i || c_i)
 
         }
 

data/lib/activecube/query/cube_query.rb

@@ -3,6 +3,7 @@ require 'activecube/query/item'
 require 'activecube/query/limit'
 require 'activecube/query/measure'
 require 'activecube/query/ordering'
+require 'activecube/query/option'
 require 'activecube/query/selector'
 require 'activecube/query/slice'
 
@@ -13,29 +14,44 @@ module Activecube::Query
 
     include ChainAppender
 
-    attr_reader :cube, :slices, :measures, :selectors, :options, :tables
+    attr_reader :cube, :slices, :measures, :selectors, :options, :tables, :sql
     def initialize cube, slices = [], measures = [], selectors = [], options = [], model_tables = nil
       @cube = cube
       @slices = slices
       @measures = measures
       @selectors = selectors
       @options = options
-      @tables = model_tables || cube.models.map{|m| Activecube::Processor::Table.new m}
+
+      @tables = model_tables || cube.models.map{|m|
+        m < Activecube::View ? m.new : Activecube::Processor::Table.new(m)
+      }
+
+      cube.options && cube.options.each do |option|
+        define_singleton_method option.to_s.underscore do |*args|
+          @options << Option.new(option, *args)
+          self
+        end
+      end
+
     end
 
     def slice *args
+      clear_sql
       append *args, @slices, Slice, cube.dimensions
     end
 
     def measure *args
+      clear_sql
       append *args, @measures, Measure, cube.metrics
     end
 
     def when *args
+      clear_sql
       append *args, @selectors, Selector, cube.selectors
     end
 
     def desc *args
+      clear_sql
       args.each{|arg|
         options << Ordering.new(arg, :desc)
       }
@@ -43,6 +59,7 @@ module Activecube::Query
     end
 
     def asc *args
+      clear_sql
       args.each{|arg|
         options << Ordering.new( arg, :asc)
       }
@@ -50,6 +67,7 @@ module Activecube::Query
     end
 
     def offset *args
+      clear_sql
       args.each{|arg|
         options << Limit.new( arg, :skip)
       }
@@ -57,6 +75,7 @@ module Activecube::Query
     end
 
     def limit *args
+      clear_sql
       args.each{|arg|
         options << Limit.new( arg, :take)
       }
@@ -65,13 +84,12 @@ module Activecube::Query
 
 
     def query
-      composer = Activecube::Processor::Composer.new(self)
-      sql = composer.build_query.to_sql
-      composer.connection.exec_query(sql)
+      sql = to_query.to_sql
+      @composed.connection.exec_query(sql)
     end
 
     def to_query
-      Activecube::Processor::Composer.new(self).build_query
+      @composed.try(:query) || (@composed = Activecube::Processor::Composer.new(self)).build_query
     end
 
     def to_sql
@@ -124,5 +142,10 @@ module Activecube::Query
       options.select{|s| s.kind_of? Ordering}
     end
 
+    private
+
+    def clear_sql
+      @composed = nil
+    end
   end
 end

data/lib/activecube/query/option.rb

@@ -0,0 +1,17 @@
+module Activecube
+  module Query
+    class Option
+
+      attr_reader :argument, :value
+      def initialize argument, value
+        @argument = argument
+        @value = value
+      end
+
+      def append_query _model, _cube_query, _table, query
+        query
+      end
+
+    end
+  end
+end

data/lib/activecube/query_methods.rb

@@ -24,9 +24,12 @@ module Activecube
 
 
     def super_model
-      raise Activecube::InputArgumentError, "No tables specified for cube #{name}" if models.count==0
+      raise Activecube::InputArgumentError, "No tables specified for cube #{name}" unless models && models.count>0
 
-      models.collect{ |t|
+
+      models.collect{|m|
+        m < View ? m.models : m
+      }.flatten.uniq.collect{ |t|
         t.ancestors.select{|c| c < ActiveRecord::Base }
       }.transpose.select{|c|
         c.uniq.count==1

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.17"
+  VERSION = "0.1.25"
 end

data/lib/activecube/view.rb

@@ -0,0 +1,34 @@
+require 'activecube/view_definition'
+require 'activecube/view_connection'
+
+module Activecube
+  class View
+    extend ViewDefinition
+    extend ViewConnection
+
+    def model
+      self.class
+    end
+
+    def name
+      model.name
+    end
+
+    def matches? query, _measures = query.measures
+      true
+    end
+
+    def measures? measure
+      true
+    end
+
+    def query _cube_query
+      raise "query method have to be implemented in #{name}"
+    end
+
+    def join _cube_query, _left_query, _right_query
+      raise "join method have to be implemented in #{name}"
+    end
+
+  end
+end

data/lib/activecube/view_connection.rb

@@ -0,0 +1,11 @@
+require 'active_support/concern'
+
+module Activecube::ViewConnection
+
+    attr_reader :connection
+
+    def connect_to connection
+      @connection = connection
+    end
+
+end

data/lib/activecube/view_definition.rb

@@ -0,0 +1,16 @@
+require 'active_support/concern'
+
+module Activecube::ViewDefinition
+
+    attr_reader :activecube_indexes, :models
+
+    def index index_name, *args
+      (@activecube_indexes ||= []) << Activecube::Processor::Index.new(index_name,*args)
+    end
+
+    def table x
+      (@models ||= []) << x
+    end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.25
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -111,12 +111,16 @@ files:
 - lib/activecube/query/measure.rb
 - lib/activecube/query/measure_nothing.rb
 - lib/activecube/query/modification.rb
+- lib/activecube/query/option.rb
 - lib/activecube/query/ordering.rb
 - lib/activecube/query/selector.rb
 - lib/activecube/query/slice.rb
 - lib/activecube/query_methods.rb
 - lib/activecube/selector.rb
 - lib/activecube/version.rb
+- lib/activecube/view.rb
+- lib/activecube/view_connection.rb
+- lib/activecube/view_definition.rb
 homepage: https://github.com/bitquery/activecube
 licenses:
 - MIT