grntest 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa40165815d080049dd1910a6e417d10c669225e5b151882192181f830e24347
-  data.tar.gz: d4c4f85b34059a6d8f4c5ed66e4bc60e7294253dcfd8a0f1fc1dbecb42684912
+  metadata.gz: 8698dc27823fe6b4865c631af65ba6f8cb5393c17c3dffe688d562aa1217941e
+  data.tar.gz: 3ef417fad36461099a6c2b2715aca265e7e8d7a5b71e9e418a5de701f3a5652a
 SHA512:
-  metadata.gz: 595dda68c29ddd69b0cdb5b76c96c3471c811e23d1a0f3a13622d5341ad463db65d0d71a21556675d22e56dc087b167fea64f61886abd9e62d0745a8cf157e13
-  data.tar.gz: bbdf5697336b6e0a7963e7d6b399624829fd3184bf5971c056292a9ac7f9197e28093c980c231772f323e2f072be9a3ceee87021a22d559ee59ffbe4eac3e80a
+  metadata.gz: dd789d02b42adc35269d73590ac50922220dc33740ffa4f36ab9efefec02cfad7f40152e19fb2ca305d8a37b594b94cc4dfdfb72b9e8363fb363e45bf5214ed6
+  data.tar.gz: 35cf29b8cc1ea65ff15ee25fccde7155aab203522e89e8e89955101e3428c7c5bdb036ee1dc8e2a27699eaa7b0dd3642dc33fd8fdcf43be74d5672e429363772

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 1.6.5: 2023-10-24
+
+### Improvements
+
+  * Added support for trace log.
+
+## 1.6.4: 2023-10-21
+
+### Improvements
+
+  * arrow: Added support for metadata normalization.
+
 ## 1.6.3: 2023-09-18
 
 ### 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,33 +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
-                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)
+    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)
-      # TODO: Use schema.metadata with gobject-introspection 3.4.2 and
-      # Red Arrow 0.17.0.
-      schema.fields.collect(&:name) ==
-        ["return_code", "start_time", "elapsed_time"]
+    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)
@@ -826,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.3"
+  VERSION = "1.6.5"
 end

metadata

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