rroonga 5.0.0-x64-mingw32 → 5.0.1-x64-mingw32

data/test/test-procedure.rb

@@ -27,6 +27,30 @@ class ProcedureTest < Test::Unit::TestCase
                            :accept_nil => true)
   end
 
+  def test_procedure?
+    assert do
+      Groonga["TokenBigram"].procedure?
+    end
+  end
+
+  def test_function_procedure?
+    assert do
+      Groonga["rand"].function_procedure?
+    end
+  end
+
+  def test_selector_procedure?
+    assert do
+      Groonga["between"].selector_procedure?
+    end
+  end
+
+  def test_scorer_procedure?
+    assert do
+      Groonga["scorer_tf_idf"].scorer_procedure?
+    end
+  end
+
   private
   def assert_equal_procedure(expected_name, id, options={})
     procedure = Groonga::Context.default[id]
@@ -40,5 +64,10 @@ class ProcedureTest < Test::Unit::TestCase
       tokenizer = Groonga["TokenBigram"]
       assert_equal(Groonga::ProcedureType::TOKENIZER, tokenizer.type)
     end
+
+    def test_scorer
+      scorer = Groonga["scorer_tf_idf"]
+      assert_equal(Groonga::ProcedureType::SCORER, scorer.type)
+    end
   end
 end

data/test/test-schema-type.rb

@@ -205,4 +205,18 @@ class SchemaTypeTest < Test::Unit::TestCase
   def assert_normalize_type(expected, type)
     assert_equal(expected, Groonga::Schema.normalize_type(type))
   end
+
+  class RegexpTest < self
+    def test_normalize_short_name
+      assert_normalize_type("TokenRegexp", "regexp")
+    end
+
+    def test_normalize_snake_case
+      assert_normalize_type("TokenRegexp", "token_regexp")
+    end
+
+    def test_normalize_camel_case
+      assert_normalize_type("TokenRegexp", "TokenRegexp")
+    end
+  end
 end

data/test/test-table-select-mecab.rb

@@ -20,10 +20,7 @@ class TableSelectMecabTest < Test::Unit::TestCase
 
   setup :setup_database
 
-  setup
-  def check_mecab_availability
-    omit("MeCab isn't available") if context["TokenMecab"].nil?
-  end
+  setup :check_mecab_availability
 
   setup
   def setup_tables

data/test/test-table.rb

@@ -630,6 +630,13 @@ class TableTest < Test::Unit::TestCase
     assert_not_predicate(bookmarks, :builtin?)
   end
 
+  def test_table?
+    bookmarks = Groonga::PatriciaTrie.create(:name => "Bookmarks")
+    assert do
+      bookmarks.table?
+    end
+  end
+
   class OtherProcessTest < self
     def test_create
       by_other_process do

data/test/test-token-regexp.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 2015  Masafumi Yokoyama <clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# 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
+
+class TokenRegexpTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def setup
+    setup_database
+  end
+
+  def test_default_tokenizer
+    terms = Groonga::PatriciaTrie.create(:name => "Terms",
+                                         :key_type => "ShortText",
+                                         :default_tokenizer => "TokenRegexp")
+    assert_equal(context["TokenRegexp"],
+                 terms.default_tokenizer)
+  end
+end

data/test/test-type.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -133,4 +134,27 @@ class TypeTest < Test::Unit::TestCase
     assert_equal(expected_name,
                  type ? type.name : type)
   end
+
+  class TokenizerTest < self
+    def test_delimit
+      assert_equal_type("TokenDelimit", Groonga::Type::DELIMIT)
+    end
+
+    def test_unigram
+      assert_equal_type("TokenUnigram", Groonga::Type::UNIGRAM)
+    end
+
+    def test_bigram
+      assert_equal_type("TokenBigram", Groonga::Type::BIGRAM)
+    end
+
+    def test_trigram
+      assert_equal_type("TokenTrigram", Groonga::Type::TRIGRAM)
+    end
+
+    def test_mecab
+      check_mecab_availability
+      assert_equal_type("TokenMecab",  Groonga::Type::MECAB)
+    end
+  end
 end

data/vendor/local/bin/mecab-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64
+prefix=/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64
 exec_prefix=${prefix}
 exec_prefix_set=no
 
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 	;;
 
     --libexecdir)
-       	echo /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/libexec/mecab
+       	echo /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/libexec/mecab
        	;;
 	
     --sysconfdir)

data/vendor/local/bin/onig-config

@@ -27,7 +27,7 @@ if test $# -eq 0; then
   show_usage
 fi
 
-prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64
+prefix=/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64
 exec_prefix=${prefix}
 is_set_exec_prefix=no
 

data/vendor/local/etc/groonga/groonga.conf

@@ -1,6 +1,6 @@
 # encoding = utf-8
 # log-level = 1
-# address = 0.0.0.0
+# bind-address = 0.0.0.0
 # port = 10041
 # server-id = groonga.example.com
 # max-threads = 2

data/vendor/local/etc/groonga/httpd/groonga-httpd.conf

@@ -15,7 +15,7 @@ http {
   keepalive_timeout 65;
 
   # The default groonga database path.
-  groonga_database /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/var/lib/groonga/db/db;
+  groonga_database /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/var/lib/groonga/db/db;
 
   # Create a groonga database automatically if the groonga database doesn't
   # exist.
@@ -45,7 +45,7 @@ http {
     }
 
     location / {
-      root /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/share/groonga/html/admin;
+      root /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/share/groonga/html/admin;
       index index.html;
     }
 

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

@@ -101,6 +101,8 @@ GRN_API grn_rc grn_expr_snip_add_conditions(grn_ctx *ctx,
                                             const char **closetags,
                                             unsigned int *closetag_lens);
 
+GRN_API unsigned int grn_expr_estimate_size(grn_ctx *ctx, grn_obj *expr);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -121,6 +121,7 @@ typedef enum {
   GRN_TOKEN_FILTER_ERROR = -73,
   GRN_COMMAND_ERROR = -74,
   GRN_PLUGIN_ERROR = -75,
+  GRN_SCORER_ERROR = -76
 } grn_rc;
 
 GRN_API grn_rc grn_init(void);
@@ -181,7 +182,8 @@ typedef enum {
   GRN_CONTENT_TSV,
   GRN_CONTENT_JSON,
   GRN_CONTENT_XML,
-  GRN_CONTENT_MSGPACK
+  GRN_CONTENT_MSGPACK,
+  GRN_CONTENT_GROONGA_COMMAND_LIST
 } grn_content_type;
 
 typedef struct _grn_obj grn_obj;
@@ -431,6 +433,7 @@ GRN_API grn_rc grn_db_recover(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);
 GRN_API grn_obj *grn_ctx_get(grn_ctx *ctx, const char *name, int name_size);
+GRN_API grn_rc grn_ctx_get_all_tables(grn_ctx *ctx, grn_obj *tables_buffer);
 
 typedef enum {
   GRN_DB_VOID = 0,
@@ -468,7 +471,9 @@ GRN_API grn_obj *grn_type_create(grn_ctx *ctx, const char *name, unsigned int na
                                  grn_obj_flags flags, unsigned int size);
 
 GRN_API grn_rc grn_plugin_register(grn_ctx *ctx, const char *name);
+GRN_API grn_rc grn_plugin_unregister(grn_ctx *ctx, const char *name);
 GRN_API grn_rc grn_plugin_register_by_path(grn_ctx *ctx, const char *path);
+GRN_API grn_rc grn_plugin_unregister_by_path(grn_ctx *ctx, const char *path);
 GRN_API const char *grn_plugin_get_system_plugins_dir(void);
 GRN_API const char *grn_plugin_get_suffix(void);
 
@@ -487,7 +492,8 @@ typedef enum {
   GRN_PROC_FUNCTION,
   GRN_PROC_HOOK,
   GRN_PROC_NORMALIZER,
-  GRN_PROC_TOKEN_FILTER
+  GRN_PROC_TOKEN_FILTER,
+  GRN_PROC_SCORER
 } grn_proc_type;
 
 GRN_API grn_obj *grn_proc_create(grn_ctx *ctx,
@@ -707,7 +713,8 @@ typedef enum {
   GRN_OP_TABLE_SORT,
   GRN_OP_TABLE_GROUP,
   GRN_OP_JSON_PUT,
-  GRN_OP_GET_MEMBER
+  GRN_OP_GET_MEMBER,
+  GRN_OP_REGEXP
 } grn_operator;
 
 GRN_API const char *grn_operator_to_string(grn_operator op);
@@ -720,6 +727,12 @@ GRN_API grn_bool grn_operator_exec_less_equal(grn_ctx *ctx,
                                               grn_obj *x, grn_obj *y);
 GRN_API grn_bool grn_operator_exec_greater_equal(grn_ctx *ctx,
                                                  grn_obj *x, grn_obj *y);
+GRN_API grn_bool grn_operator_exec_match(grn_ctx *ctx,
+                                         grn_obj *target, grn_obj *sub_text);
+GRN_API grn_bool grn_operator_exec_prefix(grn_ctx *ctx,
+                                          grn_obj *target, grn_obj *prefix);
+GRN_API grn_bool grn_operator_exec_regexp(grn_ctx *ctx,
+                                          grn_obj *target, grn_obj *pattern);
 
 struct _grn_table_group_result {
   grn_obj *table;
@@ -834,8 +847,6 @@ GRN_API grn_obj *grn_obj_get_element_info(grn_ctx *ctx, grn_obj *obj, grn_id id,
 GRN_API grn_rc grn_obj_set_element_info(grn_ctx *ctx, grn_obj *obj, grn_id id,
                                         grn_info_type type, grn_obj *value);
 
-GRN_API grn_bool grn_obj_is_builtin(grn_ctx *ctx, grn_obj *obj);
-
 GRN_API grn_obj *grn_obj_get_value(grn_ctx *ctx, grn_obj *obj, grn_id id, grn_obj *value);
 GRN_API int grn_obj_get_values(grn_ctx *ctx, grn_obj *obj, grn_id offset, void **values);
 
@@ -910,6 +921,9 @@ struct _grn_search_optarg {
   int vector_size;
   grn_obj *proc;
   int max_size;
+  grn_obj *scorer;
+  grn_obj *scorer_args_expr;
+  unsigned int scorer_args_expr_offset;
 };
 
 GRN_API grn_rc grn_obj_search(grn_ctx *ctx, grn_obj *obj, grn_obj *query,
@@ -975,9 +989,22 @@ GRN_API grn_rc grn_obj_delete_hook(grn_ctx *ctx, grn_obj *obj, grn_hook_entry en
 
 GRN_API grn_obj *grn_obj_open(grn_ctx *ctx, unsigned char type, grn_obj_flags flags, grn_id domain);
 
+/* Deprecated since 5.0.1. Use grn_column_find_indexes() instead. */
 GRN_API int grn_column_index(grn_ctx *ctx, grn_obj *column, grn_operator op,
                              grn_obj **indexbuf, int buf_size, int *section);
 
+/* @since 5.0.1. */
+typedef struct _grn_index_datum {
+  grn_obj *index;
+  unsigned int section;
+} grn_index_datum;
+
+/* @since 5.0.1. */
+GRN_API unsigned int grn_column_find_index_data(grn_ctx *ctx, grn_obj *column,
+                                                grn_operator op,
+                                                grn_index_datum *index_data,
+                                                unsigned int n_index_data);
+
 GRN_API grn_rc grn_obj_delete_by_id(grn_ctx *ctx, grn_obj *db, grn_id id, grn_bool removep);
 GRN_API grn_rc grn_obj_path_by_id(grn_ctx *ctx, grn_obj *db, grn_id id, char *buffer);
 

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

@@ -28,6 +28,13 @@ typedef struct _grn_ii grn_ii;
 typedef struct _grn_ii_buffer grn_ii_buffer;
 
 GRN_API unsigned int grn_ii_estimate_size(grn_ctx *ctx, grn_ii *ii, grn_id tid);
+GRN_API unsigned int grn_ii_estimate_size_for_query(grn_ctx *ctx, grn_ii *ii,
+                                                    const char *query,
+                                                    unsigned int query_len,
+                                                    grn_search_optarg *optarg);
+GRN_API unsigned int grn_ii_estimate_size_for_lexicon_cursor(grn_ctx *ctx,
+                                                             grn_ii *ii,
+                                                             grn_table_cursor *lexicon_cursor);
 
 GRN_API grn_ii_buffer *grn_ii_buffer_open(grn_ctx *ctx, grn_ii *ii,
                                           long long unsigned int update_buffer_size);

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

@@ -0,0 +1,37 @@
+/* -*- 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_OBJ_H
+#define GROONGA_OBJ_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+GRN_API grn_bool grn_obj_is_builtin(grn_ctx *ctx, grn_obj *obj);
+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_scorer_proc(grn_ctx *ctx, grn_obj *obj);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GROONGA_OBJ_H */

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

@@ -0,0 +1,95 @@
+/* -*- 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 version 2.1 as published by the Free Software Foundation.
+
+  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_SCORER_H
+#define GROONGA_SCORER_H
+
+#include <groonga/plugin.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+typedef struct _grn_scorer_matched_record grn_scorer_matched_record;
+
+GRN_API grn_obj *
+  grn_scorer_matched_record_get_table(grn_ctx *ctx,
+                                      grn_scorer_matched_record *record);
+GRN_API grn_obj *
+  grn_scorer_matched_record_get_lexicon(grn_ctx *ctx,
+                                        grn_scorer_matched_record *record);
+GRN_API grn_id
+  grn_scorer_matched_record_get_id(grn_ctx *ctx,
+                                   grn_scorer_matched_record *record);
+GRN_API grn_obj *
+  grn_scorer_matched_record_get_terms(grn_ctx *ctx,
+                                      grn_scorer_matched_record *record);
+GRN_API grn_obj *
+  grn_scorer_matched_record_get_term_weights(grn_ctx *ctx,
+                                             grn_scorer_matched_record *record);
+GRN_API unsigned int
+  grn_scorer_matched_record_get_total_term_weights(grn_ctx *ctx,
+                                                   grn_scorer_matched_record *record);
+GRN_API long long unsigned int
+  grn_scorer_matched_record_get_n_documents(grn_ctx *ctx,
+                                            grn_scorer_matched_record *record);
+GRN_API unsigned int
+  grn_scorer_matched_record_get_n_occurrences(grn_ctx *ctx,
+                                              grn_scorer_matched_record *record);
+GRN_API long long unsigned int
+  grn_scorer_matched_record_get_n_candidates(grn_ctx *ctx,
+                                             grn_scorer_matched_record *record);
+GRN_API unsigned int
+  grn_scorer_matched_record_get_n_tokens(grn_ctx *ctx,
+                                         grn_scorer_matched_record *record);
+GRN_API int
+  grn_scorer_matched_record_get_weight(grn_ctx *ctx,
+                                       grn_scorer_matched_record *record);
+GRN_API grn_obj *
+  grn_scorer_matched_record_get_arg(grn_ctx *ctx,
+                                    grn_scorer_matched_record *record,
+                                    unsigned int i);
+GRN_API unsigned int
+  grn_scorer_matched_record_get_n_args(grn_ctx *ctx,
+                                       grn_scorer_matched_record *record);
+
+
+
+typedef double grn_scorer_score_func(grn_ctx *ctx,
+                                     grn_scorer_matched_record *record);
+
+/*
+  grn_scorer_register() registers a plugin to the database which is
+  associated with `ctx'. `plugin_name_ptr' and `plugin_name_length' specify the
+  plugin name. Alphabetic letters ('A'-'Z' and 'a'-'z'), digits ('0'-'9') and
+  an underscore ('_') are capable characters.
+
+  `score' is called for scoring matched records one by one.
+
+  grn_scorer_register() returns GRN_SUCCESS on success, an error
+  code on failure.
+ */
+GRN_PLUGIN_EXPORT grn_rc grn_scorer_register(grn_ctx *ctx,
+                                             const char *plugin_name_ptr,
+                                             int plugin_name_length,
+                                             grn_scorer_score_func *score);
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif  /* __cplusplus */
+
+#endif  /* GROONGA_SCORER_H */

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

@@ -19,6 +19,7 @@
 #define GROONGA_H
 
 #include "groonga/groonga.h"
+#include "groonga/obj.h"
 #include "groonga/ii.h"
 #include "groonga/expr.h"
 #include "groonga/output.h"

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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/query_expanders'
+libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'
+libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' -L/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'
+libdir='/home/myokoym/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'

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

@@ -17,10 +17,10 @@ module Groonga
         filter = input[:filter]
 
         total = 0
-        enumerator.each do |table, shard_key, shard_range, cover_type|
+        enumerator.each do |table, shard_key, shard_range|
           total += count_n_records(table, filter,
                                    shard_key, shard_range,
-                                   enumerator.target_range, cover_type)
+                                   enumerator.target_range)
         end
         writer.write(total)
       end
@@ -28,7 +28,10 @@ module Groonga
       private
       def count_n_records(table, filter,
                           shard_key, shard_range,
-                          target_range, cover_type)
+                          target_range)
+        cover_type = target_range.cover_type(shard_range)
+        return 0 if cover_type == :none
+
         if cover_type == :all
           if filter.nil?
             return table.size

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

@@ -2,6 +2,8 @@ module Groonga
   module Sharding
     class LogicalEnumerator
       attr_reader :target_range
+      attr_reader :logical_table
+      attr_reader :shard_key_name
       def initialize(command_name, input)
         @command_name = command_name
         @input = input
@@ -11,7 +13,9 @@ module Groonga
       def each
         prefix = "#{@logical_table}_"
         context = Context.instance
-        context.database.each_table(:prefix => prefix) do |table|
+        context.database.each_table(:prefix => prefix,
+                                    :order_by => :key,
+                                    :order => :ascending) do |table|
           shard_range_raw = table.name[prefix.size..-1]
 
           next unless /\A(\d{4})(\d{2})(\d{2})\z/ =~ shard_range_raw
@@ -26,10 +30,7 @@ module Groonga
             raise InvalidArgument, message
           end
 
-          cover_type = @target_range.cover_type(shard_range)
-          next if cover_type == :none
-
-          yield(table, shard_key, shard_range, cover_type)
+          yield(table, shard_key, shard_range)
         end
       end