grntest 1.6.4 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce455333ded86e81b262c5bb46ffd1d712b08a6d15135aa18f39a52e2258f6e
-  data.tar.gz: 26324018775c7543a54d3caeac5ff782799182c76fb591e9cf50ad0532e33340
+  metadata.gz: cb9c21dbf97a69dcd226668ff67f8443bf8ab3e57559137c78180ec07c85a147
+  data.tar.gz: 5aa1f037756aa689fff0e5d665fe747ed65d9b2a9f0953015feca997b460a300
 SHA512:
-  metadata.gz: 3869551fa9869d793f80dca800ca9fb6396a2c26abd0cd414eec6dbd79456dbbffc305732fc53cb55b1ae7f424bf9602d5ffec6d2a28a827d9be14bfd6ee8c59
-  data.tar.gz: 6ec7b1118ffd8e70f3d044b10a5f3704b2c5811cda23da8eab23c8df37356b35fb1a4e6b994958705035dcb01afbbff46f5ba83840fd64172bdbea807b42b6e9
+  metadata.gz: eb052fcb4fd03ca1b757cb4fe96f341e9214efd522f8269463267f1be16a6556f1a489e4c1fca6c94934eceff00cdd03002f32e83e6595d4ca4ae941b61ca6d2
+  data.tar.gz: 838ca099c5ea3db31f6754f4b78ec6c5d76de23fe1fd184a5579b0e4eeba399d32c779e4057dc7a6571aa6e011bcbf538b30b25ba2c50191cf278c5495430d12

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 1.6.6: 2023-10-24
+
+### Improvements
+
+  * arrow: Removed a needless new line.
+
+## 1.6.5: 2023-10-24
+
+### Improvements
+
+  * Added support for trace log.
+
 ## 1.6.4: 2023-10-21
 
 ### Improvements

data/lib/grntest/test-runner.rb

@@ -664,6 +664,10 @@ http {
                            "header" => normalize_header(response["header"]),
                            "body"   => normalize_body(response["body"]),
                          })
+        if normalized_response.key?("trace_log")
+          normalized_response["trace_log"] =
+            normalize_trace_log(normalized_response["trace_log"])
+        end
       else
         header, *values = response
         normalized_header = normalize_header(header)
@@ -704,40 +708,57 @@ http {
             normalized << schema.to_s
           end
           normalized << "\n"
-          if apache_arrow_metadata?(schema)
-            normalized_records = table.each_record.collect do |record|
-              normalized_record = []
-              record.to_h.each do |name, value|
-                case name
-                when "start_time", "elapsed_time"
-                  value = 0
-                when "error_message"
-                  value = normalize_error_message(value) if value
-                when "error_file"
-                  value = normalize_error_file_path(value) if value
-                when "error_line"
-                  value = 0 if value
-                when "error_function"
-                  value = normalize_error_function(value) if value
-                end
-                normalized_record << value
-              end
-              normalized_record
-            end
-            noramlized_table = Arrow::Table.new(schema, normalized_records)
-            normalized << noramlized_table.to_s
+          case (schema.metadata || {})["GROONGA:data_type"]
+          when "metadata"
+            normalized_table = normalize_apache_arrow_content_metadata(table)
+            normalized << normalized_table.to_s
+          when "trace_log"
+            normalized_table = normalize_apache_arrow_content_trace_log(table)
+            normalized << normalized_table.to_s
           else
             normalized << table.to_s
           end
         end
       end
-      normalized
+      normalize_raw_content(normalized.chomp)
+    end
+
+    def normalize_apache_arrow_content_metadata(table)
+      normalized_records = table.each_record.collect do |record|
+        normalized_record = []
+        record.to_h.each do |name, value|
+          case name
+          when "start_time", "elapsed_time"
+            value = 0
+          when "error_message"
+            value = normalize_error_message(value) if value
+          when "error_file"
+            value = normalize_error_file_path(value) if value
+          when "error_line"
+            value = 0 if value
+          when "error_function"
+            value = normalize_error_function(value) if value
+          end
+          normalized_record << value
+        end
+        normalized_record
+      end
+      Arrow::Table.new(table.schema, normalized_records)
     end
 
-    def apache_arrow_metadata?(schema)
-      metadata = schema.metadata
-      return false if metadata.nil?
-      metadata["GROONGA:data_type"] == "metadata"
+    def normalize_apache_arrow_content_trace_log(table)
+      normalized_columns = table.columns.collect do |column|
+        case column.name
+        when "elapsed_time"
+          normalized_elapsed_times =
+            column.data_type.build_array(column.n_rows.times.to_a)
+          Arrow::Column.new(Arrow::Table.new(elapsed_time: normalized_elapsed_times),
+                            0)
+        else
+          column
+        end
+      end
+      Arrow::Table.new(table.schema, normalized_columns)
     end
 
     def normalize_output_xml(content, options)
@@ -833,6 +854,20 @@ http {
       end
     end
 
+    def normalize_trace_log(trace_log)
+      if trace_log["logs"]
+        elapsed_time_index = trace_log["columns"].index do |column|
+          column["name"] == "elapsed_time"
+        end
+        normalized_elapsed_time = 0
+        trace_log["logs"].each do |log|
+          log[elapsed_time_index] = normalized_elapsed_time
+          normalized_elapsed_time += 1
+        end
+      end
+      trace_log
+    end
+
     def normalize_error(content)
       content = normalize_error_message(content)
       normalize_raw_content(content)

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.6.4"
+  VERSION = "1.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs