droonga-client 0.1.4 → 0.1.5

data/bin/droonga-request

@@ -56,7 +56,7 @@ end
 available_protocols = [:droonga, :http]
 parser.on("--protocol=PROTOCOL", available_protocols,
           "Protocol to be used to communicate with Droonga system.",
-          "[#{available_protocols.join('|')}",
+          "[#{available_protocols.join('|')}]",
           "(#{options[:protocol]})") do |protocol|
   options[:protocol] = protocol
 end
@@ -102,21 +102,28 @@ client = Droonga::Client.new(options)
 json_parser = Yajl::Parser.new
 json_parser.on_parse_complete = lambda do |request_message|
   if options[:report_request]
-    print("Request: ")
+    message = "Request: "
     begin
-      puts(JSON.pretty_generate(request_message))
+      message << JSON.pretty_generate(request_message)
     rescue
-      p(request_message)
+      message << request_message.inspect
     end
+    message << "\n"
+    print(message)
   end
   start = Time.now
   request = client.request(request_message) do |response|
-    puts("Elapsed time: #{Time.now - start}") if options[:report_elapsed_time]
+    message = ""
+    if options[:report_elapsed_time]
+      message << "Elapsed time: #{Time.now - start}\n"
+    end
     begin
-      puts(JSON.pretty_generate(response))
+      message << JSON.pretty_generate(response)
     rescue
-      p(response)
+      message << response.inspect
     end
+    message << "\n"
+    print(message)
     break if options[:exit_on_response]
   end
   request.wait

data/bin/droonga-send

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2014 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+require "ostruct"
+require "optparse"
+require "yajl"
+require "json"
+
+require "droonga/client"
+
+options = OpenStruct.new
+options.report_request = false
+options.report_throughput = false
+
+servers = []
+default_server = "droonga:localhost:24224/droonga"
+messages_per_second = Droonga::Client::RateLimiter::NO_LIMIT
+
+def parse_server(server)
+  connect_info, tag = server.split(/\//, 2)
+  protocol, host, port = connect_info.split(/:/, 3)
+  {
+    :host     => host,
+    :port     => Integer(port),
+    :protocol => protocol.to_sym,
+  }
+end
+
+class ThroughputReporter
+  def initialize
+    @start_time = Time.now
+    @measure_start_time = Time.now
+    @n_sent_messages = 0
+    @first_report = true
+  end
+
+  def on_message_sent
+    @n_sent_messages += 1
+    current_time = Time.now
+    measure_span_in_second = current_time - @measure_start_time
+    if measure_span_in_second > 1
+      messages_per_second = @n_sent_messages / measure_span_in_second
+      if @first_report
+        @first_report = false
+      else
+        move_to_previous_line
+      end
+      print("% 8.3f messages/second\n" % messages_per_second)
+      @n_sent_messages = 0
+      @measure_start_time = current_time
+    end
+  end
+
+  private
+  def move_to_previous_line
+    print("\e[1A\r")
+  end
+end
+
+parser = OptionParser.new
+parser.banner += " REQUEST_JSON_FILE1 REQUEST_JSON_FILE2 ..."
+parser.separator("")
+parser.separator("Connection:")
+parser.on("--server=PROTOCOL:HOST:PORT/TAG",
+          "Droonga server to be connected.",
+          "Use multiple servers to use round-robin requests.",
+          "Specify this option multiple times to use multiple servers.",
+          "(#{default_server})") do |server|
+  servers << server
+end
+parser.on("--messages-per-second=N", Integer,
+          "Apply rate limitation by N messages/second.",
+          "'#{Droonga::Client::RateLimiter::NO_LIMIT}' means no limit.",
+          "(#{messages_per_second})") do |n|
+  messages_per_second = n
+end
+parser.separator("")
+parser.separator("Report:")
+parser.on("--[no-]report-request",
+          "Reports request message.",
+          "(#{options.report_request})") do |report_request|
+  options.report_request = report_request
+end
+parser.on("--report-throughput",
+          "Reports throughput by messages per second.",
+          "(no)") do
+  options.report_throughput = true
+end
+request_json_files = parser.parse!(ARGV)
+
+servers << default_server if servers.empty?
+clients = servers.collect do |server|
+  client_options = parse_server(server)
+  client = Droonga::Client.new(client_options)
+  Droonga::Client::RateLimiter.new(client, messages_per_second)
+end
+
+if options.report_throughput
+  throughput_reporter = ThroughputReporter.new
+end
+
+client_index = 0
+json_parser = Yajl::Parser.new
+json_parser.on_parse_complete = lambda do |request_message|
+  if options.report_request
+    message = "Request: "
+    begin
+      message << JSON.pretty_generate(request_message)
+    rescue
+      message << request_message.inspect
+    end
+    message << "\n"
+    print(message)
+  end
+  client = clients[client_index]
+  client.send(request_message)
+  client_index = (client_index + 1) % clients.size
+  throughput_reporter.on_message_sent if throughput_reporter
+end
+
+if request_json_files.empty?
+  json_parser.parse($stdin)
+else
+  request_json_files.each do |request_json_file|
+    File.open(request_json_file) do |input|
+      json_parser.parse(input)
+    end
+  end
+end

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 0.1.5: 2014-03-29
+
+### Improvements
+
+  * droonga-request: Reported results correctly event if there were multiple threads.
+  * Added a new command `droonga-send` just for sending requests and ignoring responses.
+
 ## 0.1.4: 2014-02-28
 
 ### Improvements

data/lib/droonga/client/connection/http.rb

@@ -26,14 +26,13 @@ module Droonga
   class Client
     module Connection
       class HTTP
-        # The error class for invalid HTTP method case
         class InvalidHTTPMethodError < Error
           attr_reader :http_method
           attr_reader :request_message
           def initialize(http_method, request_message)
             @http_method     = http_method
             @request_message = request_message
-            super("Unsupport HTTP Method: <#{@http_method}>: " +
+            super("Invalid HTTP Method: <#{@http_method}>: " +
                     "<#{@request_message.inspect}>")
           end
         end

data/lib/droonga/client/rate-limiter.rb

@@ -0,0 +1,57 @@
+# Copyright (C) 2014 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+module Droonga
+  class Client
+    class RateLimiter
+      NO_LIMIT = -1
+
+      def initialize(client, messages_per_second)
+        @client = client
+        @messages_per_second = messages_per_second
+        @diff_in_seconds_per_message = 1.0 / @messages_per_second
+      end
+
+      def send(*args, &block)
+        limit do
+          @client.send(*args, &block)
+        end
+      end
+
+      def method_missing(name, *args, &block)
+        if @client.respond_to?(name)
+          @client.__send__(name, *args, &block)
+        else
+          super
+        end
+      end
+
+      private
+      def limit
+        return yield if @messages_per_second == NO_LIMIT
+
+        @previous_time ||= Time.now
+        diff_in_seconds = Time.now - @previous_time
+        sleep_time = @diff_in_seconds_per_message - diff_in_seconds
+        if sleep_time > 0
+          sleep(sleep_time)
+        end
+        @previous_time = Time.now
+
+        yield
+      end
+    end
+  end
+end

data/lib/droonga/client/version.rb

@@ -17,6 +17,6 @@
 
 module Droonga
   class Client
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/droonga/client.rb

@@ -18,7 +18,8 @@
 require "droonga/client/version"
 require "droonga/client/error"
 require "droonga/client/connection/http"
-require "droonga/client/connection/droonga_protocol"
+require "droonga/client/connection/droonga-protocol"
+require "droonga/client/rate-limiter"
 
 module Droonga
   class Client
@@ -43,8 +44,6 @@ module Droonga
       end
     end
 
-    attr_reader :connection
-
     # Creates a new Droonga Engine client.
     #
     # @param options [Hash] Options to connect Droonga Engine.

metadata

@@ -1,118 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: droonga-client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &76032510 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *76032510
 - !ruby/object:Gem::Dependency
   name: fluent-logger
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &76032280 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *76032280
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &76032070 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *76032070
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &76031860 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *76031860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &76031610 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *76031610
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &76031400 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *76031400
 - !ruby/object:Gem::Dependency
   name: packnga
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &76031170 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *76031170
 description: Droonga client for Ruby
 email:
 - droonga@groonga.org
 executables:
 - droonga-request
+- droonga-send
 extensions: []
 extra_rdoc_files: []
 files:
@@ -123,37 +104,40 @@ files:
 - README.md
 - Rakefile
 - bin/droonga-request
+- bin/droonga-send
 - doc/text/news.md
 - droonga-client.gemspec
 - lib/droonga/client.rb
-- lib/droonga/client/connection/droonga_protocol.rb
+- lib/droonga/client/connection/droonga-protocol.rb
 - lib/droonga/client/connection/error.rb
 - lib/droonga/client/connection/http.rb
 - lib/droonga/client/error.rb
+- lib/droonga/client/rate-limiter.rb
 - lib/droonga/client/version.rb
 homepage: https://github.com/droonga/droonga-client-ruby
 licenses:
 - LGPL-2.1
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Droonga client for Ruby
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 675e62f644e94a104c8a0dd03af1b9f709e4630f
-  data.tar.gz: 321c2a3767f06127ea58cf8d678b192fbe174137
-SHA512:
-  metadata.gz: 7f8662c7e20b9499e1b1d8dedd986bdaffeced96c8b22b285b799926de08d562b8196456b20e3efd33f6cf8c4323736a4e82f1e9778f5281e0f2195b87e26e2b
-  data.tar.gz: 0485dce6429eb9c6c5da1684b0ef1ce56d3e71174c451fa9c13d5e026f18dc975cbc07f8d399589bd3cf54841591937b90264c09977f86013ef0258416e0e459