rroonga 4.0.3-x86-mingw32 → 4.0.4-x86-mingw32

data/test/test-schema.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class SchemaTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-snippet.rb

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class SnippetTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-statistic-measurer.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class StatisticMeasurerTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-sub-records.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class SubRecordsTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-table-dumper.rb

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableDumperTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-table-key-support.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableKeySupportTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-table-offset-and-limit.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module TestOffsetAndLimitSupport
   def test_zero_and_positive_offset

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

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableSelectMecabTest < Test::Unit::TestCase
   include GroongaTestUtils

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

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableSelectNormalizeTest < Test::Unit::TestCase
   include GroongaTestUtils

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

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableSelectWeightTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-table-select.rb

@@ -13,7 +13,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableSelectTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-table-traverse.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableTraverseTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-table.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-type.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TypeTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-variable-size-column.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class VariableSizeColumnTest < Test::Unit::TestCase
   include GroongaTestUtils
@@ -238,82 +238,151 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     end
 
     class WeightTest < self
-      def setup_schema
-        Groonga::Schema.define do |schema|
-          schema.create_table("Products",
-                              :type => :patricia_trie,
-                              :key_type => :short_text) do |table|
-            table.short_text("tags",
-                             :type => :vector,
-                             :with_weight => true)
+      class TypeTest < self
+        def setup_schema
+          Groonga::Schema.define do |schema|
+            schema.create_table("Products",
+                                :type => :patricia_trie,
+                                :key_type => :short_text) do |table|
+              table.short_text("tags",
+                               :type => :vector,
+                               :with_weight => true)
+            end
           end
+
+          @products = Groonga["Products"]
         end
 
-        @products = Groonga["Products"]
-      end
+        def test_string_key
+          groonga = @products.add("Groonga")
+          groonga.tags = [
+            {
+              "value"  => "groonga",
+              "weight" => 100,
+            },
+          ]
+
+          assert_equal([
+                         {
+                           :value  => "groonga",
+                           :weight => 100,
+                         },
+                       ],
+                       groonga.tags)
+        end
 
-      def test_string_key
-        groonga = @products.add("Groonga")
-        groonga.tags = [
-          {
-            "value"  => "groonga",
-            "weight" => 100,
-          },
-        ]
+        def test_array
+          groonga = @products.add("Groonga")
+          groonga.tags = [
+            {
+              :value  => "groonga",
+              :weight => 100,
+            },
+            {
+              :value  => "full text search",
+              :weight => 1000,
+            },
+          ]
+
+          assert_equal([
+                         {
+                           :value  => "groonga",
+                           :weight => 100,
+                         },
+                         {
+                           :value  => "full text search",
+                           :weight => 1000,
+                         },
+                       ],
+                       groonga.tags)
+        end
 
-        assert_equal([
-                       {
-                         :value  => "groonga",
-                         :weight => 100,
-                       },
-                     ],
-                     groonga.tags)
+        def test_hash
+          groonga = @products.add("Groonga")
+          groonga.tags = {
+            "groonga" => 100,
+            "full text search" => 1000,
+          }
+
+          assert_equal([
+                         {
+                           :value  => "groonga",
+                           :weight => 100,
+                         },
+                         {
+                           :value  => "full text search",
+                           :weight => 1000,
+                         },
+                       ],
+                       groonga.tags)
+        end
       end
 
-      def test_array
-        groonga = @products.add("Groonga")
-        groonga.tags = [
-          {
-            :value  => "groonga",
-            :weight => 100,
-          },
-          {
-            :value  => "full text search",
-            :weight => 1000,
-          },
-        ]
+      class ReferenceTest < self
+        def setup_schema
+          Groonga::Schema.define do |schema|
+            schema.create_table("Tags",
+                                :type => :patricia_trie,
+                                :key_type => :short_text) do |table|
+            end
+            schema.create_table("Products",
+                                :type => :patricia_trie,
+                                :key_type => :short_text) do |table|
+              table.reference("tags", "Tags",
+                              :type => :vector,
+                              :with_weight => true)
+            end
+          end
 
-        assert_equal([
-                       {
-                         :value  => "groonga",
-                         :weight => 100,
-                       },
-                       {
-                         :value  => "full text search",
-                         :weight => 1000,
-                       },
-                     ],
-                     groonga.tags)
-      end
+          @products = Groonga["Products"]
+          @tags = Groonga["Tags"]
+        end
 
-      def test_hash
-        groonga = @products.add("Groonga")
-        groonga.tags = {
-          "groonga" => 100,
-          "full text search" => 1000,
-        }
+        def test_array
+          groonga = @products.add("Groonga")
+          groonga.tags = [
+            {
+              :value  => @tags.add("groonga"),
+              :weight => 100,
+            },
+            {
+              :value  => @tags.add("full text search"),
+              :weight => 1000,
+            },
+          ]
+
+          assert_equal([
+                         {
+                           :value  => @tags["groonga"],
+                           :weight => 100,
+                         },
+                         {
+                           :value  => @tags["full text search"],
+                           :weight => 1000,
+                         },
+                       ],
+                       groonga.tags)
+        end
 
-        assert_equal([
-                       {
-                         :value  => "groonga",
-                         :weight => 100,
-                       },
-                       {
-                         :value  => "full text search",
-                         :weight => 1000,
-                       },
-                     ],
-                     groonga.tags)
+        def test_hash
+          groonga = @products.add("Groonga")
+          groonga.tags = {
+            @tags.add("groonga") => 100,
+            @tags.add("full text search") => 1000,
+          }
+
+          assert_equal([
+                         {
+                           :value  => @tags["groonga"],
+                           :weight => 100,
+                         },
+                         {
+                           :value  => @tags["full text search"],
+                           :weight => 1000,
+                         },
+                       ],
+                       groonga.tags)
+        end
       end
     end
   end

data/test/test-variable.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class VariableTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-vector-column.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class VectorColumnTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-version.rb

@@ -11,7 +11,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class VersionTest < Test::Unit::TestCase
   def test_build_version_format

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

@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#include <stdarg.h>
+
 #ifndef GRN_API
 #if defined(_WIN32) || defined(_WIN64)
 #define GRN_API __declspec(dllimport)
@@ -215,7 +217,9 @@ struct _grn_ctx {
 
 #define GRN_CTX_USER_DATA(ctx) (&((ctx)->user_data))
 
+/* Deprecated since 4.0.3. Don't use it. */
 #define GRN_CTX_USE_QL                 (0x03)
+/* Deprecated since 4.0.3. Don't use it. */
 #define GRN_CTX_BATCH_MODE             (0x04)
 #define GRN_CTX_PER_DB                 (0x08)
 
@@ -483,6 +487,7 @@ GRN_API grn_obj *grn_proc_create(grn_ctx *ctx,
                                  unsigned int nvars, grn_expr_var *vars);
 GRN_API grn_obj *grn_proc_get_info(grn_ctx *ctx, grn_user_data *user_data,
                                    grn_expr_var **vars, unsigned int *nvars, grn_obj **caller);
+GRN_API grn_proc_type grn_proc_get_type(grn_ctx *ctx, grn_obj *proc);
 
 /*-------------------------------------------------------------
  * API for table
@@ -876,6 +881,13 @@ struct _grn_search_optarg {
 GRN_API grn_rc grn_obj_search(grn_ctx *ctx, grn_obj *obj, grn_obj *query,
                               grn_obj *res, grn_operator op, grn_search_optarg *optarg);
 
+typedef grn_rc grn_selector_func(grn_ctx *ctx, grn_obj *table, grn_obj *index,
+                                 int nargs, grn_obj **args,
+                                 grn_obj *res, grn_operator op);
+
+GRN_API grn_rc grn_proc_set_selector(grn_ctx *ctx, grn_obj *proc,
+                                     grn_selector_func selector);
+
 /*-------------------------------------------------------------
  * grn_vector
 */
@@ -890,6 +902,19 @@ GRN_API unsigned int grn_vector_get_element(grn_ctx *ctx, grn_obj *vector,
                                             unsigned int offset, const char **str,
                                             unsigned int *weight, grn_id *domain);
 
+/*-------------------------------------------------------------
+ * grn_uvector
+*/
+
+GRN_API unsigned int grn_uvector_size(grn_ctx *ctx, grn_obj *uvector);
+
+GRN_API grn_rc grn_uvector_add_element(grn_ctx *ctx, grn_obj *vector,
+                                       grn_id id, unsigned int weight);
+
+GRN_API grn_id grn_uvector_get_element(grn_ctx *ctx, grn_obj *uvector,
+                                       unsigned int offset,
+                                       unsigned int *weight);
+
 /*-------------------------------------------------------------
  * API for hook
  */
@@ -1123,6 +1148,9 @@ GRN_API const char *grn_default_query_logger_get_path(void);
 /* grn_bulk */
 
 #define GRN_BULK_BUFSIZE (sizeof(grn_obj) - sizeof(grn_obj_header))
+/* This assumes that GRN_BULK_BUFSIZE is less than 32 (= 0x20). */
+#define GRN_BULK_BUFSIZE_MAX 0x1f
+#define GRN_BULK_SIZE_IN_FLAGS(flags) ((flags) & GRN_BULK_BUFSIZE_MAX)
 #define GRN_BULK_OUTP(bulk) ((bulk)->header.impl_flags & GRN_OBJ_OUTPLACE)
 #define GRN_BULK_REWIND(bulk) do {\
   if ((bulk)->header.type == GRN_VECTOR) {\
@@ -1131,7 +1159,7 @@ GRN_API const char *grn_default_query_logger_get_path(void);
       if (GRN_BULK_OUTP(_body)) {\
         (_body)->u.b.curr = (_body)->u.b.head;\
       } else {\
-        (_body)->header.flags = 0;\
+        (_body)->header.flags &= ~GRN_BULK_BUFSIZE_MAX;\
       }\
     }\
     (bulk)->u.v.n_sections = 0;\
@@ -1139,7 +1167,7 @@ GRN_API const char *grn_default_query_logger_get_path(void);
     if (GRN_BULK_OUTP(bulk)) {\
       (bulk)->u.b.curr = (bulk)->u.b.head;\
     } else {\
-      (bulk)->header.flags = 0;\
+      (bulk)->header.flags &= ~GRN_BULK_BUFSIZE_MAX;\
     }\
   }\
 } while (0)
@@ -1154,11 +1182,11 @@ GRN_API const char *grn_default_query_logger_get_path(void);
 #define GRN_BULK_VSIZE(bulk) \
   (GRN_BULK_OUTP(bulk)\
    ? ((bulk)->u.b.curr - (bulk)->u.b.head)\
-   : (bulk)->header.flags)
+   : GRN_BULK_SIZE_IN_FLAGS((bulk)->header.flags))
 #define GRN_BULK_EMPTYP(bulk) \
   (GRN_BULK_OUTP(bulk)\
    ? ((bulk)->u.b.curr == (bulk)->u.b.head)\
-   : !((bulk)->header.flags))
+   : !(GRN_BULK_SIZE_IN_FLAGS((bulk)->header.flags)))
 #define GRN_BULK_HEAD(bulk) \
   (GRN_BULK_OUTP(bulk)\
    ? ((bulk)->u.b.head)\
@@ -1166,7 +1194,7 @@ GRN_API const char *grn_default_query_logger_get_path(void);
 #define GRN_BULK_CURR(bulk) \
   (GRN_BULK_OUTP(bulk)\
    ? ((bulk)->u.b.curr)\
-   : (char *)&((bulk)->u.b.head) + (bulk)->header.flags)
+   : (char *)&((bulk)->u.b.head) + GRN_BULK_SIZE_IN_FLAGS((bulk)->header.flags))
 #define GRN_BULK_TAIL(bulk) \
   (GRN_BULK_OUTP(bulk)\
    ? ((bulk)->u.b.tail)\
@@ -1201,6 +1229,10 @@ GRN_API const char *grn_text_urldec(grn_ctx *ctx, grn_obj *buf,
 GRN_API grn_rc grn_text_escape_xml(grn_ctx *ctx, grn_obj *buf,
                                    const char *s, unsigned int len);
 GRN_API grn_rc grn_text_time2rfc1123(grn_ctx *ctx, grn_obj *bulk, int sec);
+GRN_API grn_rc grn_text_printf(grn_ctx *ctx, grn_obj *bulk,
+                               const char *format, ...) GRN_ATTRIBUTE_PRINTF(3);
+GRN_API grn_rc grn_text_vprintf(grn_ctx *ctx, grn_obj *bulk,
+                                const char *format, va_list args);
 
 typedef struct _grn_obj_format grn_obj_format;
 
@@ -1231,6 +1263,7 @@ struct _grn_obj_format {
   (format)->offset = (format_offset);\
   (format)->limit = (format_limit);\
   (format)->hits_offset = (format_hits_offset);\
+  (format)->flags = 0;\
   (format)->expression = NULL;\
 } while (0)