activecube 0.1.42 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7074b394ca4949bf0bedae97ac91b59ef8d742cb7c6ab77e5409345d77caa7bd
-  data.tar.gz: e7872e83b417e7e9d34acd329627e68d8d1424771e507fd345bd4edac0bc04e9
+  metadata.gz: aec3cd5d380f65b797c530930d4cfaac15b39918527b7c90e2ec54a064207729
+  data.tar.gz: 14c6c81f226ed03143e84478b52a056ed63de31be67bc5f5bbed98fb4004490f
 SHA512:
-  metadata.gz: 693c8954a658b15c5f6f314b189fbff0a13777a8a84fbf1354d70610dabc903ef7be60475a4253e5bdd72e067a4a31aaaddb0821fa4949a4347be0abd5d28c02
-  data.tar.gz: 2a04854410822d43e2b4e29b53c062cdf59b971137978081147133956fd1108e2bd1b633782347075e7aa81cc9d237d8da92d148f5064d4697ee20d3be56944c
+  metadata.gz: 508fc6bf05c575b0f7417a3e56a03eb306deafcc9655c166e34233fd98e6ec42321409c0a30a6143195e4eddee352e1114d01d6cce305a0cfb9ca9f6ba243732
+  data.tar.gz: edc18eadd6d0bee5d96423f141e70f480dced3b38afd8f0a05e31112c8ced58fe8ec33b4924790101706cfcf9c5f9364da6be41e31164b5f58f6b4b7fff08b9f

data/Gemfile.lock

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

data/lib/activecube/processor/composer.rb

@@ -75,11 +75,11 @@ module Activecube::Processor
       measures_by_tables = measure_tables.group_by(&:table)
       measures_by_tables.each_pair do |table, list|
         @models << table.model
-        table_query = table.query cube_query
+        table_query = table.query cube_query, list.map(&:measure)
         composed_query = composed_query ? table.join(cube_query, composed_query, table_query) : table_query
       end
       composed_query
     end
 
   end
-end
+end

data/lib/activecube/processor/optimizer.rb

@@ -6,6 +6,7 @@ module Activecube::Processor
     MAX_ITERATIONS = 3
 
     attr_reader :tables_count, :metrics_count, :cost_matrix
+
     def initialize cost_matrix
       @cost_matrix = cost_matrix
       @cache = ActiveSupport::Cache::MemoryStore.new
@@ -18,10 +19,9 @@ module Activecube::Processor
         @tables_count = cost_matrix.map(&:count).max
         @metrics_count = cost_matrix.count
 
-        (tables_count==1 || metrics_count==0) ? [0]*metrics_count : do_optimize
-
-       end
+        (tables_count == 1 || metrics_count == 0) ? [0] * metrics_count : do_optimize
 
+      end
 
     end
 
@@ -29,42 +29,96 @@ module Activecube::Processor
 
     def generate_variants vs, metric_i
 
-      return vs if metric_i==metrics_count
+      return vs if metric_i == metrics_count
 
       metric_tables = cost_matrix[metric_i].map.with_index do |c, index|
         [index] if c
       end.compact
 
-      vsnew = if metric_i==0
-         metric_tables
-      else
-        arry = []
-        vs.each do |v|
-          metric_tables.each{|newv|
-            arry << (v + newv)
-          }
-        end
-        arry
-      end
+      vsnew = if metric_i == 0
+                metric_tables
+              else
+                arry = []
+                vs.each do |v|
+                  metric_tables.each { |newv|
+                    arry << (v + newv)
+                  }
+                end
+                arry
+              end
 
-      generate_variants vsnew, metric_i+1
+      generate_variants vsnew, metric_i + 1
 
     end
 
     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
+        arry.map(&:second).map { |metric_index| cost_matrix[metric_index][table_index] }.max
       end.sum
     end
 
     def do_optimize
 
-      variants = generate_variants [], 0
-      variant_costs = variants.map{|v| cost_for v}
+      # variants = generate_variants [], 0
+      variants = gen_reduced_variants
+      variant_costs = variants.map { |v| cost_for v }
       variants[variant_costs.each_with_index.min.second]
 
     end
 
-  end
+    def gen_permutations(n, k)
+      seq = *(0...n)
+      perm = seq.slice(0, k)
+      perms = []
+
+      while true
+        perms.push perm.dup
+        flag = true
+        i = 0
+        ((k - 1)...-1).step(-1).each do |ii|
+          i = ii
+          if perm[ii] < n - 1
+            flag = false
+            break
+          end
+        end
+        return perms if flag
+
+        perm[i] += 1
+        ((i + 1)...k).each { |j| perm[j] = 0 }
+      end
+    end
 
+    def gen_reduced_variants
+      # reduce size of cost_matrix deleting duplicates
+      uniq_rows = []
+      rows_indices = {}
+      cost_matrix.each_with_index do |row, i|
+        flag = false
+
+        uniq_rows.each_with_index do |u_row, j|
+          if u_row.eql? row
+            flag = true
+            rows_indices[i] = j
+          end
+        end
+
+        unless flag
+          rows_indices[i] = uniq_rows.length
+          uniq_rows.push(row)
+        end
+      end
+
+      # generating variants for reduced matrix
+      vars = gen_permutations(tables_count, uniq_rows.length)
+
+      # restore variants for full matrix
+      vars.map do |variant|
+        full_v = Array.new(metrics_count)
+        rows_indices.each { |k, v| full_v[k] = variant[v] }
+
+        full_v
+      end
+    end
+  end
 end

data/lib/activecube/processor/table.rb

@@ -20,12 +20,12 @@ module Activecube::Processor
       (measure.required_column_names - model.attribute_types.keys).empty?
     end
 
-    def query cube_query
+    def query cube_query, measures = cube_query.measures
 
       table = model.arel_table
       query = table
 
-      (cube_query.slices + cube_query.measures + cube_query.selectors + cube_query.options).each do |s|
+      (cube_query.slices + measures + cube_query.selectors + cube_query.options).each do |s|
         query = s.append_query model, cube_query, table, query
       end
 
@@ -52,4 +52,4 @@ module Activecube::Processor
 
 
   end
-end
+end

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.42"
+  VERSION = "0.1.43"
 end

data/lib/activecube/view.rb

@@ -22,7 +22,7 @@ module Activecube
       true
     end
 
-    def query _cube_query
+    def query _cube_query, measures = _cube_query.measures
       raise "query method have to be implemented in #{name}"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.43
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord