groonga-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 837550f5d3d1eeec4eb0e92880c66f897f40fd12
-  data.tar.gz: ffe2005c27525c1b162603c903551aac1bf0bfe8
+  metadata.gz: 290f3a653fc46b26b559ce12fbf1563f776c8289
+  data.tar.gz: 1d95b138d76c57a81a487e057ac7175463a0aa87
 SHA512:
-  metadata.gz: d301825f48a0157aadc8f7772e502514816057584af795abd71f9433e2e4aaf09b7a8379974533e2023f5560e0d50e33a370e9a469b1095e7a0bf54f291ca614
-  data.tar.gz: 14af40e9d242b61acb46f8ebe28886c4118a0b0a64a9920fb7e237a522c8909004ddcabed86e104740a214248f545b19e78ee40990195426feeff03ae2e272a7
+  metadata.gz: 937618894500db79f02bc86bc19468ffe209c8334cdb401da05112f8de5db9bf61ad5163b0f2372815e0070823aa97ccdbf53ebb5e63efd72e2f7ab17a819945
+  data.tar.gz: a8124dd6957a86bbab1173c7095e15d8a830b6d521edd6b5ce9d8a69bc24d2b95ed7d411c35261851ae55d19e00f8ca764dbecb2ce81cdf9d2dd82432143ca66

data/bin/groonga-client

@@ -17,98 +17,7 @@
 # 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 "ostruct"
-require "optparse"
-require "json"
+require "groonga/client/command-line/groonga-client"
 
-require "groonga/command/parser"
-
-require "groonga/client"
-
-def default_port(protocol)
-  case protocol
-  when :http
-    10041
-  when :gqtp
-    10043
-  end
-end
-
-def run_command(client, command)
-  response = client.execute(command)
-  case command.output_type
-  when :json
-    puts(JSON.pretty_generate([response.header, response.body]))
-  when :xml
-    puts(response.raw)
-  else
-    puts(response.body)
-  end
-end
-
-options = OpenStruct.new
-options.protocol = :http
-options.host     = "localhost"
-options.port     = nil
-
-parser = OptionParser.new
-parser.version = Groonga::Client::VERSION
-parser.banner += " GROONGA_COMMAND_FILE1 GROONGA_COMMAND_FILE2 ..."
-parser.separator("")
-parser.separator("Connection:")
-available_protocols = [:http, :gqtp]
-parser.on("--protocol=PROTOCOL", [:http, :gqtp],
-          "Protocol to connect to Groonga server.",
-          "[#{available_protocols.join(", ")}]",
-          "(#{options.protocol})") do |protocol|
-  options.protocol = protocol
-end
-parser.on("--host=HOST",
-          "Groonga server to be connected.",
-          "(#{options.host})") do |host|
-  options.host = host
-end
-parser.on("--port=PORT", Integer,
-          "Port number of Groonga server to be connected.",
-          "(auto)") do |port|
-  options.port = port
-end
-command_file_paths = parser.parse!(ARGV)
-
-options.port ||= default_port(options.protocol)
-
-client = Groonga::Client.new(:protocol => options.protocol,
-                             :host     => options.host,
-                             :port     => options.port,
-                             :backend  => :synchronous)
-parser = Groonga::Command::Parser.new
-parser.on_command do |command|
-  run_command(client, command)
-end
-
-parser.on_load_columns do |command, columns|
-  command[:columns] ||= columns.join(",")
-end
-values = []
-parser.on_load_value do |_, value|
-  values << value
-end
-parser.on_load_complete do |command|
-  command[:values] ||= Yajl::Encoder.encode(values)
-  run_command(client, command)
-  values.clear
-end
-
-if command_file_paths.empty?
-  $stdin.each_line do |line|
-    parser << line
-  end
-else
-  command_file_paths.each do |command_file_path|
-    File.open(command_file_path) do |command_file|
-      command_file.each_line do |line|
-        parser << line
-      end
-    end
-  end
-end
+client = Groonga::Client::CommandLine::GroongaClient.new
+exit(client.run(ARGV))

data/doc/text/news.md

@@ -1,10 +1,17 @@
 # NEWS
 
+## 0.1.2 - 2015-05-13
+
+### Improvements
+
+  * groonga-client: Supported split load.
+  * groonga-client: Added `--read-timeout` option.
+
 ## 0.1.1 - 2015-04-20
 
 ### Improvements
 
-  * groonga-client: Add a command that sends Groonga commands to a
+  * groonga-client: Added a command that sends Groonga commands to a
     Groonga server.
 
 ## 0.1.0 - 2014-11-05

data/lib/groonga/client.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2015  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
@@ -17,6 +17,7 @@
 # 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 "groonga/client/default"
 require "groonga/client/command"
 require "groonga/client/empty-request"
 require "groonga/client/protocol/gqtp"
@@ -64,6 +65,7 @@ module Groonga
     def initialize(options={})
       options = options.dup
       protocol = options.delete(:protocol) || :gqtp
+      options[:read_timeout] ||= Default::READ_TIMEOUT
 
       @connection = nil
       if protocol == :gqtp

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

@@ -0,0 +1,198 @@
+# Copyright (C) 2015  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# 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 "ostruct"
+require "optparse"
+require "json"
+
+require "groonga/command/parser"
+
+require "groonga/client"
+
+module Groonga
+  class Client
+    module CommandLine
+      class GroongaClient
+        def initialize
+          @protocol = :http
+          @host     = "localhost"
+          @port     = nil
+
+          @read_timeout = Default::READ_TIMEOUT
+
+          @runner_options = {
+            :split_load_chunk_size => 10000,
+          }
+        end
+
+        def run(argv)
+          command_file_paths = parse_command_line(argv)
+
+          @client = Groonga::Client.new(:protocol => @protocol,
+                                        :host     => @host,
+                                        :port     => @port,
+                                        :read_timeout => @read_timeout,
+                                        :backend  => :synchronous)
+          runner = Runner.new(@client, @runner_options)
+
+          if command_file_paths.empty?
+            $stdin.each_line do |line|
+              runner << line
+            end
+          else
+            command_file_paths.each do |command_file_path|
+              File.open(command_file_path) do |command_file|
+                command_file.each_line do |line|
+                  runner << line
+                end
+              end
+            end
+          end
+
+          true
+        end
+
+        private
+        def parse_command_line(argv)
+          parser = OptionParser.new
+          parser.version = VERSION
+          parser.banner += " GROONGA_COMMAND_FILE1 GROONGA_COMMAND_FILE2 ..."
+
+          parser.separator("")
+
+          parser.separator("Connection:")
+
+          available_protocols = [:http, :gqtp]
+          parser.on("--protocol=PROTOCOL", [:http, :gqtp],
+                    "Protocol to connect to Groonga server.",
+                    "[#{available_protocols.join(", ")}]",
+                    "(#{@protocol})") do |protocol|
+            @protocol = protocol
+          end
+
+          parser.on("--host=HOST",
+                    "Groonga server to be connected.",
+                    "(#{@host})") do |host|
+            @host = host
+          end
+
+          parser.on("--port=PORT", Integer,
+                    "Port number of Groonga server to be connected.",
+                    "(auto)") do |port|
+            @port = port
+          end
+
+          parser.on("--read-timeout=TIMEOUT", Integer,
+                    "Timeout on reading response from Groonga server.",
+                    "You can disable timeout by specifying -1.",
+                    "(#{@read_timeout})") do |timeout|
+            @read_timeout = timeout
+          end
+
+          parser.on("--split-load-chunk-size=SIZE", Integer,
+                    "Split a large load to small loads.",
+                    "Each small load has at most SIZE records.",
+                    "Set 0 to SIZE to disable this feature.",
+                    "(#{@runner_options[:split_load_chunk_size]})") do |size|
+            @runner_options[:split_load_chunk_size] = size
+          end
+
+          command_file_paths = parser.parse(argv)
+
+          @port ||= default_port(@protocol)
+
+          command_file_paths
+        end
+
+        def default_port(protocol)
+          case protocol
+          when :http
+            10041
+          when :gqtp
+            10043
+          end
+        end
+
+        class Runner
+          def initialize(client, options={})
+            @client = client
+            @split_load_chunk_size = options[:split_load_chunk_size] || 10000
+            @load_values = []
+            @parser = create_command_parser
+          end
+
+          def <<(line)
+            @parser << line
+          end
+
+          private
+          def create_command_parser
+            parser = Groonga::Command::Parser.new
+
+            parser.on_command do |command|
+              run_command(command)
+            end
+
+            parser.on_load_columns do |command, columns|
+              command[:columns] ||= columns.join(",")
+            end
+
+            parser.on_load_value do |command, value|
+              unless command[:values]
+                @load_values << value
+                if @load_values.size == @split_load_chunk_size
+                  consume_load_values(command)
+                end
+              end
+              command.original_source.clear
+            end
+
+            parser.on_load_complete do |command|
+              if command[:values]
+                run_command(client, command)
+              else
+                consume_load_values(command)
+              end
+            end
+
+            parser
+          end
+
+          def consume_load_values(load_command)
+            return if @load_values.empty?
+
+            load_command[:values] = Yajl::Encoder.encode(@load_values)
+            run_command(load_command)
+            @load_values.clear
+            load_command[:values] = nil
+          end
+
+          def run_command(command)
+            response = @client.execute(command)
+            case command.output_type
+            when :json
+              puts(JSON.pretty_generate([response.header, response.body]))
+            when :xml
+              puts(response.raw)
+            else
+              puts(response.body)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/groonga/client/default.rb

@@ -0,0 +1,25 @@
+# Copyright (C) 2015  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Groonga
+  class Client
+    module Default
+      # The default timeout on reading response from Groonga server in
+      # seconds.
+      READ_TIMEOUT = 60
+    end
+  end
+end

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

@@ -35,6 +35,7 @@ module Groonga
           def send(command)
             begin
               Net::HTTP.start(@host, @port) do |http|
+                http.read_timeout = read_timeout
                 response = send_request(http, command)
                 case response
                 when Net::HTTPSuccess, Net::HTTPBadRequest
@@ -89,6 +90,15 @@ module Groonga
           end
 
           private
+          def read_timeout
+            timeout = @options[:read_timeout]
+            if timeout < 0
+              nil
+            else
+              timeout
+            end
+          end
+
           def send_request(http, command)
             if command.name == "load"
               raw_values = command[:values]

data/lib/groonga/client/version.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2015  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
@@ -18,6 +18,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -174,7 +174,9 @@ files:
 - doc/text/news.md
 - groonga-client.gemspec
 - lib/groonga/client.rb
+- lib/groonga/client/command-line/groonga-client.rb
 - lib/groonga/client/command.rb
+- lib/groonga/client/default.rb
 - lib/groonga/client/empty-request.rb
 - lib/groonga/client/error.rb
 - lib/groonga/client/protocol/error.rb