YUKI Hiroshi
null+****@clear*****
Wed Apr 22 11:52:21 JST 2015
YUKI Hiroshi 2015-04-22 11:52:21 +0900 (Wed, 22 Apr 2015) New Revision: 0e448f4981bf118ce769bc0c3d5250ba6408f675 https://github.com/droonga/droonga-engine/commit/0e448f4981bf118ce769bc0c3d5250ba6408f675 Message: Put "object.count" under "system.statistics" namespace Modified files: doc/text/news.md lib/droonga/plugins/system.rb lib/droonga/plugins/system/absorb_data.rb Renamed files: lib/droonga/plugins/system/statistics.rb (from lib/droonga/plugins/system/object.rb) test/command/suite/system/statistics/object/count/empty.expected (from test/command/suite/system/object/count/empty.expected) test/command/suite/system/statistics/object/count/empty.test (from test/command/suite/system/object/count/empty.test) test/command/suite/system/statistics/object/count/record.catalog.json (from test/command/suite/system/object/count/record.catalog.json) test/command/suite/system/statistics/object/count/record.expected (from test/command/suite/system/object/count/record.expected) test/command/suite/system/statistics/object/count/record.test (from test/command/suite/system/object/count/record.test) test/command/suite/system/statistics/object/count/schema.catalog.json (from test/command/suite/system/object/count/schema.catalog.json) test/command/suite/system/statistics/object/count/schema.expected (from test/command/suite/system/object/count/schema.expected) test/command/suite/system/statistics/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:41:11 +0900 (79a462d) +++ doc/text/news.md 2015-04-22 11:52:21 +0900 (bdc6f32) @@ -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.statistics.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:41:11 +0900 (0a257f3) +++ lib/droonga/plugins/system.rb 2015-04-22 11:52:21 +0900 (cc60600) @@ -25,5 +25,5 @@ module Droonga end require "droonga/plugins/system/status" -require "droonga/plugins/system/object" +require "droonga/plugins/system/statistics" 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:41:11 +0900 (87d1bfa) +++ lib/droonga/plugins/system/absorb_data.rb 2015-04-22 11:52:21 +0900 (36370e0) @@ -209,7 +209,7 @@ module Droonga def count_total_n_objects(&block) count_message = { - "type" => "system.object.count", + "type" => "system.statistics.object.count", "dataset" => current_dataset, "body" => { "output" => ["total"], Renamed: lib/droonga/plugins/system/statistics.rb (+3 -3) 90% =================================================================== --- lib/droonga/plugins/system/object.rb 2015-04-22 11:41:11 +0900 (8a5a036) +++ lib/droonga/plugins/system/statistics.rb 2015-04-22 11:52:21 +0900 (db2fe4d) @@ -19,7 +19,7 @@ require "droonga/database_scanner" module Droonga module Plugins module System - class ObjectCountHandler < Droonga::Handler + class StatisticsObjectCountHandler < Droonga::Handler include DatabaseScanner def handle(message) @@ -44,8 +44,8 @@ module Droonga end define_single_step do |step| - step.name = "system.object.count" - step.handler = ObjectCountHandler + step.name = "system.statistics.object.count" + step.handler = StatisticsObjectCountHandler step.collector = Collectors::RecursiveSum end end Renamed: test/command/suite/system/statistics/object/count/empty.expected (+1 -1) 73% =================================================================== --- test/command/suite/system/object/count/empty.expected 2015-04-22 11:41:11 +0900 (105b65e) +++ test/command/suite/system/statistics/object/count/empty.expected 2015-04-22 11:52:21 +0900 (c0f9bbd) @@ -1,7 +1,7 @@ { "inReplyTo": "request-id", "statusCode": 200, - "type": "system.object.count.result", + "type": "system.statistics.object.count.result", "body": { "tables": 0, "columns": 0, Renamed: test/command/suite/system/statistics/object/count/empty.test (+1 -1) 74% =================================================================== --- test/command/suite/system/object/count/empty.test 2015-04-22 11:41:11 +0900 (81bd8b2) +++ test/command/suite/system/statistics/object/count/empty.test 2015-04-22 11:52:21 +0900 (a572bc1) @@ -1,5 +1,5 @@ { - "type": "system.object.count", + "type": "system.statistics.object.count", "dataset": "Default", "body": { "output": [ Renamed: test/command/suite/system/statistics/object/count/record.catalog.json (+0 -0) 100% =================================================================== Renamed: test/command/suite/system/statistics/object/count/record.expected (+1 -1) 73% =================================================================== --- test/command/suite/system/object/count/record.expected 2015-04-22 11:41:11 +0900 (8e257a7) +++ test/command/suite/system/statistics/object/count/record.expected 2015-04-22 11:52:21 +0900 (4d36a0f) @@ -1,7 +1,7 @@ { "inReplyTo": "request-id", "statusCode": 200, - "type": "system.object.count.result", + "type": "system.statistics.object.count.result", "body": { "tables": 2, "columns": 0, Renamed: test/command/suite/system/statistics/object/count/record.test (+1 -1) 86% =================================================================== --- test/command/suite/system/object/count/record.test 2015-04-22 11:41:11 +0900 (f89455b) +++ test/command/suite/system/statistics/object/count/record.test 2015-04-22 11:52:21 +0900 (dab9f39) @@ -10,7 +10,7 @@ } #@enable-logging { - "type": "system.object.count", + "type": "system.statistics.object.count", "dataset": "Default", "body": { "output": [ Renamed: test/command/suite/system/statistics/object/count/schema.catalog.json (+0 -0) 100% =================================================================== Renamed: test/command/suite/system/statistics/object/count/schema.expected (+1 -1) 73% =================================================================== --- test/command/suite/system/object/count/schema.expected 2015-04-22 11:41:11 +0900 (28d9f2c) +++ test/command/suite/system/statistics/object/count/schema.expected 2015-04-22 11:52:21 +0900 (b9250ec) @@ -1,7 +1,7 @@ { "inReplyTo": "request-id", "statusCode": 200, - "type": "system.object.count.result", + "type": "system.statistics.object.count.result", "body": { "tables": 2, "columns": 0, Renamed: test/command/suite/system/statistics/object/count/schema.test (+1 -1) 78% =================================================================== --- test/command/suite/system/object/count/schema.test 2015-04-22 11:41:11 +0900 (0f35b47) +++ test/command/suite/system/statistics/object/count/schema.test 2015-04-22 11:52:21 +0900 (47aebeb) @@ -1,6 +1,6 @@ #@require-catalog-version 2 { - "type": "system.object.count", + "type": "system.statistics.object.count", "dataset": "Default", "body": { "output": [ -------------- next part -------------- HTML����������������������������...下载
