groonga-client 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a13092963c9a1d652d8c16687494adcd044ac4036e5740085aab049f3c84b77
-  data.tar.gz: 29d881eb07c7dbec1c87070f42bf19e850a8849f0b72e0d09696b10f521d5392
+  metadata.gz: e6da9f45867a1b6ba3343309e8935b8efdc8b9d3c8d35d7dec702738b38829a7
+  data.tar.gz: 29178875a3d700f8b17c2c1cfab67c37baf86a811af258e5bb2069916d90de24
 SHA512:
-  metadata.gz: 8901feec4d9cb6315502d1e5e30d91df3dc9d94a628cf5e5dbb6ae9045ff0a75f0cd4c2e6ef826d4de482ea96fbe80e05d32897a9a8b2cba20c8f4ff66fc3f4d
-  data.tar.gz: ced3f733068a72491b4f2f8f5472f1fa5c605d3af4d7a345290764f97b49a2fd0d732dd6bf26499fc1af1759359052289b51026974ab9969d62b1fa37d4d6b18
+  metadata.gz: b351339a18628c2230cdc20714cbc82517cbc46618860a3cac0f31d3a75ffaae2181771affbe17a9a61575cecbc071a284f040436fa59efe30450b82f12d8cc3
+  data.tar.gz: a8c6326cbfb48225dc799915867c3757c05d824f02ec79fa510407d306431fba0745c5aba7a1ad1c8ba5382e58b97c0e469299ea8c5e8c855ef9e211f2538021

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # NEWS
 
+## 0.6.9 - 2024-04-10
+
+### Improvements
+
+  * HTTP: Added support for request cancel.
+
+## 0.6.8 - 2023-11-07
+
+### Improvements
+
+  * Added support for `output_trace_log`.
+
 ## 0.6.7 - 2022-01-07
 
 ### 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/protocol/http/synchronous.rb

@@ -66,15 +66,19 @@ module Groonga
               http.start do
                 http.read_timeout = read_timeout
                 response = send_request(http, command)
+                body = response.body
                 case response
-                when Net::HTTPSuccess, Net::HTTPBadRequest
-                  yield(response.body)
+                when Net::HTTPSuccess,
+                     Net::HTTPBadRequest, # for invalid request
+                     Net::HTTPRequestTimeOut # for canceled request
+                  yield(body)
                 else
-                  if response.body.start_with?("[[")
-                    yield(response.body)
+                  # "[[" is for command_version=1
+                  # "{" is for command_version=3
+                  if body.start_with?("[[") or body.start_with?("{")
+                    yield(body)
                   else
-                    message =
-                      "#{response.code} #{response.message}: #{response.body}"
+                    message = "#{response.code} #{response.message}: #{body}"
                     raise Error.new(message)
                   end
                 end

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-2023  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.7"
+    VERSION = "0.6.9"
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.9
 platform: ruby
 authors:
 - Haruka Yoshihara
 - Kouhei Sutou
 - Kosuke Asami
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -286,7 +285,6 @@ homepage: https://github.com/ranguba/groonga-client
 licenses:
 - LGPLv2.1+
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -301,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Groonga-client is a client for Groonga (http://groonga.org/) implemented
   with pure Ruby. You can use it without Groonga.