rroonga 4.0.1-x64-mingw32 → 4.0.2-x64-mingw32

data/test/test-index-column.rb

@@ -287,20 +287,25 @@ class IndexColumnTest < Test::Unit::TestCase
                             :key_type => "ShortText",
                             :default_tokenizer => "TokenDelimit") do |table|
           table.index("Articles.tags",
-                      :name => "position",
+                      :name => "true",
                       :with_position => true)
           table.index("Articles.tags",
-                      :name => "no_position")
+                      :name => "default")
+          table.index("Articles.tags",
+                      :name => "false",
+                      :with_position => false)
         end
       end
 
       assert_equal([
                      true,
                      false,
+                     true,
                    ],
                    [
-                     context["Tags.position"].with_position?,
-                     context["Tags.no_position"].with_position?,
+                     context["Tags.true"].with_position?,
+                     context["Tags.false"].with_position?,
+                     context["Tags.default"].with_position?,
                    ])
     end
   end

data/test/test-schema-dumper.rb

@@ -275,9 +275,9 @@ column_create Posts title COLUMN_SCALAR ShortText
     def test_reference_table
       define_reference_table_schema
       assert_equal(<<-SCHEMA, dump)
-table_create Terms TABLE_HASH_KEY --key_type ShortText
+table_create Terms TABLE_HASH_KEY ShortText
 
-table_create IndexTerms TABLE_HASH_KEY --key_type Terms
+table_create IndexTerms TABLE_HASH_KEY Terms
       SCHEMA
     end
 
@@ -303,10 +303,10 @@ column_create Comments item COLUMN_SCALAR Items
     def test_index
       define_index_schema
       assert_equal(<<-SCHEMA, dump)
-table_create Items TABLE_HASH_KEY --key_type ShortText
+table_create Items TABLE_HASH_KEY ShortText
 column_create Items title COLUMN_SCALAR ShortText
 
-table_create Terms TABLE_PAT_KEY --key_type ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
+table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto
 
 column_create Terms Items__key COLUMN_INDEX|WITH_POSITION Items _key
 column_create Terms Items_title COLUMN_INDEX|WITH_POSITION Items title
@@ -316,7 +316,7 @@ column_create Terms Items_title COLUMN_INDEX|WITH_POSITION Items title
     def test_weight_vector
       define_weight_vector_schema
       assert_equal(<<-SCHEMA, dump)
-table_create Memos TABLE_PAT_KEY --key_type ShortText
+table_create Memos TABLE_PAT_KEY ShortText
 column_create Memos tags COLUMN_VECTOR|WITH_WEIGHT ShortText
       SCHEMA
     end
@@ -324,7 +324,7 @@ column_create Memos tags COLUMN_VECTOR|WITH_WEIGHT ShortText
     def test_double_array_trie
       define_double_array_trie_schema
       assert_equal(<<-SCHEMA, dump)
-table_create Accounts TABLE_DAT_KEY --key_type ShortText
+table_create Accounts TABLE_DAT_KEY ShortText
 column_create Accounts name COLUMN_SCALAR ShortText
       SCHEMA
     end

data/test/test-schema.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  Kouhei Sutou <kou@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
@@ -610,7 +610,8 @@ class SchemaTest < Test::Unit::TestCase
                    "path: <#{path}>, " +
                    "domain: <Terms>, " +
                    "range: <Posts>, " +
-                   "flags: <WITH_SECTION|WITH_WEIGHT|WITH_POSITION>>",
+                   "flags: <WITH_SECTION|WITH_WEIGHT|WITH_POSITION>, " +
+                   "sources: <content>>",
                    index_column.inspect)
     end
 
@@ -662,7 +663,8 @@ class SchemaTest < Test::Unit::TestCase
                    "path: <#{index_column.path}>, " +
                    "domain: <Terms>, " +
                    "range: <Posts>, " +
-                   "flags: <WITH_POSITION>>",
+                   "flags: <WITH_POSITION>, " +
+                   "sources: <_key>>",
                    index_column.inspect)
     end
 
@@ -714,6 +716,33 @@ class SchemaTest < Test::Unit::TestCase
       assert_equal("Terms.posts_content_index", index.name)
       assert_equal([context["Posts.content"]], renamed_index.sources)
     end
+
+    class MultipleColumnTest < self
+      setup
+      def setup_index
+        Groonga::Schema.create_table("Posts") do |table|
+          table.short_text :title
+          table.long_text :content
+        end
+        Groonga::Schema.create_table("Terms") do |table|
+          table.index "Posts", "title", "content"
+        end
+
+        @index = context["Terms.Posts_title_content"]
+      end
+
+      def test_source
+        assert_equal([
+                       "Posts.title",
+                       "Posts.content",
+                     ],
+                     @index.sources.collect(&:name))
+      end
+
+      def test_with_section
+        assert_true(@index.with_section?)
+      end
+    end
   end
 
   def test_reference_guess

data/vendor/local/bin/mecab-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/home/vagrant/work/groonga/groonga/packages/windows/dist-x64
+prefix=/home/kou/work/c/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/vagrant/work/groonga/groonga/packages/windows/dist-x64/libexec/mecab
+       	echo /home/kou/work/c/groonga.clean/packages/windows/dist-x64/libexec/mecab
        	;;
 	
     --sysconfdir)

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/vagrant/work/groonga/groonga/packages/windows/dist-x64/var/lib/groonga/db/db;
+  groonga_database /home/kou/work/c/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/vagrant/work/groonga/groonga/packages/windows/dist-x64/share/groonga/html/admin;
+      root /home/kou/work/c/groonga.clean/packages/windows/dist-x64/share/groonga/html/admin;
       index index.html;
     }
 

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

@@ -469,7 +469,8 @@ typedef struct {
 typedef grn_rc (*grn_plugin_func)(grn_ctx *ctx);
 
 typedef enum {
-  GRN_PROC_TOKENIZER = 1,
+  GRN_PROC_INVALID = 0,
+  GRN_PROC_TOKENIZER,
   GRN_PROC_COMMAND,
   GRN_PROC_FUNCTION,
   GRN_PROC_HOOK,

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

@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2010-2012 Brazil
+  Copyright(C) 2010-2014 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -170,6 +170,24 @@ GRN_API void grn_plugin_mutex_unlock(grn_ctx *ctx, grn_plugin_mutex *mutex);
 GRN_API grn_obj *grn_plugin_proc_alloc(grn_ctx *ctx, grn_user_data *user_data,
                                        grn_id domain, grn_obj_flags flags);
 
+/*
+  grn_plugin_proc_get_var() gets a variable from user_data by name.
+
+  If `name_size` is negative, `name` must be
+  NUL-terminated. `name_size` is computed by `strlen(name)` for the case.
+*/
+
+GRN_API grn_obj *grn_plugin_proc_get_var(grn_ctx *ctx, grn_user_data *user_data,
+                                         const char *name, int name_size);
+
+/*
+  grn_plugin_proc_get_var_by_offset() gets a variable from user_data by offset.
+*/
+
+GRN_API grn_obj *grn_plugin_proc_get_var_by_offset(grn_ctx *ctx,
+                                                   grn_user_data *user_data,
+                                                   unsigned int offset);
+
 /*
   grn_plugin_win32_base_dir() returns the groonga install directory.
   The install directory is computed from the directory that has

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

@@ -1,5 +1,5 @@
 # tsv.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='tsv.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libgroonga.la -L/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libmsgpack.la -lws2_32'
+dependency_libs=' /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la -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/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/groonga/plugins/query_expanders'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/query_expanders'

data/vendor/local/lib/groonga/plugins/suggest/suggest.la

@@ -1,5 +1,5 @@
 # suggest.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='suggest.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libgroonga.la -L/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib -lws2_32 /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib -lws2_32 /home/kou/work/c/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/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/groonga/plugins/suggest'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/suggest'

data/vendor/local/lib/groonga/plugins/table/table.la

@@ -1,5 +1,5 @@
 # table.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='table.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libgroonga.la -L/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib -lws2_32 /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib -lws2_32 /home/kou/work/c/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/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/groonga/plugins/table'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/table'

data/vendor/local/lib/groonga/plugins/tokenizers/mecab.la

@@ -1,5 +1,5 @@
 # mecab.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='mecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libmecab.la /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libgroonga.la /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libmsgpack.la -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmecab.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la -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/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/groonga/plugins/tokenizers'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/tokenizers'

data/vendor/local/lib/libgroonga.la

@@ -1,5 +1,5 @@
 # libgroonga.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='libgroonga.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib /home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib/libmsgpack.la -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la -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/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib'

data/vendor/local/lib/libmecab.la

@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib'

data/vendor/local/lib/libmsgpack.la

@@ -1,5 +1,5 @@
 # libmsgpack.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib'

data/vendor/local/lib/libmsgpackc.la

@@ -1,5 +1,5 @@
 # libmsgpackc.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib'

data/vendor/local/lib/pkgconfig/groonga.pc

@@ -1,4 +1,4 @@
-prefix=/home/vagrant/work/groonga/groonga/packages/windows/dist-x64
+prefix=/home/kou/work/c/groonga.clean/packages/windows/dist-x64
 exec_prefix=${prefix}
 bindir=${exec_prefix}/bin
 sbindir=${exec_prefix}/sbin
@@ -11,10 +11,10 @@ pluginsdir=${libdir}/groonga/plugins
 groonga=${bindir}/groonga.exe
 groonga_httpd=${sbindir}/groonga-httpd.exe
 groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset.exe
-groonga_version=4.0.1
+groonga_version=4.0.2
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 4.0.1
+Version: 4.0.2
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga