Rename "system.object-count" to "system.object.count".

Because we possibly add more "system.object.*" commands.
droonga · Apr 22, 2015 · dba647e · dba647e
1 parent 5c10bc9
commit dba647e
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 12 deletions.
diff --git a/doc/text/news.md b/doc/text/news.md
@@ -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.

diff --git a/lib/droonga/plugins/system.rb b/lib/droonga/plugins/system.rb
@@ -25,5 +25,5 @@ module System
 end
 
 require "droonga/plugins/system/status"
-require "droonga/plugins/system/object_count"
+require "droonga/plugins/system/object"
 require "droonga/plugins/system/absorb_data"
diff --git a/lib/droonga/plugins/system/absorb_data.rb b/lib/droonga/plugins/system/absorb_data.rb
@@ -209,7 +209,7 @@ def on_finish
 
           def count_total_n_objects(&block)
             count_message = {
-              "type"    => "system.object-count",
+              "type"    => "system.object.count",
               "dataset" => current_dataset,
               "body"    => {
                 "output" => ["total"],

diff --git a/lib/droonga/plugins/system/object_count.rb → lib/droonga/plugins/system/object.rb b/lib/droonga/plugins/system/object_count.rb → lib/droonga/plugins/system/object.rb
@@ -19,7 +19,11 @@
 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 @@ def handle(message)
       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
diff --git a/.../suite/system/object-count/empty.expected → .../suite/system/object/count/empty.expected b/.../suite/system/object-count/empty.expected → .../suite/system/object/count/empty.expected
@@ -1,7 +1,7 @@
 {
   "inReplyTo": "request-id",
   "statusCode": 200,
-  "type": "system.object-count.result",
+  "type": "system.object.count.result",
   "body": {
     "tables":  0,
     "columns": 0,

diff --git a/...mand/suite/system/object-count/empty.test → ...mand/suite/system/object/count/empty.test b/...mand/suite/system/object-count/empty.test → ...mand/suite/system/object/count/empty.test
@@ -1,5 +1,5 @@
 {
-  "type": "system.object-count",
+  "type": "system.object.count",
   "dataset": "Default",
   "body": {
     "output": [

diff --git a/...e/system/object-count/record.catalog.json → ...e/system/object/count/record.catalog.json b/...e/system/object-count/record.catalog.json → ...e/system/object/count/record.catalog.json
diff --git a/...suite/system/object-count/record.expected → ...suite/system/object/count/record.expected b/...suite/system/object-count/record.expected → ...suite/system/object/count/record.expected
@@ -1,7 +1,7 @@
 {
   "inReplyTo": "request-id",
   "statusCode": 200,
-  "type": "system.object-count.result",
+  "type": "system.object.count.result",
   "body": {
     "tables":  2,
     "columns": 0,

diff --git a/...and/suite/system/object-count/record.test → ...and/suite/system/object/count/record.test b/...and/suite/system/object-count/record.test → ...and/suite/system/object/count/record.test
@@ -10,7 +10,7 @@
 }
 #@enable-logging
 {
-  "type": "system.object-count",
+  "type": "system.object.count",
   "dataset": "Default",
   "body": {
     "output": [

diff --git a/...e/system/object-count/schema.catalog.json → ...e/system/object/count/schema.catalog.json b/...e/system/object-count/schema.catalog.json → ...e/system/object/count/schema.catalog.json
diff --git a/...suite/system/object-count/schema.expected → ...suite/system/object/count/schema.expected b/...suite/system/object-count/schema.expected → ...suite/system/object/count/schema.expected
@@ -1,7 +1,7 @@
 {
   "inReplyTo": "request-id",
   "statusCode": 200,
-  "type": "system.object-count.result",
+  "type": "system.object.count.result",
   "body": {
     "tables":  2,
     "columns": 0,

diff --git a/...and/suite/system/object-count/schema.test → ...and/suite/system/object/count/schema.test b/...and/suite/system/object-count/schema.test → ...and/suite/system/object/count/schema.test
@@ -1,6 +1,6 @@
 #@require-catalog-version 2
 {
-  "type": "system.object-count",
+  "type": "system.object.count",
   "dataset": "Default",
   "body": {
     "output": [