droonga-engine 1.0.7 → 1.0.8

data/lib/droonga/plugins/groonga/table_remove.rb

@@ -37,7 +37,7 @@ module Droonga
         end
 
         class Handler < Droonga::Handler
-          action.synchronous = true
+          action.change_schema = true
 
           def handle(message)
             command = Command.new(@context)

data/lib/droonga/plugins/search.rb

@@ -25,7 +25,7 @@ module Droonga
 
       class Planner < Droonga::Planner
         def plan(message)
-          planner = DistributedSearchPlanner.new(message)
+          planner = DistributedSearchPlanner.new(@dataset, message)
           planner.plan
         end
       end

data/lib/droonga/plugins/search/distributed_search_planner.rb

@@ -22,7 +22,7 @@ module Droonga
   module Plugins
     module Search
       class DistributedSearchPlanner < DistributedCommandPlanner
-        def initialize(search_request_message)
+        def initialize(dataset, search_request_message)
           super
 
           @request = @source_message["body"]
@@ -43,7 +43,6 @@ module Droonga
             transform_query(input_name, query)
           end
 
-          @dataset = @source_message["dataset"] || @request["dataset"]
           broadcast(:body => @request)
 
           super
@@ -79,7 +78,7 @@ module Droonga
         def transform_query(input_name, query)
           return unless need_reduce?(query)
 
-          transformer = QueryTransformer.new(query)
+          transformer = QueryTransformer.new(@dataset, query)
           elements = transformer.mappers
           mapper = {}
           mapper["elements"] = elements unless elements.empty?
@@ -103,7 +102,8 @@ module Droonga
         class QueryTransformer
           attr_reader :reducers, :mappers
 
-          def initialize(query)
+          def initialize(dataset, query)
+            @dataset = dataset
             @query = query
             @output = @query["output"]
             @reducers = {}
@@ -210,10 +210,14 @@ module Droonga
           end
 
           def final_offset
+            return @original_output_offset if @dataset.single_slice?
+
             @original_sort_offset + @original_output_offset
           end
 
           def final_limit
+            return @original_output_limit if @dataset.single_slice?
+
             if @original_sort_limit == UNLIMITED and
                 @original_output_limit == UNLIMITED
               UNLIMITED
@@ -247,13 +251,17 @@ module Droonga
               "type" => "sum",
             }
             if unifiable?
-              @query["sortBy"]["limit"] = -1 if @query["sortBy"].is_a?(Hash)
-              @output["limit"] = -1
+              unless @dataset.single_slice?
+                if @query["sortBy"].is_a?(Hash)
+                  @query["sortBy"]["limit"] = UNLIMITED
+                end
+                @output["limit"] = UNLIMITED
+              end
               mapper = {
                 "target" => "records",
               }
               unless @output["elements"].include?("records")
-                @records_limit = -1
+                @records_limit = UNLIMITED unless @dataset.single_slice?
                 @output["elements"] << "records"
                 @output["attributes"] ||= ["_key"]
                 @output_records = false

data/lib/droonga/processor.rb

@@ -44,9 +44,10 @@ module Droonga
       if @handler_runner.processable?(type)
         logger.trace("process: handlable: #{type}")
         synchronous = @handler_runner.prefer_synchronous?(type)
-        if @n_workers.zero? or synchronous
+        change_schema = @handler_runner.change_schema?(type)
+        if @n_workers.zero? or synchronous or change_schema
           @handler_runner.process(message)
-          if synchronous
+          if change_schema
             @job_pusher.broadcast(database_reopen_message)
           end
         else

data/lib/droonga/searcher.rb

@@ -462,14 +462,16 @@ module Droonga
           sub_record_table = table.range
           sub_attributes = format(attribute[:attributes], sub_record_table)
 
-          format_attribute_subrecs(label, sub_attributes)
+          yield(format_attribute_subrecs(label, sub_attributes))
         else
           expression = attribute[:expression]
           if expression
-            format_attribute_expression(label, expression)
+            yield(format_attribute_expression(label, expression))
           else
             column = table.column(source)
-            format_attribute_column(label, column)
+            if column
+              yield(format_attribute_column(label, column))
+            end
           end
         end
       end
@@ -495,9 +497,13 @@ module Droonga
       end
 
       def format(attributes, table)
-        attributes.collect do |attribute|
-          format_attribute(attribute, table)
+        formatted_attributes = []
+        attributes.each do |attribute|
+          format_attribute(attribute, table) do |formatted_attribute|
+            formatted_attributes << formatted_attribute
+          end
         end
+        formatted_attributes
       end
     end
 
@@ -522,9 +528,10 @@ module Droonga
       def format(attributes, table)
         formatted_attributes = {}
         attributes.each do |attribute|
-          formatted_attribute = format_attribute(attribute, table)
-          attribute_name = attribute[:label]
-          formatted_attributes[attribute_name] = formatted_attribute
+          format_attribute(attribute, table) do |formatted_attribute|
+            attribute_name = attribute[:label]
+            formatted_attributes[attribute_name] = formatted_attribute
+          end
         end
         formatted_attributes
       end
@@ -547,25 +554,28 @@ module Droonga
 
       private
       def record_value(record, attribute)
-        if attribute[:source] == "_subrecs"
+        source = attribute[:source]
+        if source == "_subrecs"
           if record.table.is_a?(Groonga::Array)
             target_record = record.value
           else
             target_record = record
           end
-          target_record.sub_records.collect do |sub_record|
+          values = target_record.sub_records.collect do |sub_record|
             sub_attributes = attribute[:attributes]
             format_record(sub_attributes, sub_record)
           end
+          yield(values)
         else
           expression = attribute[:expression]
           if expression
             variable = attribute[:variable]
             variable.value = record
-            expression.execute
+            yield(expression.execute)
           else
-            column_value = record[attribute[:source]]
-            format_column_value(column_value)
+            return unless record.have_column?(source)
+            column_value = record[source]
+            yield(format_column_value(column_value))
           end
         end
       end
@@ -589,9 +599,13 @@ module Droonga
 
       private
       def format_record(attributes, record)
+        formatted_record = []
         attributes.collect do |attribute|
-          record_value(record, attribute)
+          record_value(record, attribute) do |formatted_value|
+            formatted_record << formatted_value
+          end
         end
+        formatted_record
       end
     end
 
@@ -602,7 +616,9 @@ module Droonga
       def format_record(attributes, record)
         values = {}
         attributes.each do |attribute|
-          values[attribute[:label]] = record_value(record, attribute)
+          record_value(record, attribute) do |formatted_value|
+            values[attribute[:label]] = formatted_value
+          end
         end
         values
       end

data/lib/droonga/serf.rb

@@ -70,6 +70,7 @@ module Droonga
                    "-bind", "#{extract_host(@name)}:#{port}",
                    "-event-handler", "droonga-engine-serf-event-handler",
                    "-log-level", log_level,
+                   "-tag", "role=engine",
                    *retry_joins)
       logger.trace("start: done")
     end

data/lib/droonga/service_installation.rb

@@ -75,13 +75,13 @@ module Droonga
 
     def installed_as_service?
       return false unless user_exist?
-    
+
       #TODO: we should support systemd also...
       succeeded = system("service", "droonga-engine", "status",
                          :out => "/dev/null",
                          :err => "/dev/null")
       return true if succeeded
-    
+
       #TODO: we should support systemd also...
       result = `service droonga-engine status`
       result.include?("running") or \

data/lib/droonga/single_step.rb

@@ -26,12 +26,12 @@ module Droonga
     def plan(message)
       if message["type"] == "search"
         # XXX: workaround
-        planner = Plugins::Search::Planner.new
+        planner = Plugins::Search::Planner.new(@dataset)
         return planner.plan(message)
       end
 
       # XXX: Re-implement me.
-      planner = Planner.new
+      planner = Planner.new(@dataset)
       options = {}
       options[:write] = @definition.write?
       collector_class = @definition.collector_class

data/test/command/fixture/event.jsons

@@ -3,8 +3,9 @@
   "type": "table_create",
   "dataset": "Default",
   "body": {
-    "name"  : "Event",
-    "flags" : "TABLE_HASH_KEY"
+    "name"     : "Event",
+    "flags"    : "TABLE_HASH_KEY",
+    "key_type" : "ShortText"
   }
 }
 {

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

@@ -3,8 +3,9 @@
   "type": "table_create",
   "dataset": "Default",
   "body": {
-    "name"  : "User",
-    "flags" : "TABLE_PAT_KEY"
+    "name"     : "User",
+    "flags"    : "TABLE_PAT_KEY",
+    "key_type" : "ShortText"
   }
 }
 {

data/test/command/fixture/users.jsons

@@ -0,0 +1,25 @@
+#@include fixture/user-table.jsons
+#@disable-logging
+{
+  "dataset": "Default",
+  "type": "add",
+  "body": {
+    "table": "User",
+    "key": "Alice",
+    "values": {
+      "name": "Alice"
+    }
+  }
+}
+{
+  "dataset": "Default",
+  "type": "add",
+  "body": {
+    "table": "User",
+    "key": "Bob",
+    "values": {
+      "name": "Bob"
+    }
+  }
+}
+#@enable-logging

data/test/command/run-test.rb

@@ -18,6 +18,19 @@
 require "rbconfig"
 require "fileutils"
 
+def system_serf_exist?
+  system("serf", "version",
+         :out => "/dev/null",
+         :err => "/dev/null")
+end
+
+unless system_serf_exist?
+  puts("Serf is not installed to your system.")
+  puts("Install Serf before running this test.")
+  puts("See: http://www.serfdom.io/")
+  exit(false)
+end
+
 def run(*command_line)
   return if system(*command_line)
   puts("failed to run: #{command_line.join(' ')}")
@@ -29,7 +42,6 @@ lib_dir = File.expand_path(File.join(base_dir, "..", "..", "lib"))
 
 drntest_options = []
 drntest_options.concat(["--base-path", base_dir])
-drntest_options.concat(["--droonga-engine-options", "--no-orchestration"])
 drntest_options.concat(ARGV)
 
 run("bundle", "exec", "drntest", *drntest_options)

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

@@ -2,8 +2,9 @@
   "type": "table_create",
   "dataset": "Default",
   "body": {
-    "name"  : "User",
-    "flags" : "TABLE_PAT_KEY"
+    "name"     : "User",
+    "flags"    : "TABLE_PAT_KEY",
+    "key_type" : "ShortText"
   }
 }
 {

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

@@ -2,8 +2,9 @@
   "type": "table_create",
   "dataset": "Default",
   "body": {
-    "name"  : "User",
-    "flags" : "TABLE_PAT_KEY"
+    "name"     : "User",
+    "flags"    : "TABLE_PAT_KEY",
+    "key_type" : "ShortText"
   }
 }
 {

data/test/command/suite/groonga/column_list/{success.test → no-key.test}

@@ -3,7 +3,7 @@
   "dataset": "Default",
   "body": {
     "name"  : "User",
-    "flags" : "TABLE_PAT_KEY"
+    "flags" : "TABLE_NO_KEY"
   }
 }
 {

data/test/command/suite/groonga/column_list/with-key.expected

@@ -0,0 +1,96 @@
+{
+  "inReplyTo": "request-id",
+  "statusCode": 200,
+  "type": "table_create.result",
+  "body": [
+    [
+      0,
+      0.0,
+      0.0
+    ],
+    true
+  ]
+}
+{
+  "inReplyTo": "request-id",
+  "statusCode": 200,
+  "type": "column_create.result",
+  "body": [
+    [
+      0,
+      0.0,
+      0.0
+    ],
+    true
+  ]
+}
+{
+  "inReplyTo": "request-id",
+  "statusCode": 200,
+  "type": "column_list.result",
+  "body": [
+    [
+      0,
+      0.0,
+      0.0
+    ],
+    [
+      [
+        [
+          "id",
+          "UInt32"
+        ],
+        [
+          "name",
+          "ShortText"
+        ],
+        [
+          "path",
+          "ShortText"
+        ],
+        [
+          "type",
+          "ShortText"
+        ],
+        [
+          "flags",
+          "ShortText"
+        ],
+        [
+          "domain",
+          "ShortText"
+        ],
+        [
+          "range",
+          "ShortText"
+        ],
+        [
+          "source",
+          "ShortText"
+        ]
+      ],
+      [
+        256,
+        "_key",
+        "",
+        "",
+        "COLUMN_SCALAR",
+        "User",
+        "ShortText",
+        []
+      ],
+      [
+        257,
+        "age",
+        "/path/to/column",
+        "fix",
+        "COLUMN_SCALAR",
+        "User",
+        "Int32",
+        [
+
+        ]
+      ]
+    ]
+  ]
+}