YUKI Hiroshi
null+****@clear*****
Wed Apr 22 11:20:51 JST 2015
YUKI Hiroshi 2015-04-22 11:20:51 +0900 (Wed, 22 Apr 2015) New Revision: dba647e08b52c67e0c289d9077a7111eafc18280 https://github.com/droonga/droonga-engine/commit/dba647e08b52c67e0c289d9077a7111eafc18280 Message: Rename "system.object-count" to "system.object.count". Because we possibly add more "system.object.*" commands. Modified files: doc/text/news.md lib/droonga/plugins/system.rb lib/droonga/plugins/system/absorb_data.rb Renamed files: lib/droonga/plugins/system/object.rb (from lib/droonga/plugins/system/object_count.rb) test/command/suite/system/object/count/empty.expected (from test/command/suite/system/object-count/empty.expected) test/command/suite/system/object/count/empty.test (from test/command/suite/system/object-count/empty.test) test/command/suite/system/object/count/record.catalog.json (from test/command/suite/system/object-count/record.catalog.json) test/command/suite/system/object/count/record.expected (from test/command/suite/system/object-count/record.expected) test/command/suite/system/object/count/record.test (from test/command/suite/system/object-count/record.test) test/command/suite/system/object/count/schema.catalog.json (from test/command/suite/system/object-count/schema.catalog.json) test/command/suite/system/object/count/schema.expected (from test/command/suite/system/object-count/schema.expected) test/command/suite/system/object/count/schema.test (from test/command/suite/system/object-count/schema.test) Modified: doc/text/news.md (+1 -1) =================================================================== --- doc/text/news.md 2015-04-22 11:01:23 +0900 (4d8ca02) +++ doc/text/news.md 2015-04-22 11:20:51 +0900 (79a462d) @@ -15,7 +15,7 @@ * `dump` command: forwarded messages are now have their own `date` field. * `Collectors::RecursiveSum` is introduced. * `system.status` command: now the reporter node and its internal name is reported as a part of response body. - * `system.object-count` command is now available. It is used by command line utilities internally. + * `system.object.count` command is now available. It is used by command line utilities internally. * `system.absorb-data` command is now available. It is used by command line utilities internally. * Command line utilities: * `droonga-engine-join` and `droonga-engine-absorb-data` commands work more surely. Modified: lib/droonga/plugins/system.rb (+1 -1) =================================================================== --- lib/droonga/plugins/system.rb 2015-04-22 11:01:23 +0900 (2f4dea1) +++ lib/droonga/plugins/system.rb 2015-04-22 11:20:51 +0900 (0a257f3) @@ -25,5 +25,5 @@ module Droonga end require "droonga/plugins/system/status" -require "droonga/plugins/system/object_count" +require "droonga/plugins/system/object" require "droonga/plugins/system/absorb_data" Modified: lib/droonga/plugins/system/absorb_data.rb (+1 -1) =================================================================== --- lib/droonga/plugins/system/absorb_data.rb 2015-04-22 11:01:23 +0900 (440ed7a) +++ lib/droonga/plugins/system/absorb_data.rb 2015-04-22 11:20:51 +0900 (87d1bfa) @@ -209,7 +209,7 @@ module Droonga def count_total_n_objects(&block) count_message = { - "type" => "system.object-count", + "type" => "system.object.count", "dataset" => current_dataset, "body" => { "output" => ["total"], Renamed: lib/droonga/plugins/system/object.rb (+8 -3) 88% =================================================================== --- lib/droonga/plugins/system/object_count.rb 2015-04-22 11:01:23 +0900 (121df31) +++ lib/droonga/plugins/system/object.rb 2015-04-22 11:20:51 +0900 (69d88a0) @@ -19,7 +19,11 @@ require "droonga/database_scanner" module Droonga module Plugins module System - class ObjectCountHandler < Droonga::Handler + module Object + extend Plugin + register("system.object") + + class CountHandler < Droonga::Handler include DatabaseScanner def handle(message) @@ -44,10 +48,11 @@ module Droonga end define_single_step do |step| - step.name = "system.object-count" - step.handler = ObjectCountHandler + step.name = "system.object.count" + step.handler = CountHandler step.collector = Collectors::RecursiveSum end + end end end end Renamed: test/command/suite/system/object/count/empty.expected (+1 -1) 77% =================================================================== --- test/command/suite/system/object-count/empty.expected 2015-04-22 11:01:23 +0900 (4229827) +++ test/command/suite/system/object/count/empty.expected 2015-04-22 11:20:51 +0900 (105b65e) @@ -1,7 +1,7 @@ { "inReplyTo": "request-id", "statusCode": 200, - "type": "system.object-count.result", + "type": "system.object.count.result", "body": { "tables": 0, "columns": 0, Renamed: test/command/suite/system/object/count/empty.test (+1 -1) 79% =================================================================== --- test/command/suite/system/object-count/empty.test 2015-04-22 11:01:23 +0900 (1d7b179) +++ test/command/suite/system/object/count/empty.test 2015-04-22 11:20:51 +0900 (81bd8b2) @@ -1,5 +1,5 @@ { - "type": "system.object-count", + "type": "system.object.count", "dataset": "Default", "body": { "output": [ Renamed: test/command/suite/system/object/count/record.catalog.json (+0 -0) 100% =================================================================== Renamed: test/command/suite/system/object/count/record.expected (+1 -1) 77% =================================================================== --- test/command/suite/system/object-count/record.expected 2015-04-22 11:01:23 +0900 (565abec) +++ test/command/suite/system/object/count/record.expected 2015-04-22 11:20:51 +0900 (8e257a7) @@ -1,7 +1,7 @@ { "inReplyTo": "request-id", "statusCode": 200, - "type": "system.object-count.result", + "type": "system.object.count.result", "body": { "tables": 2, "columns": 0, Renamed: test/command/suite/system/object/count/record.test (+1 -1) 89% =================================================================== --- test/command/suite/system/object-count/record.test 2015-04-22 11:01:23 +0900 (4e9cde7) +++ test/command/suite/system/object/count/record.test 2015-04-22 11:20:51 +0900 (f89455b) @@ -10,7 +10,7 @@ } #@enable-logging { - "type": "system.object-count", + "type": "system.object.count", "dataset": "Default", "body": { "output": [ Renamed: test/command/suite/system/object/count/schema.catalog.json (+0 -0) 100% =================================================================== Renamed: test/command/suite/system/object/count/schema.expected (+1 -1) 77% =================================================================== --- test/command/suite/system/object-count/schema.expected 2015-04-22 11:01:23 +0900 (e5321de) +++ test/command/suite/system/object/count/schema.expected 2015-04-22 11:20:51 +0900 (28d9f2c) @@ -1,7 +1,7 @@ { "inReplyTo": "request-id", "statusCode": 200, - "type": "system.object-count.result", + "type": "system.object.count.result", "body": { "tables": 2, "columns": 0, Renamed: test/command/suite/system/object/count/schema.test (+1 -1) 82% =================================================================== --- test/command/suite/system/object-count/schema.test 2015-04-22 11:01:23 +0900 (18d9247) +++ test/command/suite/system/object/count/schema.test 2015-04-22 11:20:51 +0900 (0f35b47) @@ -1,6 +1,6 @@ #@require-catalog-version 2 { - "type": "system.object-count", + "type": "system.object.count", "dataset": "Default", "body": { "output": [ -------------- next part -------------- HTML����������������������������...Descargar
