groonga-client 0.5.8 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4513c924b1dc4c7ca3b26afc382163620d09d26c
-  data.tar.gz: dd01a037ba7ff770cf04b6d3118d9847061e0fe4
+SHA256:
+  metadata.gz: 29a5323d61e22fd67047fc6adbf076dfca390ef9fcde76e653d1d52ccff00c55
+  data.tar.gz: bcff102d164f18996b61e45e979d63ed4cf812ed1747fe7d454c349eafddbde8
 SHA512:
-  metadata.gz: a71e2bd65572c69a35956b928c533754ae6411e5788bc5a412e939eeb7435d765b341ac4f623a8ca30778c8ed7ccf356489007628fafdddb8e94c3716ad2119f
-  data.tar.gz: 698187d4515e5d45bd1b4572f046ca7e30c915f99b35b676a6027c7c107549b5a52c69b5629612ced8a9d2597f29ea0402536d2574529ff82e025f972f78bebd
+  metadata.gz: f3bff560db004312b66a7f38bcf07e3a4a28b5078d6fabc413e0ee58b816dee31bd022539baab88d2adfbd57fc85ad27e43c339aa282b602e98efd67059c9595
+  data.tar.gz: e943e75c8985175fb96aeeccbe8189c70c6709d4cb4d6635f547b859e27afd2b80abd6ebe6a5c7b108ceeca1be13e1a2c4f1c12126472cd09d489551a0d41cfe

data/doc/text/news.md

@@ -1,5 +1,59 @@
 # NEWS
 
+## 0.6.3 - 2020-06-08
+
+### Improvements
+
+  * `groonga-client`:
+
+    * Added support for `-load-input-type=apache-arrow`.
+
+    * Added `--load-lock-table`.
+
+  * `http`: Added support for debugging by
+    `GROONGA_CLIENT_HTTP_DEBUG=yes` environment variable.
+
+  * Added support for response in Apache Arrow.
+
+## 0.6.2 - 2019-09-02
+
+### Improvements
+
+  * `Groonga::Client::Response::LogicalSelect`: Added.
+
+  * `Groonga::Client::Response::Select#raw_columns`: Added.
+
+  * `Groonga::Client::Response::Select#raw_records`: Added.
+
+  * `Groonga::Client::Response::LogicalRangeFilter`: Added.
+
+## 0.6.1 - 2019-07-27
+
+### Improvements
+
+  * `Groonga::Client::Request::Select`: Added support for drilldowns
+    in slice.
+
+## 0.6.0 - 2018-08-30
+
+### Improvements
+
+  * `groonga-client`:
+
+    * Added `--target-command` option.
+
+    * Added `--target-table` option.
+
+    * Added `--target-column` option.
+
+  * Added support for JSONP.
+
+## 0.5.9 - 2018-07-13
+
+### Improvements
+
+  * Added support for TSV output.
+
 ## 0.5.8 - 2017-11-09
 
 ### Improvements

data/groonga-client.gemspec

@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2014-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2020  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
@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_runtime_dependency("gqtp", ">= 1.0.4")
-  spec.add_runtime_dependency("groonga-command", ">= 1.2.8")
+  spec.add_runtime_dependency("groonga-command", ">= 1.4.7")
   spec.add_runtime_dependency("groonga-command-parser", ">= 1.1.0")
   spec.add_runtime_dependency("hashie")
 

data/lib/groonga/client.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2017  Kouhei Sutou <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
@@ -23,6 +23,7 @@ require "groonga/client/command"
 require "groonga/client/empty-request"
 require "groonga/client/protocol/gqtp"
 require "groonga/client/protocol/http"
+require "groonga/client/protocol/file"
 require "groonga/client/request"
 
 module Groonga
@@ -100,9 +101,11 @@ module Groonga
         @connection = Groonga::Client::Protocol::GQTP.new(url, options)
       when "http", "https"
         @connection = Groonga::Client::Protocol::HTTP.new(url, options)
+      when "file"
+        @connection = Groonga::Client::Protocol::File.new(url, options)
       else
         message = "unsupported scheme: <#{url.scheme}>: "
-        message << "supported: [gqtp, http, https]"
+        message << "supported: [gqtp, http, https, file]"
         raise ArgumentError, message
       end
     end
@@ -219,7 +222,7 @@ module Groonga
       scheme = (options.delete(:protocol) || "gqtp").to_s
       host = options.delete(:host) || options.delete(:address) || "127.0.0.1"
       port = options.delete(:port) || default_port(scheme)
-      path = options.delete(:path)
+      path = options.delete(:path) || default_path(scheme)
       user = options.delete(:user)
       password = options.delete(:password)
       if user and password
@@ -260,6 +263,15 @@ module Groonga
       end
     end
 
+    def default_path(scheme)
+      case scheme
+      when "http", "https"
+        "/d/"
+      else
+        nil
+      end
+    end
+
     def groonga_command_name?(name)
       /\A[a-zA-Z][a-zA-Z\d_]+\z/ === name.to_s
     end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2020  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
@@ -14,9 +14,16 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+require "fileutils"
 require "json"
+require "pathname"
 require "securerandom"
 
+begin
+  require "arrow"
+rescue LoadError
+end
+
 require "groonga/command/parser"
 
 require "groonga/client"
@@ -28,10 +35,19 @@ module Groonga
       class GroongaClient
         def initialize
           @chunk = false
+          @load_input_type = "json"
+          @available_load_input_types = ["json"]
+          if Object.const_defined?(:Arrow)
+            @available_load_input_types << "apache-arrow"
+          end
+          @load_lock_table = false
 
           @runner_options = {
             :split_load_chunk_size => 10000,
             :generate_request_id   => false,
+            :target_commands       => [],
+            :target_tables         => [],
+            :target_columns        => [],
           }
         end
 
@@ -41,12 +57,25 @@ module Groonga
             parse_command_line(option_parser)
           end
 
-          parser.open_client(:chunk => @chunk) do |client|
+          parser.open_client(:chunk => @chunk,
+                             :load_input_type => @load_input_type,
+                             :load_lock_table => @load_lock_table) do |client|
             runner = Runner.new(client, @runner_options)
 
             if command_file_paths.empty?
-              $stdin.each_line do |line|
-                runner << line
+              if $stdin.tty? and $stdout.tty?
+                begin
+                  require "readline"
+                rescue LoadError
+                  repl = BareREPL.new(runner)
+                else
+                  repl = ReadlineREPL.new(runner)
+                end
+                repl.run
+              else
+                $stdin.each_line do |line|
+                  runner << line
+                end
               end
             else
               command_file_paths.each do |command_file_path|
@@ -83,6 +112,20 @@ module Groonga
             @runner_options[:split_load_chunk_size] = size
           end
 
+          parser.on("--load-input-type=TYPE",
+                    @available_load_input_types,
+                    "Use TYPE as input type for load.",
+                    "[#{@available_load_input_types.join(", ")}]",
+                    "(#{@load_input_types})") do |type|
+            @load_input_type = type
+          end
+
+          parser.on("--[no-]load-lock-table",
+                    "Use lock_table=yes for load.",
+                    "(#{@load_lock_table})") do |boolean|
+            @load_lock_table = boolean
+          end
+
           parser.on("--[no-]generate-request-id",
                     "Add auto generated request ID to all commands.",
                     "(#{@runner_options[:generate_request_id]})") do |boolean|
@@ -95,6 +138,39 @@ module Groonga
                     "(#{@chunk})") do |boolean|
             @chunk = boolean
           end
+
+          parser.on("--target-command=COMMAND",
+                    "Add COMMAND as target commands",
+                    "You can specify multiple times",
+                    "If COMMAND is /.../,",
+                    "it's treated as a regular expression") do |command|
+            add_target(@runner_options[:target_commands], command)
+          end
+
+          parser.on("--target-table=TABLE",
+                    "Add TABLE as target tables",
+                    "You can specify multiple times",
+                    "If TABLE is /.../,",
+                    "it's treated as a regular expression") do |table|
+            add_target(@runner_options[:target_tables], table)
+          end
+
+          parser.on("--target-column=COLUMN",
+                    "Add COLUMN as target columns",
+                    "You can specify multiple times",
+                    "If COLUMN is /.../,",
+                    "it's treated as a regular expression") do |column|
+            add_target(@runner_options[:target_columns], column)
+          end
+        end
+
+        def add_target(targets, target)
+          if /\A\\(.+?)\\(i)?\z/ =~ target
+            pattern = Regexp.new($1, $2 == "i")
+            targets << pattern
+          else
+            targets << target
+          end
         end
 
         class Runner
@@ -102,6 +178,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]
             @load_values = []
             @parser = create_command_parser
           end
@@ -114,6 +193,17 @@ module Groonga
             @parser.finish
           end
 
+          def repl
+            begin
+              require "readline"
+            rescue LoadError
+              repl = BareREPL.new(self)
+            else
+              repl = ReadlineREPL.new(self)
+              repl_readline
+            end
+          end
+
           private
           def create_command_parser
             parser = Groonga::Command::Parser.new
@@ -164,6 +254,12 @@ module Groonga
           end
 
           def run_command(command)
+            return unless target_command?(command)
+            return unless target_table?(command)
+            return unless target_column?(command)
+
+            command = Marshal.load(Marshal.dump(command))
+            apply_target_columns(command)
             command[:request_id] ||= SecureRandom.uuid if @generate_request_id
             response = @client.execute(command)
             case command.output_type
@@ -175,6 +271,184 @@ module Groonga
               puts(response.body)
             end
           end
+
+          def target_command?(command)
+            return true if @target_commands.empty?
+
+            @target_commands.any? do |name|
+              name === command.command_name
+            end
+          end
+
+          def target_table?(command)
+            return true if @target_tables.empty?
+
+            target = nil
+            case command.command_name
+            when "load", "column_create", "select"
+              target = command.table
+            when "table_create", "table_remove"
+              target = command.name
+            end
+            return true if target.nil?
+
+            @target_tables.any? do |name|
+              name === target
+            end
+          end
+
+          def target_column?(command)
+            return true if @target_columns.empty?
+
+            target = nil
+            case command.command_name
+            when "column_create"
+              target = command.name
+            end
+            return true if target.nil?
+
+            @target_columns.any? do |name|
+              name === target
+            end
+          end
+
+          def apply_target_columns(command)
+            return if @target_columns.empty?
+
+            values = command[:values]
+            return if values.nil?
+
+            command = command.dup
+
+            values = JSON.parse(values)
+            columns = command[:columns]
+            if columns
+              columns = columns.split(/\s*,\s*/)
+              target_indexes = []
+              new_columns = []
+              columns.each_with_index do |column, i|
+                if load_target_column?(column)
+                  target_indexes << i
+                  new_columns << column
+                end
+              end
+              command[:columns] = new_columns.join(",")
+              new_values = values.collect do |value|
+                target_indexes.collect do |i|
+                  value[i]
+                end
+              end
+              command[:values] = JSON.generate(new_values)
+            else
+              new_values = values.collect do |value|
+                new_value = {}
+                value.each do |key, value|
+                  if load_target_column?(key)
+                    new_value[key] = value
+                  end
+                end
+                new_value
+              end
+              command[:values] = JSON.generate(new_values)
+            end
+          end
+
+          def load_target_column?(column)
+            column == "_key" or
+              @target_columns.any? {|name| name === column}
+          end
+        end
+
+        class BareREPL
+          def initialize(runner)
+            @runner = runner
+          end
+
+          def run
+            loop do
+              print("> ")
+              $stdout.flush
+              line = gets
+              break if line.nil?
+              @runner << line
+            end
+          end
+        end
+
+        class ReadlineREPL
+          def initialize(runner)
+            @runner = runner
+            @history_path = guess_history_path
+            read_history
+          end
+
+          def run
+            loop do
+              line = Readline.readline("> ", true)
+              break if line.nil?
+              add_history(line)
+              @runner << line
+              @runner << "\n"
+            end
+          end
+
+          private
+          def guess_history_path
+            case RUBY_PLATFORM
+            when /mswin/, /mingw/
+              base_dir = ENV["LOCALAPPDATA"] || "~/AppData"
+            when /darwin/
+              base_dir = "~/Library/Preferences"
+            else
+              base_dir = ENV["XDG_CONFIG_HOME"] || "~/.config"
+            end
+            Pathname(base_dir).expand_path + "groonga-client" + "history.txt"
+          end
+
+          def read_history
+            if @history_path.exist?
+              @history_path.open do |history_file|
+                history_file.each_line do |line|
+                  Readline::HISTORY << line.chomp
+                end
+              end
+              @history_timestamp = @history_path.mtime
+            else
+              @history_timestamp = Time.now
+            end
+          end
+
+          def add_history(entry)
+            updated = history_is_updated?
+
+            if new_history_entry?(entry)
+              FileUtils.mkdir_p(@history_path.dirname)
+              @history_path.open("a") do |history_file|
+                history_file << entry
+                history_file << "\n"
+              end
+            else
+              Readline::HISTORY.pop
+            end
+
+            if updated
+              Readline::HISTORY.clear
+              read_history
+            end
+          end
+
+          def history_is_updated?
+            @history_path.exist? and
+              @history_path.mtime > @history_timestamp
+          end
+
+          def new_history_entry?(entry)
+            return false if /\A\s*\z/ =~ entry
+            if Readline::HISTORY.size > 1 and Readline::HISTORY[-2] == entry
+              return false
+            end
+            true
+          end
         end
       end
     end