droonga-engine 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2a22b317f8d67460835b19b148b87065317f62
-  data.tar.gz: 2dd51cbb6b2ed3f667474d45f0735f5626a989e7
+  metadata.gz: c9d356f5ce7ea305000e8d982a0bacd9c02c1db4
+  data.tar.gz: 700367d322a8b3df05ed73a6b57782d30568bf8f
 SHA512:
-  metadata.gz: 64d02366c1dc7945091afeec62787ea1082091edb08e34f844d32cbc39ebed5839ff36cf840c4dbd7c89dff92d95e5037fbdfeadaee58af129c1aeaea8316a5c
-  data.tar.gz: b7c88b9cab4a8f5b438d789cb78cee50080efb4d78b826829b1057a3412d7b930fe99ab52ee2e2d899e98ca3725c4df244461671598e51adf455dafb99d55ce7
+  metadata.gz: b99cb2c1e4fa3df7d96700499277e37c6c7c37ba3eabeba5eb0721232712911d1cb691fc10f3159196b5633224d96f47fc66f4e279479643042282d2b3bc0654
+  data.tar.gz: 766e53f931fa1ea0c5ca58614bdaa9627cd382b84be60673cdcd35a9842739d097d9b3b9f9105eb6b675fec6cdbe480994b7ededd7802d287d512cc6234096b5

data/bin/droonga-engine-configure

@@ -23,6 +23,7 @@ require "droonga/path"
 require "droonga/command/droonga_engine"
 require "droonga/safe_file_writer"
 require "droonga/service_installation"
+require "droonga/logger"
 
 options = {
   :quiet => nil,
@@ -178,7 +179,9 @@ if options[:reset_config]
   if configuration.have_given_log_level? or options[:quiet]
     log_level = configuration.log_level
   else
-    log_level = input("log level", configuration.log_level)
+    levels = Droonga::Logger::Level::LABELS
+    levels_label = levels.join(",")
+    log_level = input("log level (#{levels_label})", configuration.log_level)
   end
 
   new_configuration = {

data/install.sh

@@ -43,6 +43,7 @@ TEMPDIR=/tmp/install-$NAME
 
 : ${VERSION:=release}
 : ${HOST:=Auto Detect}
+: ${PORT:=10031}
 
 case $(uname) in
   Darwin|*BSD|CYGWIN*) sed="sed -E" ;;
@@ -133,7 +134,7 @@ setup_configuration_directory() {
   fi
 
   droonga-engine-configure --quiet \
-    --host=$HOST
+    --host=$HOST --port=$PORT
   if [ $? -ne 0 ]; then
     echo "ERROR: Failed to configure $NAME!"
     exit 1

data/install/centos/droonga-engine

@@ -20,6 +20,11 @@ cd $DROONGA_BASE_DIR
 PIDFILE=/run/$NAME/$NAME.pid
 DAEMON_ARGS="--daemon --pid-file=$PIDFILE"
 
+# This directory is required to write PID file by non-root user.
+pid_dir=/run/$NAME
+mkdir -p $pid_dir
+chown -R $USER:$GROUP $pid_dir
+
 [ -x $DAEMON ] || exit 0
 
 start() {

data/install/centos/functions.sh

@@ -20,10 +20,6 @@ register_service() {
 
   #TODO: we should migrate to systemd in near future...
 
-  local pid_dir=/run/$NAME
-  mkdir -p $pid_dir
-  chown -R $USER:$GROUP $pid_dir
-
   curl -o /etc/rc.d/init.d/$NAME $(download_url "install/centos/$NAME")
   if [ $? -ne 0 ]; then
     echo "ERROR: Failed to download service script!"

data/install/debian/droonga-engine

@@ -22,6 +22,11 @@ PIDFILE=/var/run/$NAME/$NAME.pid
 DAEMON_ARGS="--daemon --pid-file=$PIDFILE"
 SCRIPTNAME=/etc/init.d/$NAME
 
+# This directory is required to write PID file by non-root user.
+pid_dir=/var/run/$NAME
+mkdir -p $pid_dir
+chown -R $USER:$GROUP $pid_dir
+
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 

data/install/debian/functions.sh

@@ -18,10 +18,6 @@ register_service() {
   local USER=$2
   local GROUP=$3
 
-  local pid_dir=/var/run/$NAME
-  mkdir -p $pid_dir
-  chown -R $USER:$GROUP $pid_dir
-
   curl -o /etc/init.d/$NAME $(download_url "install/debian/$NAME")
   if [ $? -ne 0 ]; then
     echo "ERROR: Failed to download service script!"

data/lib/droonga/address.rb

@@ -36,6 +36,7 @@ module Droonga
     end
 
     DEFAULT_HOST = Socket.gethostname
+    DEFAULT_HOST.force_encoding("US-ASCII") if DEFAULT_HOST.ascii_only?
     DEFAULT_PORT = 10031
     DEFAULT_TAG  = "droonga"
 

data/lib/droonga/command/droonga_engine.rb

@@ -114,7 +114,7 @@ module Droonga
 
       class Configuration
         attr_reader :host, :port, :tag, :log_file, :pid_file_path
-        attr_reader :ready_notify_fd
+        attr_reader :ready_notify_fd, :orchestrated
         def initialize
           config = load_config
 
@@ -128,6 +128,7 @@ module Droonga
           @daemon          = false
           @pid_file_path   = nil
           @ready_notify_fd = nil
+          @orchestrated = true
 
           if have_config_file?
             if config.include?("daemon")
@@ -224,6 +225,7 @@ module Droonga
           add_log_options(parser)
           add_process_options(parser)
           add_path_options(parser)
+          add_orchestration_options(parser)
           add_notification_options(parser)
         end
 
@@ -308,6 +310,13 @@ module Droonga
           end
         end
 
+        def add_orchestration_options(parser)
+          parser.on("--no-orchestration",
+                    "Disable orchestration with other nodes") do
+            @orchestrated = false
+          end
+        end
+
         def add_notification_options(parser)
           parser.separator("")
           parser.separator("Notification:")
@@ -339,7 +348,7 @@ module Droonga
 
           trap_signals
           @loop.run
-          @serf.stop if @serf.running?
+          @serf.stop if @serf and @serf.running?
 
           @service_runner.success?
         end
@@ -380,14 +389,14 @@ module Droonga
 
         def stop_gracefully
           @command_runner.stop
-          @serf.stop
+          @serf.stop if @serf
           @catalog_observer.stop
           @service_runner.stop_gracefully
         end
 
         def stop_immediately
           @command_runner.stop
-          @serf.stop
+          @serf.stop if @serf
           @catalog_observer.stop
           @service_runner.stop_immediately
         end
@@ -418,6 +427,7 @@ module Droonga
         end
 
         def run_serf
+          return nil unless @configuration.orchestrated
           serf = Serf.new(@loop, @configuration.engine_name)
           serf.start
           serf

data/lib/droonga/engine/version.rb

@@ -15,6 +15,6 @@
 
 module Droonga
   class Engine
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

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

@@ -19,6 +19,7 @@ module Droonga
   module Plugins
     module Groonga
       module Select
+        DEFAULT_QUERY_FLAGS = "ALLOW_PRAGMA|ALLOW_COLUMN"
         DRILLDOWN_RESULT_PREFIX = "drilldown_result_"
 
         class RequestConverter
@@ -89,13 +90,13 @@ module Droonga
 
             conditions = []
             if query
-              conditions << {
+              condition = {
                 "query"  => query,
                 "matchTo"=> match_to,
                 "defaultOperator"=> "&&",
-                "allowPragma"=> false,
-                "allowColumn"=> true,
               }
+              apply_query_flags(condition, select_request["query_flags"])
+              conditions << condition
             end
 
             if filter
@@ -114,6 +115,15 @@ module Droonga
             condition
           end
 
+          def apply_query_flags(condition, flags)
+            flags ||= DEFAULT_QUERY_FLAGS
+            flags = flags.split("|")
+            condition["allowPragma"] = flags.include?("ALLOW_PRAGMA")
+            condition["allowColumn"] = flags.include?("ALLOW_COLUMN")
+            condition["allowUpdate"] = flags.include?("ALLOW_UPDATE")
+            condition["allowLeadingNot"] = flags.include?("ALLOW_LEADING_NOT")
+          end
+
           def convert_drilldown(select_request)
             drilldown_keys = select_request["drilldown"]
             return nil if drilldown_keys.nil? or drilldown_keys.empty?

data/lib/droonga/searcher.rb

@@ -265,6 +265,10 @@ module Droonga
         query = condition["query"]
         if query
           options[:syntax] = :query
+          options[:allow_pragma] = true
+          options[:allow_column] = true
+          options[:allow_update] = false
+          options[:allow_leading_not] = false
           if condition["defaultOperator"]
             default_operator_string = condition["defaultOperator"]
             default_operator = OPERATOR_CONVERSION_TABLE[default_operator_string]
@@ -273,11 +277,21 @@ module Droonga
             end
             options[:default_operator] = default_operator
           end
-          if condition["allowPragma"]
-            options[:allow_pragma] = true
+          unless condition["allowPragma"].nil?
+            options[:allow_pragma] = condition["allowPragma"] ? true : false
           end
-          if condition["allowColumn"]
-            options[:allow_column] = true
+          unless condition["allowColumn"].nil?
+            options[:allow_column] = condition["allowColumn"] ? true : false
+          end
+          #XXX Currently we disallow to set this option to true, because
+          #    a `search` command is handled only on one replica and ignored by other replicas.
+          #    If we simply allow allowUpdate=true, replicas can be un-synchronized.
+          #    We have to do something about this problem.
+          # unless condition["allowUpdate"].nil?
+          #   options[:allow_update] = condition["allowUpdate"] ? true : false
+          # end
+          unless condition["allowLeadingNot"].nil?
+            options[:allow_leading_not] = condition["allowLeadingNot"] ? true : false
           end
           syntax_errors = [
             Groonga::SyntaxError,

data/test/command/run-test.rb

@@ -29,6 +29,7 @@ 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/unit/plugins/groonga/select/test_adapter_input.rb

@@ -83,8 +83,10 @@ class GroongaSelectAdapterInputTest < Test::Unit::TestCase
               "query"  => "QueryTest",
               "matchTo"=> expected_matchTo,
               "defaultOperator"=> "&&",
-              "allowPragma"=> false,
+              "allowPragma"=> true,
               "allowColumn"=> true,
+              "allowUpdate"=> false,
+              "allowLeadingNot" => false,
             },
             "output"   => {
               "elements"   => [
@@ -165,8 +167,10 @@ class GroongaSelectAdapterInputTest < Test::Unit::TestCase
                 "query"  => "QueryTest",
                 "matchTo"=> ["_key"],
                 "defaultOperator"=> "&&",
-                "allowPragma"=> false,
+                "allowPragma"=> true,
                 "allowColumn"=> true,
+                "allowUpdate"=> false,
+                "allowLeadingNot" => false,
               },
               "title@'FilterTest'",
             ],
@@ -189,6 +193,88 @@ class GroongaSelectAdapterInputTest < Test::Unit::TestCase
     end
   end
 
+  class QueryFlagsTest < self
+    def test_none
+      select_request = {
+        "table"          => "EmptyTable",
+        "match_columns"  => "_key",
+        "query"          => "QueryTest",
+        "query_flags"    => "NONE",
+      }
+      expected_search_condition = {
+        "query"  => "QueryTest",
+        "matchTo"=> ["_key"],
+        "defaultOperator"=> "&&",
+        "allowPragma" => false,
+        "allowColumn" => false,
+        "allowUpdate"=> false,
+        "allowLeadingNot" => false,
+      }
+      assert_equal(expected_search_condition,
+                   convert(select_request)["queries"]["EmptyTable_result"]["condition"])
+    end
+
+    def test_allow_pragma_only
+      select_request = {
+        "table"          => "EmptyTable",
+        "match_columns"  => "_key",
+        "query"          => "QueryTest",
+        "query_flags"    => "ALLOW_PRAGMA",
+      }
+      expected_search_condition = {
+        "query"  => "QueryTest",
+        "matchTo"=> ["_key"],
+        "defaultOperator"=> "&&",
+        "allowPragma" => true,
+        "allowColumn" => false,
+        "allowUpdate"=> false,
+        "allowLeadingNot" => false,
+      }
+      assert_equal(expected_search_condition,
+                   convert(select_request)["queries"]["EmptyTable_result"]["condition"])
+    end
+
+    def test_allow_column_only
+      select_request = {
+        "table"          => "EmptyTable",
+        "match_columns"  => "_key",
+        "query"          => "QueryTest",
+        "query_flags"    => "ALLOW_COLUMN",
+      }
+      expected_search_condition = {
+        "query"  => "QueryTest",
+        "matchTo"=> ["_key"],
+        "defaultOperator"=> "&&",
+        "allowPragma" => false,
+        "allowColumn" => true,
+        "allowUpdate"=> false,
+        "allowLeadingNot" => false,
+      }
+      assert_equal(expected_search_condition,
+                   convert(select_request)["queries"]["EmptyTable_result"]["condition"])
+    end
+
+    def test_allow_leading_not_only
+      select_request = {
+        "table"          => "EmptyTable",
+        "match_columns"  => "_key",
+        "query"          => "QueryTest",
+        "query_flags"    => "ALLOW_LEADING_NOT",
+      }
+      expected_search_condition = {
+        "query"  => "QueryTest",
+        "matchTo"=> ["_key"],
+        "defaultOperator"=> "&&",
+        "allowPragma" => false,
+        "allowColumn" => false,
+        "allowUpdate"=> false,
+        "allowLeadingNot" => true,
+      }
+      assert_equal(expected_search_condition,
+                   convert(select_request)["queries"]["EmptyTable_result"]["condition"])
+    end
+  end
+
   class OffsetTest < self
     def assert_offset(expected_offset, offset)
       select_request = {

data/test/unit/plugins/groonga/test_table_list.rb

@@ -44,6 +44,10 @@ class TableListTest < GroongaHandlerTest
   end
 
   class ListTest < self
+    def table_path
+      @database_path.to_s + ".0000100"
+    end
+
     def test_hash_table
       Groonga::Schema.define do |schema|
         schema.create_table("Books", :type => :hash)
@@ -53,7 +57,7 @@ class TableListTest < GroongaHandlerTest
         TABLES_HEADER,
         [256,
          "Books",
-         @database_path.to_s + ".0000100",
+         table_path,
          "TABLE_HASH_KEY|PERSISTENT",
          "ShortText",
          nil,
@@ -72,7 +76,7 @@ class TableListTest < GroongaHandlerTest
         TABLES_HEADER,
         [256,
          "HistoryEntries",
-         @database_path.to_s + ".0000100",
+         table_path,
          "TABLE_NO_KEY|PERSISTENT",
          nil,
          nil,
@@ -91,7 +95,7 @@ class TableListTest < GroongaHandlerTest
         TABLES_HEADER,
         [256,
          "Books",
-         @database_path.to_s + ".0000100",
+         table_path,
          "TABLE_PAT_KEY|PERSISTENT",
          "ShortText",
          nil,
@@ -110,7 +114,7 @@ class TableListTest < GroongaHandlerTest
         TABLES_HEADER,
         [256,
          "Books",
-         @database_path.to_s + ".0000100",
+         table_path,
          "TABLE_DAT_KEY|PERSISTENT",
          "ShortText",
          nil,
@@ -131,7 +135,7 @@ class TableListTest < GroongaHandlerTest
         TABLES_HEADER,
         [256,
          "BookIds",
-         @database_path.to_s + ".0000100",
+         table_path,
          "TABLE_HASH_KEY|PERSISTENT",
          "UInt32",
          "UInt32",
@@ -151,7 +155,7 @@ class TableListTest < GroongaHandlerTest
         TABLES_HEADER,
         [256,
          "Books",
-         @database_path.to_s + ".0000100",
+         table_path,
          "TABLE_HASH_KEY|PERSISTENT",
          "ShortText",
          nil,
@@ -171,7 +175,7 @@ class TableListTest < GroongaHandlerTest
         TABLES_HEADER,
         [256,
          "Books",
-         @database_path.to_s + ".0000100",
+         table_path,
          "TABLE_HASH_KEY|PERSISTENT",
          "ShortText",
          nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droonga-engine
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip