activecube 0.1.24 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e08b7128492c4b84b982715355728b6506c0eb4dc155875ef1323bc88e9c9777
-  data.tar.gz: 856d25b480a319b11476c9d388f20aa656325f812299018c67df6b44bed322e8
+  metadata.gz: 21b32d45c2412d7be46e4f044b3287262b5014ad617ac9929fc0f740c7c64520
+  data.tar.gz: f5c97c62544274087c0ca1cfedf403384f3dc04bb05ba327cc2c51a6a5bc9ff0
 SHA512:
-  metadata.gz: 76d9c60cfba31ac7f65f819dc1e5b8b0d6689aebbb162f8677f45e7388442dfc7d581e2bec945478d058891f61fc2b7b34de5b7e79f40c510bb88c1f21647547
-  data.tar.gz: 880550994778371e8dbd416691bc252a51de37123557ee73ad4c4ac5dcdb273a2a29084787c311b7219629cf42ac782302e664a495e5870deb69e4a6a8323730
+  metadata.gz: ee2dd6dc3bcb0b4f1b2acc83aceb94d677564d2c70c51646018b0b91c2e168f41459cc0e7541e5b4182aebb8bc4e288d88ae2fc017836ca2d1475afb0c28f019
+  data.tar.gz: '0709d3aa9adef226869f016a46d58a11cbfee94315fac2f22c7740ca3bf215c8ab691191a9b6ce50e69ed3ff072de84993bc313cf86f9095b41a71cf5be88072'

data/Gemfile.lock

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

data/README.md

@@ -121,6 +121,12 @@ index ['currency_id'], cardinality: 4
 index ['currency_id','date'], cardinality: 6
 ```
 
+You can require using index in some cases. If required: true added, the table will be used **only** in case when this field is used
+in query metric, dimension or selector.
+```ruby
+index ['currency_id'], cardinality: 4, required: true
+```
+
 ### Query language
 
 You use the cube class to create and execute queries.

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

@@ -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/index.rb

@@ -2,16 +2,20 @@ module Activecube
   module Processor
     class Index
 
-      attr_reader :fields, :cardinality
+      attr_reader :fields, :cardinality, :required
       def initialize name, *args
         @fields = [name].flatten
         @cardinality = args.first && args.first[:cardinality]
+        @required = args.first && args.first[:required]
       end
 
       def indexes? query, measures
         (fields - query.selector_column_names(measures)).empty?
       end
 
+      def matches? query, measures
+        !required ||   (fields -  query.column_names(measures)).empty?
+      end
     end
   end
 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/processor/table.rb

@@ -12,7 +12,8 @@ module Activecube::Processor
     end
 
     def matches? query, measures = query.measures
-      (query.column_names(measures)-model.attribute_types.keys).empty?
+      (query.column_names(measures)-model.attribute_types.keys).empty? &&
+          !model.activecube_indexes.detect{|index| !index.matches?(query, measures) }
     end
 
     def measures? measure

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.24"
+  VERSION = "0.1.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.29
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord