grntest 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e19e5b6921dc29cf9645c976831b737b6bb94da8272e7a3cf7d85db0fa3a82f0
-  data.tar.gz: 5363b7f2169b9c15a4c3e3eaa26db86cde8ec741fd8b5471bbb108c193ed7191
+  metadata.gz: 44cf9927ecd7ae571341f3eace1b1c385a7c0bff54580152c49b506fa615392a
+  data.tar.gz: e61fa58c6eabab76c080ccb058a1750f9ca1d97c147ceb44b8e1f38a4ee3cf1b
 SHA512:
-  metadata.gz: aa315b1549c5688029785250abf0cc5e5e9033dc9246249ffa086d4c3040c617c007fdd52ed6091a8f539d8013bd88487936fd14bb25246daa57fecbd7bd5ec9
-  data.tar.gz: 0cd8d9dcec896b8fa02f42316aaebe83e8078ea81bbfabfabded590bbc70bd8342960f372b201d59ad3a1864801c6b0f1aab7dff0f136804586ab995a1f46fcc
+  metadata.gz: 0d1224453444660d89607d63f5993b0c2079d9a5f6550a651aac42bcbce89b4449c18e833023d018a25dca1445147817a3fa00a81595a49972b909007a939b37
+  data.tar.gz: 505fbbc841a6ce1fbc59a2cb507145db60f359d78d49b4179b754156734817035ba85fe19bbd9c47ffd0495c16a3d9c9f1b9dd6b3bb3130cec2e14765f12142d

data/doc/text/news.md

@@ -1,5 +1,23 @@
 # News
 
+## 1.7.2: 2024-02-06
+
+### Improvements
+
+  * arrow: Added support for empty result.
+
+  * reporter: benchmark-json: Added support for reporting memory leak
+    information.
+
+  * reporter: benchmark-json: Added interface and in/out types to
+    benchmark name.
+
+## 1.7.1: 2024-02-05
+
+### Improvements
+
+  * benchmark: Removed load preparation part from elapsed time.
+
 ## 1.7.0: 2024-02-05
 
 ### Fixes

data/lib/grntest/base-result.rb

@@ -29,12 +29,12 @@ module Grntest
     ensure
       cpu_finish_time = Process.times
       real_finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @cpu_elapsed_time =
+      @cpu_elapsed_time +=
         (cpu_finish_time.utime - cpu_start_time.utime) +
         (cpu_finish_time.stime - cpu_start_time.stime) +
         (cpu_finish_time.cutime - cpu_start_time.cutime) +
         (cpu_finish_time.cstime - cpu_start_time.cstime)
-      @real_elapsed_time = real_finish_time - real_start_time
+      @real_elapsed_time += real_finish_time - real_start_time
     end
   end
 end

data/lib/grntest/executors/base-executor.rb

@@ -646,11 +646,9 @@ module Grntest
         timeout = @context.timeout
         response = nil
         begin
-          @benchmark_result.measure do
-            @benchmark_result.n_iterations.times do
-              Timeout.timeout(timeout) do
-                response = send_command(command)
-              end
+          @benchmark_result.n_iterations.times do
+            Timeout.timeout(timeout) do
+              response = send_command(command)
             end
           end
         rescue Timeout::Error

data/lib/grntest/executors/http-executor.rb

@@ -127,15 +127,17 @@ module Grntest
         request = Net::HTTP::Post.new(path)
         request.content_type = content_type
         set_request_body(request, body)
-        run_http_request(url) do
-          http = Net::HTTP.new(@host, @port)
-          http.set_debug_output($stderr) if LOAD_DEBUG
-          response = http.start do
-            http.read_timeout = read_timeout
-            http.request(request)
+        @benchmark_result.measure do
+          run_http_request(url) do
+            http = Net::HTTP.new(@host, @port)
+            http.set_debug_output($stderr) if LOAD_DEBUG
+            response = http.start do
+              http.read_timeout = read_timeout
+              http.request(request)
+            end
+            check_response(response)
+            normalize_response_data(command, response.body)
           end
-          check_response(response)
-          normalize_response_data(command, response.body)
         end
       end
 
@@ -150,15 +152,17 @@ module Grntest
           request = Net::HTTP::Get.new(path_with_query)
         end
         url = "http://#{@host}:#{@port}#{path_with_query}"
-        run_http_request(url) do
-          http = Net::HTTP.new(@host, @port)
-          http.set_debug_output($stderr) if DEBUG
-          response = http.start do
-            http.read_timeout = read_timeout
-            http.request(request)
+        @benchmark_result.measure do
+          run_http_request(url) do
+            http = Net::HTTP.new(@host, @port)
+            http.set_debug_output($stderr) if DEBUG
+            response = http.start do
+              http.read_timeout = read_timeout
+              http.request(request)
+            end
+            check_response(response)
+            normalize_response_data(command, response.body)
           end
-          check_response(response)
-          normalize_response_data(command, response.body)
         end
       end
 

data/lib/grntest/executors/standard-io-executor.rb

@@ -29,16 +29,18 @@ module Grntest
         if !command.key?(:output_type) and @output_type
           command_line = command_line.sub(/$/, " --output_type #{@output_type}")
         end
-        begin
-          debug_input(command_line)
-          @input.print(command_line)
-          @input.print("\n")
-          @input.flush
-        rescue SystemCallError
-          message = "failed to write to groonga: <#{command_line}>: #{$!}"
-          raise Error.new(message)
+        @benchmark_result.measure do
+          begin
+            debug_input(command_line)
+            @input.print(command_line)
+            @input.print("\n")
+            @input.flush
+          rescue SystemCallError
+            message = "failed to write to groonga: <#{command_line}>: #{$!}"
+            raise Error.new(message)
+          end
+          read_output(command)
         end
-        read_output(command)
       end
 
       def ensure_groonga_ready

data/lib/grntest/reporters/benchmark-json-reporter.rb

@@ -66,6 +66,13 @@ module Grntest
       end
 
       def on_test_leak(worker, result)
+        output, @output = @output, $stderr
+        begin
+          puts
+          report_test(worker, result)
+        ensure
+          @output = output
+        end
       end
 
       def on_test_omission(worker, result)
@@ -76,11 +83,14 @@ module Grntest
 
       def on_test_finish(worker, result)
         return if result.benchmarks.empty?
-        print(",") unless @first_benchmark
-        puts
-        benchmarks = result.benchmarks.collect do |benchmark|
-          name = "#{worker.suite_name}/#{result.test_name}"
-          <<-JSON.chomp
+        result.benchmarks.each do |benchmark|
+          print(",") unless @first_benchmark
+          @first_benchmark = false
+          puts
+          name = "#{@tester.interface}: " +
+                 "#{@tester.input_type}|#{@tester.output_type}: " +
+                 "#{worker.suite_name}/#{result.test_name}"
+          print(<<-JSON.chomp)
     {
       "name": #{name.to_json},
       "run_name": #{benchmark.name.to_json},
@@ -93,8 +103,6 @@ module Grntest
     }
           JSON
         end
-        print(benchmarks.join(",\n"))
-        @first_benchmark = false
       end
 
       def on_suite_finish(worker)

data/lib/grntest/test-runner.rb

@@ -714,9 +714,8 @@ http {
       Arrow::BufferInputStream.open(buffer) do |input|
         while input.tell < content.bytesize
           reader = Arrow::RecordBatchStreamReader.new(input)
-          schema = reader.schema
-          record_batches = reader.to_a
-          table = Arrow::Table.new(schema, record_batches)
+          table = reader.read_all
+          schema = table.schema
           unless normalized.empty?
             normalized << "=" * 40
             normalized << "\n"

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.7.0"
+  VERSION = "1.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs