rroonga 3.1.1-x64-mingw32 → 3.1.2-x64-mingw32

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

@@ -116,7 +116,7 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     1000.times do |i|
       @users.add(:name => "user #{i}" * 1000)
     end
-    assert_equal(3, @name.defrag)
+    assert_equal(1, @name.defrag)
   end
 
   class VectorTest < self

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

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

@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2009-2013 Brazil
+  Copyright(C) 2009-2014 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -244,6 +244,9 @@ GRN_API grn_rc grn_ctx_set_match_escalation_threshold(grn_ctx *ctx, long long in
 GRN_API long long int grn_get_default_match_escalation_threshold(void);
 GRN_API grn_rc grn_set_default_match_escalation_threshold(long long int threshold);
 
+GRN_API int grn_get_lock_timeout(void);
+GRN_API grn_rc grn_set_lock_timeout(int timeout);
+
 /* cache */
 #define GRN_CACHE_DEFAULT_MAX_N_ENTRIES 100
 typedef struct _grn_cache grn_cache;
@@ -1016,6 +1019,9 @@ GRN_API grn_rc grn_snip_add_cond(grn_ctx *ctx, grn_snip *snip,
                                  const char *keyword, unsigned int keyword_len,
                                  const char *opentag, unsigned int opentag_len,
                                  const char *closetag, unsigned int closetag_len);
+GRN_API grn_rc grn_snip_set_normalizer(grn_ctx *ctx, grn_snip *snip,
+                                       grn_obj *normalizer);
+GRN_API grn_obj *grn_snip_get_normalizer(grn_ctx *ctx, grn_snip *snip);
 GRN_API grn_rc grn_snip_exec(grn_ctx *ctx, grn_snip *snip,
                              const char *string, unsigned int string_len,
                              unsigned int *nresults, unsigned int *max_tagged_len);
@@ -1709,6 +1715,14 @@ GRN_API grn_snip *grn_expr_snip(grn_ctx *ctx, grn_obj *expr, int flags,
                                 const char **opentags, unsigned int *opentag_lens,
                                 const char **closetags, unsigned int *closetag_lens,
                                 grn_snip_mapping *mapping);
+GRN_API grn_rc grn_expr_snip_add_conditions(grn_ctx *ctx,
+                                            grn_obj *expr,
+                                            grn_snip *snip,
+                                            unsigned int n_tags,
+                                            const char **opentags,
+                                            unsigned int *opentag_lens,
+                                            const char **closetags,
+                                            unsigned int *closetag_lens);
 
 GRN_API grn_table_sort_key *grn_table_sort_key_from_str(grn_ctx *ctx,
                                                         const char *str, unsigned int str_size,

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.2ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
 #
 # 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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la -lws2_32'
+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'
 
 # 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/vagrant/work/groonga/groonga/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.2ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
 #
 # 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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+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'
 
 # 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/suggest'
+libdir='/home/vagrant/work/groonga/groonga/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.2ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
 #
 # 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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+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'
 
 # 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/table'
+libdir='/home/vagrant/work/groonga/groonga/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.2ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
 #
 # 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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmecab.la /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 -lws2_32'
+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'
 
 # 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/tokenizers'
+libdir='/home/vagrant/work/groonga/groonga/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.2ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
 #
 # 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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la -lws2_32'
+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'
 
 # 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'
+libdir='/home/vagrant/work/groonga/groonga/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/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib'
+libdir='/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib'

data/vendor/local/lib/libmsgpack.la

@@ -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'
+libdir='/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib'

data/vendor/local/lib/libmsgpackc.la

@@ -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'
+libdir='/home/vagrant/work/groonga/groonga/packages/windows/dist-x64/lib'

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

@@ -1,4 +1,4 @@
-prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64
+prefix=/home/vagrant/work/groonga/groonga/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=3.1.1
+groonga_version=3.1.1-89-g7f6fcae
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 3.1.1
+Version: 3.1.2
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga

data/vendor/local/sbin/groonga-httpd-restart

@@ -17,7 +17,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-prefix=/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64
+prefix=/home/vagrant/work/groonga/groonga/packages/windows/dist-x64
 
 SERVICE_NAME=groonga-httpd
 GROONGA_HTTPD=${SERVICE_NAME}

data/vendor/local/share/doc/groonga/en/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 0c0d19e39ca8e98d416bee33833031dc
+config: d2ef4a7abbc3e6ca70721b71e485f1bc
 tags: 645f666f9bcd5a90fca523b33c5a78b7

data/vendor/local/share/doc/groonga/en/html/_sources/characteristic.txt

@@ -1,4 +1,5 @@
 .. -*- rst -*-
+.. Groonga project
 
 .. highlightlang:: none
 

data/vendor/local/share/doc/groonga/en/html/_sources/community.txt

@@ -1,4 +1,5 @@
 .. -*- rst -*-
+.. Groonga Project
 
 .. highlightlang:: none
 

data/vendor/local/share/doc/groonga/en/html/_sources/development.txt

@@ -5,8 +5,8 @@
 Development
 ===========
 
-This section describes about developing with groonga. You may develop
-an application that uses groonga as its database, a library that uses
+This section describes about developing with Groonga. You may develop
+an application that uses Groonga as its database, a library that uses
 libgroonga, language bindings of libgroonga and so on.
 
 .. toctree::

data/vendor/local/share/doc/groonga/en/html/_sources/development/travis-ci.txt

@@ -5,12 +5,12 @@
 Travis CI
 =========
 
-This section describes about using groonga on `Travis CI
+This section describes about using Groonga on `Travis CI
 <http://travis-ci.org/>`_. Travis CI is a hosted continuous
 integration service for the open source community.
 
 You can use Travis CI for your open source software. This section only
-describes about groonga related configuration. See `Travis CI:
+describes about Groonga related configuration. See `Travis CI:
 Documentation <http://about.travis-ci.org/docs/>`_ about general
 Travis CI.
 
@@ -20,8 +20,8 @@ Configuration
 Travis CI is running on 64-bit Ubuntu 12.04 LTS Server Edition. (See `Travis CI: About
 Travis CI Environment
 <http://about.travis-ci.org/docs/user/ci-environment/>`_.)  You can
-use apt-line for Ubuntu 12.04 LTS provided by groonga project to install
-groonga on Travis CI.
+use apt-line for Ubuntu 12.04 LTS provided by Groonga project to install
+Groonga on Travis CI.
 
 You can custom build lifecycle by ``.travis.yml``. (See `Travis CI:
 Conifugration your Travis CI build with .travis.yml
@@ -38,12 +38,12 @@ Add the following ``before_install`` configuration to ``.travis.yml``::
 If you need to use ``install`` hook instead of ``before_install``, you
 just substitute ``before_install:`` with ``install:``.
 
-With the above configuration, you can use groonga for your build.
+With the above configuration, you can use Groonga for your build.
 
 Examples
 --------
 
-Here are open source softwares that use groonga on Travis CI:
+Here are open source softwares that use Groonga on Travis CI:
 
   * `rroonga <http://groonga.rubyforge.org/#about-rroonga>`_ (Ruby bindings)
 

data/vendor/local/share/doc/groonga/en/html/_sources/install/centos.txt

@@ -45,7 +45,7 @@ Or install Juman dictionary::
 
 There is a package that provides `Munin
 <http://munin-monitoring.org/>`_ plugins. If you want to monitor
-groonga status by Munin, install groonga-munin-plugins package.
+Groonga status by Munin, install groonga-munin-plugins package.
 
 .. note::
 
@@ -75,7 +75,7 @@ Install groonga-munin-plugins package::
   % sudo yum install -y groonga-munin-plugins
 
 There is a package that provides MySQL compatible normalizer as
-groonga plugins.
+Groonga plugins.
 If you want to use that one, install groonga-normalizer-mysql package.
 
 Install groonga-normalizer-mysql package::
@@ -110,7 +110,7 @@ Or install Juman dictionary::
 
 There is a package that provides `Munin
 <http://munin-monitoring.org/>`_ plugins. If you want to monitor
-groonga status by Munin, install groonga-munin-plugins package.
+Groonga status by Munin, install groonga-munin-plugins package.
 
 .. note::
 
@@ -137,7 +137,7 @@ Install groonga-munin-plugins package::
   % sudo yum install -y groonga-munin-plugins
 
 There is a package that provides MySQL compatible normalizer as
-groonga plugins.
+Groonga plugins.
 If you want to use that one, install groonga-normalizer-mysql package.
 
 Install groonga-normalizer-mysql package::
@@ -153,9 +153,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-3.1.1.tar.gz
-  % tar xvzf groonga-3.1.1.tar.gz
-  % cd groonga-3.1.1
+  % wget http://packages.groonga.org/source/groonga/groonga-3.1.2.tar.gz
+  % tar xvzf groonga-3.1.2.tar.gz
+  % cd groonga-3.1.2
 
 Configure (see :ref:`source-configure` about ``configure`` options)::