portolan 0.1.0.pre.1 → 0.1.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ddd564427e8a47bf2013520a1f2adb0de2970481c6c83f55f20ea4cd751c818
-  data.tar.gz: ffe366aa7c3f03197e814f68648d1463b54c57f155af0ffa0782495e58390c85
+  metadata.gz: 557009d4c18190afccf70236dd6697ce44463bf51a278e6730a493f6f4235d01
+  data.tar.gz: 3caa4daa83800e0c510f60c377bf999f36510fba94dfc928532489a97a805492
 SHA512:
-  metadata.gz: 1d696d9332f633dec4a9eb3231d538288c6aa17e387277cb4f75234b0d8f69f8a397e2dddd4019e3f0adb9e92616f5a4bcb919c3609d4cc24972f6176d022014
-  data.tar.gz: 96e1499eb19e2f94e7d16811553fa5fa29dc3d686c318a63c318b2c14015970846569794aa5e1d14b443a9952c361392b0167d4a0790b8d88985252a918a3a1d
+  metadata.gz: f1edc5628a9cfcf11ff46e2e86bb7f7db491f26cb9785193ccd3025f37463421f73c434966127fa359bc8d077d2d1ec2a9e451b491acb7fa237c84583d00eb32
+  data.tar.gz: 0cc74bd0d2f599f602f1613ca8b57b5f303ca9f5af3099d46a460cf8d591e1f6b18ebe68c5feb568be0d7a1d9c8da8cd2b61726c98b460d110b4f6ab6c633d4d

data/README.md

@@ -184,11 +184,15 @@ in Ruby).
 - Dimensions cannot join through a `has_many` or a polymorphic association; see
   the grain rule above.
 - The timeout applies to each SQL statement, not to the whole request. Grouping
-  by buckets runs one statement per bucket combination.
+  by buckets runs one or two statements per bucket combination.
+- Without a date dimension, the database sorts the groups by the measure and
+  returns at most the row limit, largest first; a second statement counts
+  them for the truncation note. A series loads every group, up to the group
+  limit, so it can keep whole periods.
 - Your `relation` block runs before Portolan's guard is in place, so it should
   build a relation, not run queries itself.
-- The timeout (5 seconds), row limit (50), group limit (10,000), and number of
-  bucket combinations (50) are fixed for now.
+- The timeout (5 seconds), row limit (50), group limit for series (10,000), and
+  number of bucket combinations (50) are fixed for now.
 
 ## Why the name?
 

data/lib/portolan/measure.rb

@@ -24,6 +24,15 @@ module Portolan
       end
     end
 
+    def node(scope)
+      case aggregate
+      when :count then Arel.star.count
+      when :count_distinct then scope.arel_table[column].count(true)
+      when :sum then scope.arel_table[column].sum
+      when :average then scope.arel_table[column].average
+      end
+    end
+
     def describe = { name:, description: }
     def label(value) = value.is_a?(::BigDecimal) ? value.to_f : value
 

data/lib/portolan/query/aggregate.rb

@@ -76,26 +76,26 @@ module Portolan
       def period = @params['period']
 
       def answer(scope)
-        rows = measured_rows(scope)
+        rows, total_rows = measured_rows(scope)
         raise Refused, TOO_MANY_GROUPS if rows.size > GROUP_LIMIT
 
-        rows = sorted(rows)
-        Result.new(request:, rows: trimmed(rows), definitions:, total_rows: rows.size)
+        Result.new(request:, rows: trimmed(sorted(rows)), definitions:, total_rows:)
       end
 
       def measured_rows(scope)
         bucket_dimensions, column_dimensions = group_dimensions.partition(&:buckets?)
         rows = []
+        total_rows = 0
 
         bucket_combinations(bucket_dimensions).each do |combination|
           narrowed = combination.reduce(scope) { |current, (_dimension, bucket)| bucket.apply(current) }
           bucket_labels = combination.to_h { |dimension, bucket| [dimension.name, bucket.name] }
-          grouped_values(narrowed, column_dimensions).each do |keys, value|
-            rows << row(bucket_labels, column_dimensions.zip(keys), value)
-          end
+          values, group_count = grouped_values(narrowed, column_dimensions)
+          values.each { |keys, value| rows << row(bucket_labels, column_dimensions.zip(keys), value) }
+          total_rows += group_count
           break if rows.size > GROUP_LIMIT
         end
-        rows
+        [rows, total_rows]
       end
 
       def bucket_combinations(dimensions)
@@ -112,15 +112,31 @@ module Portolan
       end
 
       def grouped_values(scope, dimensions)
-        return [[[], measure.call(scope)]] if dimensions.empty?
+        return [[[[], measure.call(scope)]], 1] if dimensions.empty?
 
-        grouped = dimensions.reduce(scope) do |current, dimension|
+        grouped = grouped_scope(scope, dimensions)
+        return largest_first(grouped, dimensions) unless time_dimension
+
+        values = keyed(measure.call(grouped.limit(GROUP_LIMIT + 1)), dimensions)
+        [values, values.size]
+      end
+
+      def grouped_scope(scope, dimensions)
+        dimensions.reduce(scope) do |current, dimension|
           current = dimension.join(current)
           current.group(group_expression(current, dimension))
         end
-        measure.call(grouped.limit(GROUP_LIMIT + 1)).map { |keys, value| [dimensions.one? ? [keys] : keys, value] }
       end
 
+      def largest_first(grouped, dimensions)
+        largest = grouped.order(measure.node(grouped).desc.nulls_last).limit(limit)
+        [keyed(measure.call(largest), dimensions), group_count(grouped)]
+      end
+
+      def group_count(grouped) = grouped.klass.unscoped.from(grouped.select(Arel.sql('1')), :groups).count
+
+      def keyed(values, dimensions) = values.map { |keys, value| [dimensions.one? ? [keys] : keys, value] }
+
       def group_expression(scope, dimension) = dimension.type.group(dimension.column(scope), period)
 
       def row(bucket_labels, keyed, value)

data/lib/portolan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Portolan
-  VERSION = '0.1.0.pre.1'
+  VERSION = '0.1.0.pre.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: portolan
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.1
+  version: 0.1.0.pre.2
 platform: ruby
 authors:
 - David Busse