activecube 0.1.40 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5e229585093009dd0f27fc13fb03f4c47800af504431125d6924cec518e5933
-  data.tar.gz: b0f733fc1f6152715c679bbf023648837687f6c835e41163076b6d3840c7c4b2
+  metadata.gz: aec3cd5d380f65b797c530930d4cfaac15b39918527b7c90e2ec54a064207729
+  data.tar.gz: 14c6c81f226ed03143e84478b52a056ed63de31be67bc5f5bbed98fb4004490f
 SHA512:
-  metadata.gz: 1059e6c2ca73b04b25e5c820e57d1a6e4c37131079b864eccc6b5a5d55e31553ba53b2098d32c27588088c8b922eb8b98da1d59afe65129ba1437696832451c5
-  data.tar.gz: 1b25987ebc1638fc745e8730ef6d9eb89468514466df59e6784e442996656aef54c1f8fbc5237ed78f81e1124018813b6ad9dbca4c3e9a553dab303f3137b04b
+  metadata.gz: 508fc6bf05c575b0f7417a3e56a03eb306deafcc9655c166e34233fd98e6ec42321409c0a30a6143195e4eddee352e1114d01d6cce305a0cfb9ca9f6ba243732
+  data.tar.gz: edc18eadd6d0bee5d96423f141e70f480dced3b38afd8f0a05e31112c8ced58fe8ec33b4924790101706cfcf9c5f9364da6be41e31164b5f58f6b4b7fff08b9f

data/Gemfile.lock

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

data/lib/activecube/processor/composer.rb

@@ -75,13 +75,11 @@ module Activecube::Processor
       measures_by_tables = measure_tables.group_by(&:table)
       measures_by_tables.each_pair do |table, list|
         @models << table.model
-        reduce_options = measures_by_tables.count==1 ? cube_query.options : []
-        reduced = cube_query.reduced list.map(&:measure), reduce_options
-        table_query = table.query reduced
+        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/query/cube_query.rb

@@ -61,6 +61,14 @@ module Activecube::Query
       self
     end
 
+    def desc_by_integer *args
+      clear_sql
+      args.each{|arg|
+        options << Ordering.new(arg, :desc, options = {with_length: true})
+      }
+      self
+    end
+
     def asc *args
       clear_sql
       args.each{|arg|
@@ -69,6 +77,14 @@ module Activecube::Query
       self
     end
 
+    def asc_by_integer *args
+      clear_sql
+      args.each{|arg|
+        options << Ordering.new(arg, :asc, options = {with_length: true})
+      }
+      self
+    end
+
     def offset *args
       clear_sql
       args.each{|arg|
@@ -124,36 +140,6 @@ module Activecube::Query
       (measures.map(&:selectors) + slices.map(&:selectors) + selectors).flatten.map(&:required_column_names).flatten.uniq
     end
 
-    def reduced other_measures, other_options
-
-      common_selectors = []
-      other_measures.each_with_index do |m,i|
-        if i==0
-          common_selectors += m.selectors
-        else
-          common_selectors &= m.selectors
-        end
-      end
-
-      if common_selectors.empty?
-        reduced_measures = other_measures
-        reduced_selectors = self.selectors
-      else
-        reduced_measures = other_measures.collect{|m|
-          Measure.new m.cube, m.key, m.definition, (m.selectors - common_selectors), m.modifications
-        }
-        reduced_selectors = self.selectors + common_selectors
-      end
-
-      unless reduced_measures.detect{|rm| rm.selectors.empty? }
-        reduced_selectors += [Selector.or(reduced_measures.map(&:selectors).flatten.uniq)]
-      end
-
-      return self if (reduced_measures == self.measures) && (reduced_selectors == self.selectors)
-
-      CubeQuery.new cube, slices, reduced_measures, reduced_selectors, other_options, tables
-    end
-
     def join_fields
       slices.map(&:group_by_columns).flatten.uniq
     end
@@ -168,4 +154,4 @@ module Activecube::Query
       @composed = nil
     end
   end
-end
+end

data/lib/activecube/query/ordering.rb

@@ -2,15 +2,21 @@ module Activecube
   module Query
     class Ordering
 
-      attr_reader :argument, :direction
-      def initialize argument, direction
+      attr_reader :argument, :direction, :options
+      def initialize argument, direction, options = {}
         @argument = argument
         @direction = direction
+        @options = options
       end
 
       def append_query _model, _cube_query, _table, query
-        text = argument.to_s.split(',').map{|s| quote s}.join(',')
-        query.order(::Arel.sql(text).send(direction))
+        @text = argument.to_s.split(',').map{|s| quote s}.join(',')
+
+        if options[:with_length]
+          return by_length_order(query)
+        end
+
+        simple_order(query)
       end
 
       def quote s
@@ -21,6 +27,21 @@ module Activecube
         end
       end
 
+      private
+
+      attr_reader :text
+
+      def simple_order(query)
+        query.order(::Arel.sql(text).send(direction))
+      end
+
+      def by_length_order(query)
+        query.order(
+          ::Arel.sql("LENGTH(#{text})").send(direction),
+          ::Arel.sql(text).send(direction)
+        )
+      end
+
     end
   end
-end
+end

data/lib/activecube/query_methods.rb

@@ -5,7 +5,7 @@ module Activecube
 
     attr_reader :database, :role
 
-    [:slice, :measure, :when, :desc, :asc, :limit, :offset].each do |method|
+    [:slice, :measure, :when, :desc, :desc_by_integer, :asc, :asc_by_integer, :limit, :offset].each do |method|
       define_method(method) do |*args|
         Query::CubeQuery.new(self).send method, *args
       end

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.40"
+  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.40
+  version: 0.1.43
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord