rroonga 5.0.4-x86-mingw32 → 5.0.5-x86-mingw32

data/vendor/local/include/groonga/groonga.h

@@ -26,5 +26,7 @@
 #include "groonga/output.h"
 #include "groonga/util.h"
 #include "groonga/request_canceler.h"
+#include "groonga/thread.h"
+#include "groonga/windows_event_logger.h"
 
 #endif /* GROONGA_H */

data/vendor/local/include/groonga/groonga/command.h

@@ -43,6 +43,8 @@ GRN_PLUGIN_EXPORT grn_obj *grn_command_input_get(grn_ctx *ctx,
 GRN_PLUGIN_EXPORT grn_obj *grn_command_input_at(grn_ctx *ctx,
                                                 grn_command_input *input,
                                                 unsigned int offset);
+GRN_PLUGIN_EXPORT grn_obj *grn_command_input_get_arguments(grn_ctx *ctx,
+                                                           grn_command_input *input);
 
 typedef void grn_command_run_func(grn_ctx *ctx,
                                   grn_obj *command,

data/vendor/local/include/groonga/groonga/groonga.h

@@ -20,6 +20,7 @@
 
 #include <stdarg.h>
 #include <sys/types.h>
+#include <stdint.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -161,6 +162,9 @@ typedef enum {
   GRN_LOG_DUMP
 } grn_log_level;
 
+GRN_API const char *grn_log_level_to_string(grn_log_level level);
+GRN_API grn_bool grn_log_level_parse(const char *string, grn_log_level *level);
+
 /* query log flags */
 #define GRN_QUERY_LOG_NONE        (0x00)
 #define GRN_QUERY_LOG_COMMAND     (0x01<<0)
@@ -430,6 +434,7 @@ GRN_API grn_obj *grn_db_create(grn_ctx *ctx, const char *path, grn_db_create_opt
 GRN_API grn_obj *grn_db_open(grn_ctx *ctx, const char *path);
 GRN_API void grn_db_touch(grn_ctx *ctx, grn_obj *db);
 GRN_API grn_rc grn_db_recover(grn_ctx *ctx, grn_obj *db);
+GRN_API grn_rc grn_db_unmap(grn_ctx *ctx, grn_obj *db);
 
 GRN_API grn_rc grn_ctx_use(grn_ctx *ctx, grn_obj *db);
 GRN_API grn_obj *grn_ctx_db(grn_ctx *ctx);

data/vendor/local/include/groonga/groonga/obj.h

@@ -28,6 +28,7 @@ GRN_API grn_bool grn_obj_is_table(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_function_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_selector_proc(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_selector_only_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_scorer_proc(grn_ctx *ctx, grn_obj *obj);
 
 #ifdef __cplusplus

data/vendor/local/include/groonga/groonga/portability.h

@@ -117,6 +117,22 @@
   strcat((dest), (src))
 #endif /* WIN32 */
 
+#ifdef WIN32
+# define grn_strcasecmp(string1, string2)       \
+  _stricmp((string1), (string2))
+#else /* WIN32 */
+# define grn_strcasecmp(string1, string2)       \
+  strcasecmp((string1), (string2))
+#endif /* WIN32 */
+
+#ifdef WIN32
+# define grn_strncasecmp(string1, string2, n)   \
+  _strnicmp((string1), (string2), (n))
+#else /* WIN32 */
+# define grn_strncasecmp(string1, string2, n)   \
+  strncasecmp((string1), (string2), (n))
+#endif /* WIN32 */
+
 #ifdef WIN32
 # define grn_snprintf(dest, dest_size, n, format, ...)          \
   _snprintf_s((dest), (dest_size), (n) - 1, (format), __VA_ARGS__)

data/vendor/local/include/groonga/groonga/thread.h

@@ -0,0 +1,42 @@
+/* -*- c-basic-offset: 2 -*- */
+/*
+  Copyright(C) 2015 Brazil
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef GROONGA_THREAD_H
+#define GROONGA_THREAD_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+GRN_API uint32_t grn_thread_get_limit(void);
+GRN_API void grn_thread_set_limit(uint32_t new_limit);
+
+
+typedef uint32_t (*grn_thread_get_limit_func)(void *data);
+GRN_API void grn_thread_set_get_limit_func(grn_thread_get_limit_func func,
+                                           void *data);
+typedef void (*grn_thread_set_limit_func)(uint32_t new_limit, void *data);
+GRN_API void grn_thread_set_set_limit_func(grn_thread_set_limit_func func,
+                                           void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GROONGA_THREAD_H */

data/vendor/local/include/groonga/groonga/windows_event_logger.h

@@ -0,0 +1,33 @@
+/*
+  Copyright(C) 2015 Brazil
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef GROONGA_WINDOWS_EVENT_LOGGER_H
+#define GROONGA_WINDOWS_EVENT_LOGGER_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+GRN_API grn_rc grn_windows_event_logger_set(grn_ctx *ctx,
+                                            const char *event_source_name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GROONGA_WINDOWS_EVENT_LOGGER_H */

data/vendor/local/lib/groonga/plugins/functions/vector.la

@@ -17,7 +17,7 @@ old_library='vector.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libonig.la -lpthread -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/functions'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/functions'

data/vendor/local/lib/groonga/plugins/query_expanders/tsv.la

@@ -17,7 +17,7 @@ old_library='tsv.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libonig.la -lpthread -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/query_expanders'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/query_expanders'

data/vendor/local/lib/groonga/plugins/ruby/eval.la

@@ -17,7 +17,7 @@ old_library='eval.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32 /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libonig.la -lpthread -llz4 -lz -lws2_32 /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/ruby'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/ruby'

data/vendor/local/lib/groonga/plugins/ruby/load.la

@@ -17,7 +17,7 @@ old_library='load.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libonig.la -llz4 -lz -lws2_32 /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libonig.la -lpthread -llz4 -lz -lws2_32 /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/ruby'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/groonga/plugins/ruby'

data/vendor/local/lib/groonga/plugins/sharding.rb

@@ -1,6 +1,11 @@
+require "sharding/parameters"
 require "sharding/range_expression_builder"
 require "sharding/logical_enumerator"
+
+require "sharding/logical_parameters"
+
 require "sharding/logical_count"
 require "sharding/logical_range_filter"
 require "sharding/logical_select"
+require "sharding/logical_shard_list"
 require "sharding/logical_table_remove"

data/vendor/local/lib/groonga/plugins/sharding/logical_count.rb

@@ -17,25 +17,59 @@ module Groonga
         filter = input[:filter]
 
         total = 0
-        enumerator.each do |table, shard_key, shard_range|
-          total += count_n_records(table, filter,
-                                   shard_key, shard_range,
+        enumerator.each do |shard, shard_range|
+          total += count_n_records(filter, shard, shard_range,
                                    enumerator.target_range)
         end
         writer.write(total)
       end
 
       private
-      def count_n_records(table, filter,
-                          shard_key, shard_range,
-                          target_range)
+      def cache_key(input)
+        key = "logical_count\0"
+        key << "#{input[:logical_table]}\0"
+        key << "#{input[:shard_key]}\0"
+        key << "#{input[:min]}\0"
+        key << "#{input[:min_border]}\0"
+        key << "#{input[:max]}\0"
+        key << "#{input[:max_border]}\0"
+        key << "#{input[:filter]}\0"
+        key
+      end
+
+      def log_use_range_index(use, table_name, line, method)
+        message = "[logical_count]"
+        if use
+          message << "[range-index]"
+        else
+          message << "[select]"
+        end
+        message << " <#{table_name}>"
+        Context.instance.logger.log(Logger::Level::DEBUG,
+                                    __FILE__,
+                                    line,
+                                    method.to_s,
+                                    message)
+      end
+
+      def count_n_records(filter, shard, shard_range, target_range)
         cover_type = target_range.cover_type(shard_range)
         return 0 if cover_type == :none
 
+        shard_key = shard.key
+        if shard_key.nil?
+          message = "[logical_count] shard_key doesn't exist: " +
+                    "<#{shard.key_name}>"
+          raise InvalidArgument, message
+        end
+        table = shard.table
+        table_name = shard.table_name
+
         expression_builder = RangeExpressionBuilder.new(shard_key,
                                                         target_range,
                                                         filter)
         if cover_type == :all
+          log_use_range_index(false, table_name, __LINE__, __method__)
           if filter.nil?
             return table.size
           else
@@ -53,6 +87,9 @@ module Groonga
           end
         end
 
+        use_range_index = (!range_index.nil?)
+        log_use_range_index(use_range_index, table_name, __LINE__, __method__)
+
         case cover_type
         when :partial_min
           if range_index

data/vendor/local/lib/groonga/plugins/sharding/logical_enumerator.rb

@@ -1,12 +1,15 @@
 module Groonga
   module Sharding
     class LogicalEnumerator
+      include Enumerable
+
       attr_reader :target_range
       attr_reader :logical_table
       attr_reader :shard_key_name
-      def initialize(command_name, input)
+      def initialize(command_name, input, options={})
         @command_name = command_name
         @input = input
+        @options = options
         initialize_parameters
       end
 
@@ -22,7 +25,6 @@ module Groonga
       def each_internal(order)
         context = Context.instance
         each_shard_with_around(order) do |prev_shard, current_shard, next_shard|
-          table = current_shard.table
           shard_range_data = current_shard.range_data
           shard_range = nil
 
@@ -52,16 +54,7 @@ module Groonga
                                             shard_range_data.day)
           end
 
-          physical_shard_key_name = "#{table.name}.#{@shard_key_name}"
-          shard_key = context[physical_shard_key_name]
-          if shard_key.nil?
-            message =
-              "[#{@command_name}] shard_key doesn't exist: " +
-              "<#{physical_shard_key_name}>"
-            raise InvalidArgument, message
-          end
-
-          yield(table, shard_key, shard_range)
+          yield(current_shard, shard_range)
         end
       end
 
@@ -70,10 +63,10 @@ module Groonga
         prefix = "#{@logical_table}_"
 
         shards = [nil]
-        context.database.each_table(:prefix => prefix,
-                                    :order_by => :key,
-                                    :order => order) do |table|
-          shard_range_raw = table.name[prefix.size..-1]
+        context.database.each_name(:prefix => prefix,
+                                   :order_by => :key,
+                                   :order => order) do |name|
+          shard_range_raw = name[prefix.size..-1]
 
           case shard_range_raw
           when /\A(\d{4})(\d{2})\z/
@@ -84,7 +77,7 @@ module Groonga
             next
           end
 
-          shards << Shard.new(table, shard_range_data)
+          shards << Shard.new(name, @shard_key_name, shard_range_data)
           next if shards.size < 3
           yield(*shards)
           shards.shift
@@ -104,7 +97,11 @@ module Groonga
 
         @shard_key_name = @input[:shard_key]
         if @shard_key_name.nil?
-          raise InvalidArgument, "[#{@command_name}] shard_key is missing"
+          require_shard_key = @options[:require_shard_key]
+          require_shard_key = true if require_shard_key.nil?
+          if require_shard_key
+            raise InvalidArgument, "[#{@command_name}] shard_key is missing"
+          end
         end
 
         @target_range = TargetRange.new(@command_name, @input)
@@ -119,11 +116,24 @@ module Groonga
       end
 
       class Shard
-        attr_reader :table, :range_data
-        def initialize(table, range_data)
-          @table = table
+        attr_reader :table_name, :key_name, :range_data
+        def initialize(table_name, key_name, range_data)
+          @table_name = table_name
+          @key_name = key_name
           @range_data = range_data
         end
+
+        def table
+          @table ||= Context.instance[@table_name]
+        end
+
+        def full_key_name
+          "#{@table_name}.#{@key_name}"
+        end
+
+        def key
+          @key ||= Context.instance[full_key_name]
+        end
       end
 
       class ShardRangeData
@@ -270,10 +280,7 @@ module Groonga
 
           return true if @min_border == :exclude
 
-          not (@min.hour == 0 and
-               @min.min  == 0 and
-               @min.sec  == 0 and
-               @min.usec == 0)
+          shard_range.min_time != @min
         end
 
         def in_max?(shard_range)