fluent-plugin-droonga 0.7.0 → 0.8.0

data/lib/groonga_command_converter.rb

@@ -67,7 +67,7 @@ module Droonga
     end
 
     private
-    def create_envelope(type, body)
+    def create_message(type, body)
       id = @options[:id]
       if id.nil?
         id = new_unique_id
@@ -99,11 +99,11 @@ module Droonga
     end
 
     def create_table_create_command(command)
-      create_envelope("table_create", command.arguments)
+      create_message("table_create", command.arguments)
     end
 
     def create_column_create_command(command)
-      create_envelope("column_create", command.arguments)
+      create_message("column_create", command.arguments)
     end
 
     def split_load_command_to_add_commands(command, &block)
@@ -126,12 +126,12 @@ module Droonga
         end
         body[:values] = record_values unless record_values.empty?
 
-        yield create_envelope("add", body)
+        yield create_message("add", body)
       end
     end
 
     def create_select_command(command)
-      create_envelope("select", command.arguments)
+      create_message("select", command.arguments)
     end
   end
 end

data/sample/cluster/catalog.json

@@ -38,6 +38,6 @@
     }
   },
   "options": {
-    "plugins": ["select"]
+    "plugins": ["groonga"]
   }
 }

data/test/command/config/default/catalog.json

@@ -35,9 +35,27 @@
           }
         }
       }
+    },
+    "Watch": {
+      "workers": 2,
+      "plugins": ["search", "groonga", "add", "watch"],
+      "number_of_replicas": 1,
+      "number_of_partitions": 1,
+      "partition_key": "_key",
+      "date_range": "infinity",
+      "ring": {
+        "localhost:23041": {
+          "weight": 50,
+          "partitions": {
+            "2013-09-01": [
+              "localhost:23003/droonga.watch"
+            ]
+          }
+        }
+      }
     }
   },
   "options": {
-    "plugins": ["select"]
+    "plugins": ["groonga"]
   }
 }

data/test/command/fixture/event.jsons

@@ -0,0 +1,41 @@
+#@disable-logging
+{
+  "type": "table_create",
+  "dataset": "Droonga",
+  "body": {
+    "name"  : "Event",
+    "flags" : "TABLE_HASH_KEY"
+  }
+}
+{
+  "type": "column_create",
+  "dataset": "Droonga",
+  "body": {
+    "table" : "Event",
+    "name"  : "start",
+    "type"  : "Time"
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Event",
+    "key": "Groonga Night 3",
+    "values": {
+      "start": 1354183200
+    }
+  }
+}
+{
+  "dataset": "Droonga",
+  "type": "add",
+  "body": {
+    "table": "Event",
+    "key": "Groonga Night 4",
+    "values": {
+      "start": "2013-11-29T08:00:00Z"
+    }
+  }
+}
+#@enable-logging

data/test/command/fixture/user-table.jsons

@@ -35,4 +35,13 @@
     "flags" : "COLUMN_VECTOR"
   }
 }
+{
+  "type": "column_create",
+  "dataset": "Droonga",
+  "body": {
+    "table" : "User",
+    "name"  : "birthday",
+    "type"  : "Time"
+  }
+}
 #@enable-logging

data/test/command/run-test.rb

@@ -29,7 +29,7 @@ lib_dir = File.expand_path(File.join(base_dir, "..", "..", "lib"))
 
 drntest_options = []
 drntest_options.concat(["--fluentd-options", "-I#{lib_dir}"])
-drntest_options.concat(["--base", base_dir])
-drntest_options.concat(ARGV.dup)
+drntest_options.concat(["--base-path", base_dir])
+drntest_options.concat(ARGV)
 
 run("bundle", "exec", "drntest", *drntest_options)

data/test/command/suite/add/error/invalid-integer.expected

@@ -0,0 +1,20 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 400,
+    "type": "add.result",
+    "body": {
+      "name": "InvalidValue",
+      "message": "The column \"age\" cannot store the value \"secret\".",
+      "detail": {
+        "table": "User",
+        "key": "key",
+        "values": {
+          "age": "secret"
+        }
+      }
+    }
+  }
+]

data/test/command/suite/add/error/invalid-integer.test

@@ -0,0 +1,12 @@
+#@include fixture/user-table.jsons
+{
+  "type": "add",
+  "dataset": "Droonga",
+  "body": {
+    "table": "User",
+    "key": "key",
+    "values": {
+      "age": "secret"
+    }
+  }
+}

data/test/command/suite/add/error/invalid-time.expected

@@ -0,0 +1,20 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 400,
+    "type": "add.result",
+    "body": {
+      "name": "InvalidValue",
+      "message": "The column \"birthday\" cannot store the value \"today\".",
+      "detail": {
+        "table": "User",
+        "key": "key",
+        "values": {
+          "birthday": "today"
+        }
+      }
+    }
+  }
+]

data/test/command/suite/add/error/invalid-time.test

@@ -0,0 +1,12 @@
+#@include fixture/user-table.jsons
+{
+  "type": "add",
+  "dataset": "Droonga",
+  "body": {
+    "table": "User",
+    "key": "key",
+    "values": {
+      "birthday": "today"
+    }
+  }
+}

data/test/command/suite/add/error/missing-key.expected

@@ -0,0 +1,13 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 400,
+    "type": "add.result",
+    "body": {
+      "name": "MissingPrimaryKeyParameter",
+      "message": "\"key\" must be specified. The table \"User\" requires a primary key for a new record."
+    }
+  }
+]

data/test/command/suite/add/error/missing-key.test

@@ -0,0 +1,16 @@
+#@include fixture/user-table.jsons
+{
+  "type": "add",
+  "dataset": "Droonga",
+  "body": {
+    "table": "User",
+    "values": {
+      "name": "Alice",
+      "age": 20,
+      "email": [
+        "alice@example.com",
+        "alice@example.jp"
+      ]
+    }
+  }
+}

data/test/command/suite/add/error/missing-table.expected

@@ -0,0 +1,13 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 400,
+    "type": "add.result",
+    "body": {
+      "name": "MissingTableParameter",
+      "message": "\"table\" must be specified."
+    }
+  }
+]

data/test/command/suite/add/error/missing-table.test

@@ -0,0 +1,16 @@
+#@include fixture/user-table.jsons
+{
+  "type": "add",
+  "dataset": "Droonga",
+  "body": {
+    "key": "key",
+    "values": {
+      "name": "Alice",
+      "age": 20,
+      "email": [
+        "alice@example.com",
+        "alice@example.jp"
+      ]
+    }
+  }
+}

data/test/command/suite/add/error/unknown-column.expected

@@ -0,0 +1,20 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 404,
+    "type": "add.result",
+    "body": {
+      "name": "UnknownColumn",
+      "message": "The column \"unknown\" does not exist in the table \"User\".",
+      "detail": {
+        "table": "User",
+        "key": "key",
+        "values": {
+          "unknown": "unknown"
+        }
+      }
+    }
+  }
+]

data/test/command/suite/add/error/unknown-column.test

@@ -0,0 +1,12 @@
+#@include fixture/user-table.jsons
+{
+  "type": "add",
+  "dataset": "Droonga",
+  "body": {
+    "table": "User",
+    "key": "key",
+    "values": {
+      "unknown": "unknown"
+    }
+  }
+}

data/test/command/suite/add/error/unknown-table.expected

@@ -0,0 +1,13 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 404,
+    "type": "add.result",
+    "body": {
+      "name": "UnknownTable",
+      "message": "The table \"Unknown\" does not exist in the dataset."
+    }
+  }
+]

data/test/command/suite/add/error/unknown-table.test

@@ -0,0 +1,17 @@
+#@include fixture/user-table.jsons
+{
+  "type": "add",
+  "dataset": "Droonga",
+  "body": {
+    "table": "Unknown",
+    "key": "key",
+    "values": {
+      "name": "Alice",
+      "age": 20,
+      "email": [
+        "alice@example.com",
+        "alice@example.jp"
+      ]
+    }
+  }
+}

data/test/command/suite/add/minimum.expected

@@ -5,8 +5,6 @@
     "inReplyTo": null,
     "statusCode": 200,
     "type": "add.result",
-    "body": [
-      true
-    ]
+    "body": true
   }
 ]

data/test/command/suite/add/with-values.expected

@@ -5,8 +5,6 @@
     "inReplyTo": null,
     "statusCode": 200,
     "type": "add.result",
-    "body": [
-      true
-    ]
+    "body": true
   }
 ]

data/test/command/suite/add/without-key.expected

@@ -5,8 +5,6 @@
     "inReplyTo": null,
     "statusCode": 200,
     "type": "add.result",
-    "body": [
-      true
-    ]
+    "body": true
   }
 ]

data/test/command/suite/message/error/missing-dataset.expected

@@ -0,0 +1,13 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 400,
+    "type": "add.result",
+    "body": {
+      "name": "MissingDatasetParameter",
+      "message": "\"dataset\" must be specified."
+    }
+  }
+]

data/test/command/suite/message/error/missing-dataset.test

@@ -0,0 +1,5 @@
+#@include fixture/user-table.jsons
+{
+  "type": "add",
+  "body": {}
+}

data/test/command/suite/message/error/unknown-command.expected

@@ -0,0 +1,13 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 400,
+    "type": "unknown-command.result",
+    "body": {
+      "name": "UnknownCommand",
+      "message": "The command \"unknown-command\" is not available for the dataset \"Droonga\"."
+    }
+  }
+]

data/test/command/suite/message/error/unknown-command.test

@@ -0,0 +1,6 @@
+#@include fixture/user-table.jsons
+{
+  "type": "unknown-command",
+  "dataset": "Droonga",
+  "body": {}
+}

data/test/command/suite/message/error/unknown-dataset.expected

@@ -0,0 +1,13 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": null,
+    "statusCode": 404,
+    "type": "add.result",
+    "body": {
+      "name": "UnknownDataset",
+      "message": "The dataset \"Unknown\" does not exist."
+    }
+  }
+]