activecube 0.1.25 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f1e4575a041108004194789f85b9c030c6f7f94083677dee253de3cc878966
-  data.tar.gz: b182640a584166cefc17b7b26e7add652600b0c937f08b83689a02f819bb2bb9
+  metadata.gz: 663ae546f63257569c7692d59478ffef3c954f2c9a74f53c78ae6ee31bdf093c
+  data.tar.gz: df61b6a95415e4879d62b0eada8abcf732d9d7aeca882c72fa28ca929c567db1
 SHA512:
-  metadata.gz: ab68fd59fdbffe5e0b3d4b8f0523d351b5a6c2840090328af0e78ed10c7fc23e402335f99f05d114da175c57d0b12f0d4fa02195a89ab52108af451b2dae0445
-  data.tar.gz: ace9d8f215cb59e930cf66249211405408c2bce905166fbe59370708dea17502d40d2416611297a1d6c06d0f6930ee3e73460775cfe1ad32895030db22a49c65
+  metadata.gz: e25d8a4f05d9880c4c3acbf6854393556902e0339976701949ab5b56bc3d627f20a9790144c19f00903786fa0abd947c2cb866bdc5d41856483cd8e030a281d1
+  data.tar.gz: 418d88e3f5d6249de2781faa1f27cfc42d219538eac7c2d68611735771cf8d2413ac2a1e626559d7b8f0d0248852358a58ea5400af2a561248cb1a591126e49a

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    activecube (0.1.24)
+    activecube (0.1.29)
       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

@@ -31,13 +31,14 @@ module Activecube
 
     include DefinitionMethods
 
-    attr_reader :identity, :fields
+    attr_reader :identity, :identity_expression, :fields
 
     private
 
     def identity_column *args
       raise "Identity already defined as #{identity} for #{self.name}" if @identity
       @identity = args.first
+      @identity_expression = args.second
     end
 
     def field *args
@@ -52,7 +53,7 @@ module Activecube
 
     include DefinitionMethods
 
-    attr_reader :modifiers
+    attr_reader :modifiers, :tuple
 
     private
 
@@ -60,6 +61,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/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 do_optimize
+    def generate_variants vs, metric_i
 
-      @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 }.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 }.map{|c| cost_matrix[m_i][c]}.max || UNLIM_COST )
-              else
-                # unused to unused
-                # cost now > new cost
-                old_cost > new_cost
-              end
-            end
-
-          }
-
-          step << (new_c_i || 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/query/cube_query.rb

@@ -1,6 +1,7 @@
 require 'activecube/query/chain_appender'
 require 'activecube/query/item'
 require 'activecube/query/limit'
+require 'activecube/query/limit_by'
 require 'activecube/query/measure'
 require 'activecube/query/ordering'
 require 'activecube/query/option'
@@ -82,6 +83,12 @@ module Activecube::Query
       self
     end
 
+    def limit_by *args
+      clear_sql
+      options << LimitBy.new(args)
+      self
+    end
+
 
     def query
       sql = to_query.to_sql

data/lib/activecube/query/limit_by.rb

@@ -0,0 +1,19 @@
+module Activecube
+  module Query
+    class LimitBy
+
+      attr_reader :each, :limit, :offset
+      def initialize arguments
+        map = Hash[arguments]
+        @each = map[:each]
+        @limit = map[:limit]
+        @offset = map[:offset] || 0
+      end
+
+      def append_query _model, _cube_query, _table, query
+        query.limit_by each, limit, offset
+      end
+
+    end
+  end
+end

data/lib/activecube/query/slice.rb

@@ -68,11 +68,20 @@ module Activecube::Query
       query = query.project(expr.as(attr_alias))
 
       if dimension.class.identity
+        expr = dimension.class.identity_expression
         group_by_columns.each do |column|
-          if !query.projections.detect{|p| p.kind_of?(::Arel::Attributes::Attribute) && p.name==column}
-            query = query.project(table[column])
+
+          node =  if column==dimension.class.identity && expr
+                    Arel.sql(expr).as(column)
+                  else
+                    table[column]
+                  end
+
+          unless query.projections.include?(node)
+            query = query.project(node)
           end
-          query = query.group(table[column])
+
+          query = query.group( expr ? column : table[column])
         end
       else
         query = query.group(attr_alias)

data/lib/activecube/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.30
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,7 @@ files:
 - lib/activecube/query/cube_query.rb
 - lib/activecube/query/item.rb
 - lib/activecube/query/limit.rb
+- lib/activecube/query/limit_by.rb
 - lib/activecube/query/measure.rb
 - lib/activecube/query/measure_nothing.rb
 - lib/activecube/query/modification.rb