fluent-plugin-droonga 0.8.0 → 0.9.0

data/lib/droonga/searcher.rb

@@ -190,7 +190,7 @@ module Droonga
         "||" => Groonga::Operator::OR,
         "&&" => Groonga::Operator::AND,
         "-"  => Groonga::Operator::AND_NOT,
-      }.freeze
+      }
 
       class << self
         def search(search_request)
@@ -361,6 +361,143 @@ module Droonga
       end
     end
 
+    module AttributeFormattable
+      def format_attribute(attribute, table)
+        label = attribute[:label]
+        source = attribute[:source]
+        if source == "_subrecs"
+          sub_record_table = table.range
+          sub_attributes = format_attributes(attribute[:attributes], sub_record_table)
+
+          format_attribute_subrecs(label, sub_attributes)
+        else
+          expression = attribute[:expression]
+          if expression
+            format_attribute_expression(label, expression)
+          else
+            column = table.column(source)
+            format_attribute_column(label, column)
+          end
+        end
+      end
+    end
+
+    class SimpleAttributesFormatter
+      include AttributeFormattable
+
+      def format_attribute_subrecs(label, sub_attributes)
+        {
+          "name" => label,
+          "attributes" => sub_attributes,
+        }
+      end
+
+      def format_attribute_column(label, column)
+        vector = column.respond_to?(:vector?) ? column.vector? : false
+        {"name" => label, "type" => column.range.name, "vector" => vector}
+      end
+
+      def format_attribute_expression(label, expression)
+        {"name" => label} # TODO include detailed information of expression
+      end
+
+      def format_attributes(attributes, table)
+        attributes.collect do |attribute|
+          format_attribute(attribute, table)
+        end
+      end
+    end
+
+    class ComplexAttributesFormatter
+      include AttributeFormattable
+
+      def format_attribute_subrecs(label, sub_attributes)
+        {
+          "attributes" => sub_attributes
+        }
+      end
+
+      def format_attribute_column(label, column)
+        vector = column.respond_to?(:vector?) ? column.vector? : false
+        {"type" => column.range.name, "vector" => vector}
+      end
+
+      def format_attribute_expression(label, expression)
+        {} # TODO include detailed information of expression
+      end
+
+      def format_attributes(attributes, table)
+        formatted_attributes = {}
+        attributes.each do |attribute|
+          formatted_attribute = format_attribute(attribute, table)
+          attribute_name = attribute[:label]
+          formatted_attributes[attribute_name] = formatted_attribute
+        end
+        formatted_attributes
+      end
+    end
+
+    module RecordsFormattable
+      def record_value(record, attribute)
+        if attribute[:source] == "_subrecs"
+          record.sub_records.collect do |sub_record|
+            sub_attributes = attribute[:attributes]
+            format_record(sub_attributes, sub_record)
+          end
+        else
+          expression = attribute[:expression]
+          if expression
+            variable = attribute[:variable]
+            variable.value = record
+            expression.execute
+          else
+            value = record[attribute[:source]]
+            if value.is_a?(Groonga::Record)
+              value.record_id
+            else
+              value
+            end
+          end
+        end
+      end
+
+      def format_records(output_target_attributes, records, output_limit, output_offset)
+        cursor_options = {
+          :offset => output_offset,
+          :limit => output_limit
+        }
+        formatted_records = nil
+        records.open_cursor(cursor_options) do |cursor|
+          formatted_records = cursor.collect do |record|
+            format_record(output_target_attributes, record)
+          end
+        end
+        formatted_records
+      end
+    end
+
+    class SimpleRecordsFormatter
+      include RecordsFormattable
+
+      def format_record(attributes, record)
+        attributes.collect do |attribute|
+          record_value(record, attribute)
+        end
+      end
+    end
+
+    class ComplexRecordsFormatter
+      include RecordsFormattable
+
+      def format_record(attributes, record)
+        values = {}
+        attributes.each do |attribute|
+          values[attribute[:label]] = record_value(record, attribute)
+        end
+        values
+      end
+    end
+
     class ResultFormatter
       class << self
         def format(search_request, search_result)
@@ -407,91 +544,44 @@ module Droonga
         @request.output["elements"] || []
       end
 
+      def output_offset
+        @request.output["offset"] || 0
+      end
+
+      def output_limit
+        @request.output["limit"] || 10
+      end
+
       def format_count
         @result.count
       end
 
       def format_attributes
-        # XXX IMPLEMENT ME!!!
-        attributes = nil
+        attributes_formatter = nil
         if @request.complex_output?
-          # should convert columns to an object like:
-          # {"_id" => {"type" => "UInt32", "vector" => false}}
-          attributes = {}
+          attributes_formatter = ComplexAttributesFormatter.new
         else
-          # should convert columns to an object like:
-          # [{"name" => "_id", "type" => "UInt32", "vector" => false}]
-          attributes = []
-        end
-
-        attributes
-      end
-
-      def format_records
-        params = @request.output
-
-        attributes = params["attributes"]
-        target_attributes = normalize_target_attributes(attributes)
-        offset = params["offset"] || 0
-        limit = params["limit"] || 10
-        formatted_records = nil
-        @result.records.open_cursor(:offset => offset, :limit => limit) do |cursor|
-          if @request.complex_output?
-            formatted_records = cursor.collect do |record|
-              complex_record(target_attributes, record)
-            end
-          else
-            formatted_records = cursor.collect do |record|
-              simple_record(target_attributes, record)
-            end
-          end
-        end
-
-        formatted_records
-      end
-
-      def complex_record(attributes, record)
-        values = {}
-        attributes.collect do |attribute|
-          values[attribute[:label]] = record_value(record, attribute)
+          attributes_formatter = SimpleAttributesFormatter.new
         end
-        values
+        attributes_formatter.format_attributes(
+          output_target_attributes,
+          @result.records
+        )
       end
 
-      def simple_record(attributes, record)
-        attributes.collect do |attribute|
-          record_value(record, attribute)
-        end
+      def output_target_attributes
+        attributes = @request.output["attributes"]
+        normalize_target_attributes(attributes)
       end
 
-      def record_value(record, attribute)
-        if attribute[:source] == "_subrecs"
-          if @request.complex_output?
-            record.sub_records.collect do |sub_record|
-              target_attributes = resolve_attributes(attribute, sub_record)
-              complex_record(target_attributes, sub_record)
-            end
-          else
-            record.sub_records.collect do |sub_record|
-              target_attributes = resolve_attributes(attribute, sub_record)
-              simple_record(target_attributes, sub_record)
-            end
-          end
+      def format_records
+        records_formatter = nil
+        if @request.complex_output?
+          records_formatter = ComplexRecordsFormatter.new
         else
-          expression = attribute[:expression]
-          if expression
-            variable = attribute[:variable]
-            variable.value = record
-            expression.execute
-          else
-            value = record[attribute[:source]]
-            if value.is_a?(Groonga::Record)
-              value.record_id
-            else
-              value
-            end
-          end
+          records_formatter = SimpleRecordsFormatter.new
         end
+        records_formatter.format_records(output_target_attributes, @result.records, output_limit, output_offset)
       end
 
       def resolve_attributes(attribute, record)
@@ -522,13 +612,17 @@ module Droonga
             condition.value = @result.condition
             source = nil
           end
-          {
+          normalized_attributes = {
             label: attribute["label"] || attribute["source"],
             source: source,
             expression: expression,
             variable: variable,
-            attributes: attribute["attributes"]
           }
+          if attribute["attributes"]
+            normalized_attributes[:attributes] =
+              normalize_target_attributes(attribute["attributes"], domain.range)
+          end
+          normalized_attributes
         end
       end
 

data/lib/droonga/session.rb

@@ -29,7 +29,7 @@ module Droonga
     end
 
     def start
-      tasks = @inputs[nil]
+      tasks = @inputs[nil] || []
       tasks.each do |task|
         local_message = {
           "id"   => @id,

data/lib/groonga_command_converter.rb

@@ -21,7 +21,7 @@ require "time"
 
 module Droonga
   class GroongaCommandConverter
-    STATUS_OK = 200.freeze
+    STATUS_OK = 200
 
     def initialize(options={})
       @options = options
@@ -35,6 +35,8 @@ module Droonga
         case command.name
         when "table_create"
           yield create_table_create_command(command)
+        when "table_remove"
+          yield create_table_remove_command(command)
         when "column_create"
           yield create_column_create_command(command)
         when "select"
@@ -102,6 +104,10 @@ module Droonga
       create_message("table_create", command.arguments)
     end
 
+    def create_table_remove_command(command)
+      create_message("table_remove", command.arguments)
+    end
+
     def create_column_create_command(command)
       create_message("column_create", command.arguments)
     end

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

@@ -56,6 +56,6 @@
     }
   },
   "options": {
-    "plugins": ["groonga"]
+    "plugins": ["crud", "groonga"]
   }
 }

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

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 400,
     "type": "add.result",
     "body": {
@@ -15,6 +15,36 @@
           "age": "secret"
         }
       }
+    },
+    "errors": {
+      "sources0": {
+        "statusCode": 400,
+        "body": {
+          "name": "InvalidValue",
+          "message": "The column \"age\" cannot store the value \"secret\".",
+          "detail": {
+            "table": "User",
+            "key": "key",
+            "values": {
+              "age": "secret"
+            }
+          }
+        }
+      },
+      "sources1": {
+        "statusCode": 400,
+        "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-time.expected

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 400,
     "type": "add.result",
     "body": {
@@ -15,6 +15,36 @@
           "birthday": "today"
         }
       }
+    },
+    "errors": {
+      "sources0": {
+        "statusCode": 400,
+        "body": {
+          "name": "InvalidValue",
+          "message": "The column \"birthday\" cannot store the value \"today\".",
+          "detail": {
+            "table": "User",
+            "key": "key",
+            "values": {
+              "birthday": "today"
+            }
+          }
+        }
+      },
+      "sources1": {
+        "statusCode": 400,
+        "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/missing-key.expected

@@ -2,12 +2,28 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 400,
     "type": "add.result",
     "body": {
       "name": "MissingPrimaryKeyParameter",
       "message": "\"key\" must be specified. The table \"User\" requires a primary key for a new record."
+    },
+    "errors": {
+      "sources0": {
+        "statusCode": 400,
+        "body": {
+          "name": "MissingPrimaryKeyParameter",
+          "message": "\"key\" must be specified. The table \"User\" requires a primary key for a new record."
+        }
+      },
+      "sources1": {
+        "statusCode": 400,
+        "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-table.expected

@@ -2,12 +2,28 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 400,
     "type": "add.result",
     "body": {
       "name": "MissingTableParameter",
       "message": "\"table\" must be specified."
+    },
+    "errors": {
+      "sources0": {
+        "statusCode": 400,
+        "body": {
+          "name": "MissingTableParameter",
+          "message": "\"table\" must be specified."
+        }
+      },
+      "sources1": {
+        "statusCode": 400,
+        "body": {
+          "name": "MissingTableParameter",
+          "message": "\"table\" must be specified."
+        }
+      }
     }
   }
 ]

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

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 404,
     "type": "add.result",
     "body": {
@@ -15,6 +15,36 @@
           "unknown": "unknown"
         }
       }
+    },
+    "errors": {
+      "sources0": {
+        "statusCode": 404,
+        "body": {
+          "name": "UnknownColumn",
+          "message": "The column \"unknown\" does not exist in the table \"User\".",
+          "detail": {
+            "table": "User",
+            "key": "key",
+            "values": {
+              "unknown": "unknown"
+            }
+          }
+        }
+      },
+      "sources1": {
+        "statusCode": 404,
+        "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-table.expected

@@ -2,12 +2,28 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 404,
     "type": "add.result",
     "body": {
       "name": "UnknownTable",
       "message": "The table \"Unknown\" does not exist in the dataset."
+    },
+    "errors": {
+      "sources0": {
+        "statusCode": 404,
+        "body": {
+          "name": "UnknownTable",
+          "message": "The table \"Unknown\" does not exist in the dataset."
+        }
+      },
+      "sources1": {
+        "statusCode": 404,
+        "body": {
+          "name": "UnknownTable",
+          "message": "The table \"Unknown\" does not exist in the dataset."
+        }
+      }
     }
   }
 ]

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

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "add.result",
     "body": true

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

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "add.result",
     "body": true

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

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "add.result",
     "body": true

data/test/command/suite/groonga/column_create/scalar.expected

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "table_create.result",
     "body": [
@@ -19,7 +19,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "column_create.result",
     "body": [

data/test/command/suite/groonga/column_create/unknown-table.expected

@@ -0,0 +1,18 @@
+[
+  "droonga.message",
+  0,
+  {
+    "inReplyTo": "request-id",
+    "statusCode": 200,
+    "type": "column_create.result",
+    "body": [
+      [
+        -22,
+        0.0,
+        0.0,
+        "table doesn't exist: <Unknown>"
+      ],
+      false
+    ]
+  }
+]

data/test/command/suite/groonga/column_create/unknown-table.test

@@ -0,0 +1,7 @@
+{
+  "type": "column_create",
+  "dataset": "Droonga",
+  "body": {
+    "table" : "Unknown"
+  }
+}

data/test/command/suite/groonga/column_create/vector.expected

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "table_create.result",
     "body": [
@@ -19,7 +19,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "column_create.result",
     "body": [

data/test/command/suite/groonga/select/minimum.expected

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "select.result",
     "body": [

data/test/command/suite/groonga/table_create/array.expected

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "table_create.result",
     "body": [

data/test/command/suite/groonga/table_create/hash.expected

@@ -2,7 +2,7 @@
   "droonga.message",
   0,
   {
-    "inReplyTo": null,
+    "inReplyTo": "request-id",
     "statusCode": 200,
     "type": "table_create.result",
     "body": [