activecube 0.1.23 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4761a4080baea000688c32cd35753b72f0fd51d7e6a0818da31c8bd5141f966
-  data.tar.gz: e5116aa48a23176bd91f4e90bbf6d83ac300c09aa3c04a951afbe8eeb3918133
+  metadata.gz: d73be89ca360efa3b43a5d7995d68f900c536d4675e0aacfaab4f6b299d77986
+  data.tar.gz: a6dac69d2602c165af3125b5df873e06c15deb744013dc474adcf38280d91161
 SHA512:
-  metadata.gz: 2638118ea471ff784d1689a86dde10a535dcfd0e4eabeb93a9b6206236f116017ffe5d08de03820adb45d5e4291b42ca853c755efa5cddf37d664a09e3122ea9
-  data.tar.gz: 6339c6bad22e0c0fbebbd2e8987ccac2085374fa31e274c902963b5de5b8f5dd6531b19dc95c79ccf9e1722ee277bb469a1bddc03d41d991d8fe64cafa61c63e
+  metadata.gz: e8b45d8a7be9b2f1c4902730c8687157475f211159dd79a69de4ab14d2faeed8904038a825c4ead3097b42434ed6f59423dbe2cba50a9b3e6870d343b8ac13e0
+  data.tar.gz: 5a51761701938e264dad5c42190ef0bf74b415dbd89b89cb5b32d68c9f3356fc4f445067168a3c2119c798cb8118b4fe31700a23c137ff37858ce83ed047aa00

data/Gemfile.lock

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

data/lib/activecube/common/metrics.rb

@@ -2,7 +2,7 @@ module Activecube::Common
 
   module Metrics
 
-    METHODS = [:count, :minimum,:maximum,:average,:sum,:uniqueExact,:unique,:median,:any,:anyLast]
+    METHODS = [:count, :minimum,:maximum,:average,:sum,:uniqueExact,:unique,:median,:medianExact,:any,:anyLast]
 
     METHODS.each do |fname|
 

data/lib/activecube/definition_methods.rb

@@ -52,7 +52,7 @@ module Activecube
 
     include DefinitionMethods
 
-    attr_reader :modifiers
+    attr_reader :modifiers, :tuple
 
     private
 
@@ -60,6 +60,9 @@ module Activecube
       (@modifiers ||= {} )[args.first.to_sym] = Modifier.new( *args)
     end
 
+    def tuple_fields *args
+      @tuple = args
+    end
   end
 
 end

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

@@ -18,7 +18,7 @@ module Activecube::Processor
         @tables_count = cost_matrix.map(&:count).max
         @metrics_count = cost_matrix.count
 
-        tables_count==1 ? [0]*metrics_count : do_optimize
+        (tables_count==1 || metrics_count==0) ? [0]*metrics_count : do_optimize
 
        end
 
@@ -27,95 +27,41 @@ module Activecube::Processor
 
     private
 
+    def generate_variants vs, metric_i
 
-    def do_optimize
-      @tables_by_metrics = []
+      return vs if metric_i==metrics_count
 
-      # sort metrics from low min cost to higher min costs ( by all applicable tables )
-      sort_metrics
+      metric_tables = cost_matrix[metric_i].map.with_index do |c, index|
+        [index] if c
+      end.compact
 
-      # fill initial @tables_by_metrics by selecting tables with minimum cost for metrics.
-      # If there are more than one table with this minimum cost, then select already selected table with maximum cost
-      select_min_cost_by_metric
+      vsnew = if metric_i==0
+         metric_tables
+      else
+        arry = []
+        vs.each do |v|
+          metric_tables.each{|newv|
+            arry << (v + newv)
+          }
+        end
+        arry
+      end
 
-      # make iterations over @tables_by_metrics ( max MAX_ITERATIONS)
-      iterates
+      generate_variants vsnew, metric_i+1
 
-      @tables_by_metrics
     end
 
-    def sort_metrics
-      @metrics_index_sorted = (0...metrics_count).sort_by{|m_i| cost_matrix[m_i].compact.min || UNLIM_COST }
+    def cost_for variant
+      variant.each_with_index.group_by(&:first).collect do |table_index, arry|
+        arry.map(&:second).map{|metric_index| cost_matrix[metric_index][table_index] }.max
+      end.sum
     end
 
-    def select_min_cost_by_metric
-
-      @metrics_index_sorted.collect do |m_i|
-
-        table_index_cost = (0...tables_count).map{|c_i| [c_i,
-                                                        cost_matrix[m_i][c_i] || UNLIM_COST,
-                                                        (@tables_by_metrics.include?(c_i) ? -cost_matrix[@tables_by_metrics.index(c_i)][c_i] : 0)
-        ]}.sort_by(&:third).sort_by(&:second)
-
-        @tables_by_metrics[m_i] = table_index_cost.first.first
-
-      end
-    end
-
-    def iterates
-
-      steps = [@tables_by_metrics]
-
-      (1..MAX_ITERATIONS).each do |iteration|
-
-        step = []
-        prev_step = steps.last
-
-        prev_step.each_with_index {|c_i, m_i|
-
-          table_included_times = prev_step.select{|c| c==c_i }.count
-          old_cost = cost_matrix[m_i][c_i]
-          new_c_i = (0...tables_count).detect{|c_n|
-            new_cost = cost_matrix[m_i][c_n]
-            next if c_i==c_n || new_cost.nil?
-            new_table_included_times = prev_step.select{|c| c==c_n }.count
-
-            if old_cost.nil?
-              # if we have non indexed table now
-              true
-            elsif table_included_times>1
-              if new_table_included_times>0
-                # table to used table if
-                # cost now > new cost
-                old_cost > new_cost
-              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 )
-              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 )
-              else
-                # unused to unused
-                # cost now > new cost
-                old_cost > new_cost
-              end
-            end
-
-          }
-
-          step << c_i || new_c_i
-
-        }
-
-        break if steps.include? step
-        steps << step
-      end
+    def do_optimize
 
-      @tables_by_metrics = steps.last
+      variants = generate_variants [], 0
+      variant_costs = variants.map{|v| cost_for v}
+      variants[variant_costs.each_with_index.min.second]
 
     end
 

data/lib/activecube/query/cube_query.rb

@@ -14,7 +14,7 @@ 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
@@ -36,18 +36,22 @@ module Activecube::Query
     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)
       }
@@ -55,6 +59,7 @@ module Activecube::Query
     end
 
     def asc *args
+      clear_sql
       args.each{|arg|
         options << Ordering.new( arg, :asc)
       }
@@ -62,6 +67,7 @@ module Activecube::Query
     end
 
     def offset *args
+      clear_sql
       args.each{|arg|
         options << Limit.new( arg, :skip)
       }
@@ -69,6 +75,7 @@ module Activecube::Query
     end
 
     def limit *args
+      clear_sql
       args.each{|arg|
         options << Limit.new( arg, :take)
       }
@@ -77,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
@@ -136,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/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.23"
+  VERSION = "0.1.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.28
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord