groonga-client 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad8ac6fe851f63509ad13e5c8abb1541ff2f47631764b86bc23ffc85719ae56a
-  data.tar.gz: 558bc6f1e08568791ca791a3be107b9f075864096bf003ca9cb37dc273a7479b
+  metadata.gz: 5eff655174ca6884d2bfb486f8bbdf482f1eb01f9cccc0340670cce03a6233ea
+  data.tar.gz: 3b98a877d32035990fa3f955fbd540b9e20ad9b5757c86dcdc855114c82713eb
 SHA512:
-  metadata.gz: 9bde0f05e3d9a17f545bacad7cd6c91099ea65e1371d015860b5f18d714b31d875ba615b21ac6c8bba15333ce7f760b673c6ecf31e8daa8ebc726b79f53618a8
-  data.tar.gz: e992b6e14dac0073485a909886c128acca19af991a9d45dc89a57ed1557754a9ab5fe38edd687bcbd86a571dc0155264752b671cf1861e2353c9a12f40309507
+  metadata.gz: 0ab452bca052b4258c0271960c7ff9689cea77cbb2b642f224195809361bdf6d7e18ec1347d01bb558aed0496f0e970f97d1df9ef0b5743a8d861a9e4dcd1639
+  data.tar.gz: 186fa2f3260fe48bc56295fed075fc9617f9b9f559390f63a2a3ca7f37cd75e9db07ab0aae63959ed605c44656cdb878896381068fad6d81c96d15715caf3aab

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # NEWS
 
+## 0.6.8 - 2023-11-07
+
+### Improvements
+
+  * Added support for `output_trace_log`.
+
+## 0.6.7 - 2022-01-07
+
+### Improvements
+
+  * `load`: Added support for `Arrow::Table`.
+
 ## 0.6.6 - 2021-12-10
 
 ### Improvements

data/lib/groonga/client/command-line/groonga-client.rb

@@ -167,7 +167,12 @@ module Groonga
           def process_response(response, command)
             case command.output_type
             when :json
-              puts(JSON.pretty_generate([response.header, response.body]))
+              output = {"header" => response.header}
+              if response.trace_logs
+                output["trace_logs"] = response.trace_logs
+              end
+              output["body"] = response.body
+              puts(JSON.pretty_generate(output))
             when :xml
               puts(response.raw)
             else

data/lib/groonga/client/command-processor.rb

@@ -25,9 +25,9 @@ module Groonga
         @client = client
         @split_load_chunk_size = options[:split_load_chunk_size] || 10000
         @generate_request_id   = options[:generate_request_id]
-        @target_commands       = options[:target_commands]
-        @target_tables         = options[:target_tables]
-        @target_columns        = options[:target_columns]
+        @target_commands       = options[:target_commands] || []
+        @target_tables         = options[:target_tables] || []
+        @target_columns        = options[:target_columns] || []
         @load_values = []
         @parser = create_command_parser
       end
@@ -46,7 +46,7 @@ module Groonga
           last_line = line
           @parser << line
         end
-        if last_line and last_line.end_with?("\n")
+        if last_line and not last_line.end_with?("\n")
           @parser << "\n"
         end
       end

data/lib/groonga/client/protocol/http/synchronous.rb

@@ -168,11 +168,17 @@ module Groonga
                                         command.arguments,
                                         [])
             command.path_prefix = path_prefix
-            case @options[:load_input_type]
+            load_input_type = @options[:load_input_type]
+            if defined?(Arrow) and command[:values].is_a?(Arrow::Table)
+              load_input_type = "apache-arrow"
+              arrow_table = command[:values]
+            elsif load_input_type == "apache-arrow"
+              arrow_table = command.build_arrow_table
+            end
+            case load_input_type
             when "apache-arrow"
               command[:input_type] = "apache-arrow"
               content_type = "application/x-apache-arrow-streaming"
-              arrow_table = command.build_arrow_table
               if arrow_table
                 buffer = Arrow::ResizableBuffer.new(1024)
                 arrow_table.save(buffer, format: :stream)

data/lib/groonga/client/response/base.rb

@@ -67,6 +67,7 @@ module Groonga
         class << self
           def parse(command, raw_response)
             return_code = nil
+            trace_logs = nil
             case command.output_type
             when :json
               callback = command["callback"]
@@ -81,6 +82,13 @@ module Groonga
                 return_code = header[0] if header
               else
                 header = response["header"]
+                trace_log = response["trace_log"]
+                if trace_log
+                  names = trace_log["columns"].collect {|column| column["name"]}
+                  trace_logs = trace_log["logs"].collect do |log|
+                    Hash[names.zip(log)]
+                  end
+                end
                 body = response["body"]
                 return_code = header["return_code"] if header
               end
@@ -91,7 +99,7 @@ module Groonga
               header, body = parse_tsv(raw_response)
               return_code = header["return_code"] if header
             when :arrow, :"apache-arrow"
-              header, body = parse_apache_arrow(raw_response)
+              header, trace_logs, body = parse_apache_arrow(raw_response)
               return_code = header["return_code"] if header
             else
               header = nil
@@ -102,6 +110,7 @@ module Groonga
             else
               response = Error.new(command, header, body)
             end
+            response.trace_logs = trace_logs
             response.raw = raw_response
             response
           end
@@ -187,6 +196,7 @@ module Groonga
 
           def parse_apache_arrow(response)
             header = nil
+            trace_logs = nil
             body = nil
             buffer = Arrow::Buffer.new(response)
             Arrow::BufferInputStream.open(buffer) do |input|
@@ -194,9 +204,14 @@ module Groonga
                 reader = Arrow::RecordBatchStreamReader.new(input)
                 schema = reader.schema
                 record_batches = reader.to_a
-                if apache_arrow_metadata?(schema)
+                data_type = (schema.metadata || {})["GROONGA:data_type"]
+                case data_type
+                when "metadata"
                   table = Arrow::Table.new(schema, record_batches)
                   header = table.each_record.first.to_h
+                when "trace_log"
+                  table = Arrow::Table.new(schema, record_batches)
+                  trace_logs = table.raw_records
                 else
                   body = {}
                   body["columns"] = schema.fields.collect do |field|
@@ -212,11 +227,7 @@ module Groonga
                 end
               end
             end
-            return header, body
-          end
-
-          def apache_arrow_metadata?(schema)
-            (schema.metadata || {})["GROONGA:data_type"] == "metadata"
+            return header, trace_logs, body
           end
         end
 
@@ -239,11 +250,16 @@ module Groonga
         # @return [String] The unparsed response. It may be JSON, XML or
         #   Groonga command format.
         attr_accessor :raw
+        # @return [::Array, nil] The trace logs of response.
+        # @see https://groonga.org/docs/reference/command/output_trace_log.html
+        #   The trace log document.
+        attr_accessor :trace_logs
 
         def initialize(command, header, body)
           self.command = command
           self.header = header
           self.body = body
+          self.trace_logs = nil
           self.raw = nil
         end
 

data/lib/groonga/client/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2021  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2013-2022  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.6.6"
+    VERSION = "0.6.8"
   end
 end

data/lib/groonga/client.rb

@@ -280,7 +280,11 @@ module Groonga
     def normalize_parameters(parameters)
       normalized_parameters = {}
       parameters.each do |key, value|
-        normalized_parameters[key] = value.to_s
+        if defined?(Arrow) and value.is_a?(Arrow::Table)
+          normalized_parameters[key] = value
+        else
+          normalized_parameters[key] = value.to_s
+        end
       end
       normalized_parameters
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Haruka Yoshihara
 - Kouhei Sutou
 - Kosuke Asami
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -286,7 +286,7 @@ homepage: https://github.com/ranguba/groonga-client
 licenses:
 - LGPLv2.1+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -301,8 +301,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
-signing_key: 
+rubygems_version: 3.5.0.dev
+signing_key:
 specification_version: 4
 summary: Groonga-client is a client for Groonga (http://groonga.org/) implemented
   with pure Ruby. You can use it without Groonga.