jrf 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac8b4b0fe2489c04dcba49752df7143f7e218de9f21b0496e2c3fdd2f732088
-  data.tar.gz: 2787cc4714d0e99909c4430fe23aca1fcaae1c25a079f15b2092861b53c4f5ea
+  metadata.gz: e826b340d1d48d7e8cdd3de9b619e5b019f1b568794d0d306b4001f93b5478b8
+  data.tar.gz: 061102212643ccfd8654c31e3c8b7e48b6f1bc0131dcac77badb0295a7074d84
 SHA512:
-  metadata.gz: 61f498f33e794258ebed00a468aa779ece52eff4c29d0538f7bc1601391d0a6948c32ed5dfbd76439e55a283ad4c59dc8312254711341dae2b7e79bf45b8a0a0
-  data.tar.gz: 92e1c46977cf3d841c8469fcf7e757cfcb4b6c60e800b063771bed3cc88eac7622e7d9a0c4aab906cefd60d046fe77a1f4e2f932d37687c952db3a598a0f3b1c
+  metadata.gz: '09883c9cd3ba7f52190df336553cfd45156a90f400a4b87099a86c7e753dab2e07dbe73cfea1c45fb37ca88cb06ebee7f15e286988c0ec42fe526599d897b355'
+  data.tar.gz: 5d8d0cc2d749c647a3587d2cf8659876a55e8fe8a41e38a9183ad3551b6cca2f16f99ba7c806aebbe0f82afcd5b2c4e026f81fb781f338a6898d4d807f15c347

data/lib/jrf/row_context.rb

@@ -136,25 +136,31 @@ module Jrf
     end
 
     define_reducer(:percentile) do |ctx, value, percentage, block: nil|
-      percentages = percentage.is_a?(Array) ? percentage : [percentage]
-      percentages.each { |p| ctx.send(:validate_percentile!, p) }
-      scalar = !percentage.is_a?(Array)
-
-      finish =
-        if scalar
-          ->(values) { [ctx.send(:percentile_value, values.sort, percentages.first)] }
-        else
-          ->(values) {
-            sorted = values.sort
-            [percentages.map { |p| ctx.send(:percentile_value, sorted, p) }]
-          }
-        end
-
       {
         value: value,
-        initial: -> { [] },
-        finish: finish,
-        step: ->(acc, v) { v.nil? ? acc : (acc << v) }
+        initial: {config: -> {
+          scalar = !percentage.is_a?(Enumerable)
+          percentages = scalar ? [percentage] : percentage.to_a
+          percentages.each { |p| ctx.send(:validate_percentile!, p) }
+          [scalar, percentages]
+        }, values: []},
+        finish: ->(state) {
+          scalar, percentages = state.fetch(:config)
+          sorted = state.fetch(:values).sort
+          if scalar
+            [ctx.send(:percentile_value, sorted, percentages.first)]
+          else
+            [percentages.map { |p| ctx.send(:percentile_value, sorted, p) }]
+          end
+        },
+        step: ->(state, v) {
+          config = state.fetch(:config)
+          state[:config] = config.call if config.respond_to?(:call)
+          return state if v.nil?
+
+          state.fetch(:values) << v
+          state
+        }
       }
     end
 

data/lib/jrf/stage.rb

@@ -51,8 +51,9 @@ module Jrf
       (@mode == :reducer) ? Control::DROPPED : result
     end
 
-    def step_reduce(value, initial:, finish: nil, &step_fn)
+    def step_reduce(value, initial:, finish: nil, step_fn: nil, &step_block)
       idx = @cursor
+      step_fn ||= step_block
 
       if @reducers[idx].nil?
         finish_rows = finish || ->(acc) { [acc] }

data/lib/jrf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jrf
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

data/test/jrf_test.rb

@@ -469,6 +469,14 @@ assert_equal(
   "array percentile output"
 )
 
+stdout, stderr, status = run_jrf('percentile(_["foo"], 0.25.step(1.0, 0.25))', input_sum)
+assert_success(status, stderr, "enumerable percentile")
+assert_equal(
+  ['[1,2,3,4]'],
+  lines(stdout),
+  "enumerable percentile output"
+)
+
 input_with_nil = <<~NDJSON
   {"foo":1}
   {"foo":null}
@@ -942,6 +950,30 @@ assert_equal([[5, 7]], j.call([{"a" => 1, "b" => 2}, {"a" => 2, "b" => 3}]), "li
 j = Jrf.new(proc { group_by(_["k"]) { count() } })
 assert_equal([{"x" => 2, "y" => 1}], j.call([{"k" => "x"}, {"k" => "x"}, {"k" => "y"}]), "library group_by")
 
+# reducer configuration is fixed by the first row
+j = Jrf.new(proc { percentile(_["a"], _["p"]) })
+assert_equal([2], j.call([{"a" => 1, "p" => 0.5}, {"a" => 2, "p" => [0.5, 1.0]}, {"a" => 3, "p" => [0.5, 1.0]}]), "library percentile configuration fixed by first row")
+
+counting_percentiles = Class.new do
+  include Enumerable
+
+  attr_reader :each_calls
+
+  def initialize(values)
+    @values = values
+    @each_calls = 0
+  end
+
+  def each(&block)
+    @each_calls += 1
+    @values.each(&block)
+  end
+end.new([0.25, 0.5, 1.0])
+
+j = Jrf.new(proc { percentile(_["a"], counting_percentiles) })
+assert_equal([[1, 2, 3]], j.call([{"a" => 1}, {"a" => 2}, {"a" => 3}]), "library percentile enumerable values")
+assert_equal(1, counting_percentiles.each_calls, "library percentile materializes enumerable once")
+
 # reducer then passthrough
 j = Jrf.new(
   proc { sum(_["a"]) },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrf
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - kazuho