rroonga 2.0.8-x86-mingw32 → 2.1.0-x86-mingw32

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

@@ -3,21 +3,27 @@
 GROONGA_HTTPD=groonga-httpd
 PIDFILE=/var/run/groonga/${GROONGA_HTTPD}.pid
 OLD_PIDFILE=$PIDFILE.oldbin
-TIMEOUT=3
+STATUS_TIMEOUT=3
 
 # Source function library.
 if [ -f /lib/lsb/init-functions ]; then
     . /lib/lsb/init-functions
+    if [ -f /etc/default/$GROONGA_HTTPD ]; then
+	. /etc/default/$GROONGA_HTTPD
+    fi
 elif [ -f /etc/init.d/functions ]; then
     . /etc/init.d/functions
+    if [ -f /etc/sysconfig/$GROONGA_HTTPD ]; then
+	. /etc/sysconfig/$GROONGA_HTTPD
+    fi
 fi
 
 wait_until_file_is_created () {
-	timeout $TIMEOUT tail -F $1 --quiet 2> /dev/null | read 2> /dev/null
+	timeout $STATUS_TIMEOUT tail -F $1 --quiet 2> /dev/null | read 2> /dev/null
 }
 
 wait_until_process_is_finished () {
-	timeout $TIMEOUT tail -F /dev/null --pid=$1
+	timeout $STATUS_TIMEOUT tail -F /dev/null --pid=$1
 }
 
 if [ "$1" = "try-restart" ]; then

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: 6990d68f25fa62ebc7895478a7f3a774
+config: 5f9c8a711be523d3cc47db1539d895ab
 tags: fbb0d17656682115ca4d033fb2f83ba1

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

@@ -19,7 +19,7 @@ CentOS 5
 
 Install::
 
-  % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-0.noarch.rpm
+  % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
   % sudo yum makecache
   % sudo yum install -y groonga
 
@@ -77,7 +77,7 @@ CentOS 6
 
 Install::
 
-  % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-0.noarch.rpm
+  % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
   % sudo yum makecache
   % sudo yum install -y groonga
 
@@ -120,7 +120,7 @@ groonga status by Munin, install groonga-munin-plugins package.
 
    Enable EPEL repository on any environment::
 
-     % sudo rpm -ivh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-7.noarch.rpm
+     % sudo rpm -ivh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
 
 Install groonga-munin-plugins package::
 
@@ -135,9 +135,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-2.0.9.tar.gz
-  % tar xvzf groonga-2.0.9.tar.gz
-  % cd groonga-2.0.9
+  % wget http://packages.groonga.org/source/groonga/groonga-2.1.0.tar.gz
+  % tar xvzf groonga-2.1.0.tar.gz
+  % cd groonga-2.1.0
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -119,9 +119,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-2.0.9.tar.gz
-  % tar xvzf groonga-2.0.9.tar.gz
-  % cd groonga-2.0.9
+  % wget http://packages.groonga.org/source/groonga/groonga-2.1.0.tar.gz
+  % tar xvzf groonga-2.1.0.tar.gz
+  % cd groonga-2.1.0
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -27,7 +27,7 @@ Fedora 17
 
 Install::
 
-  % sudo rpm -ivh http://packages.groonga.org/fedora/groonga-release-1.1.0-0.noarch.rpm
+  % sudo rpm -ivh http://packages.groonga.org/fedora/groonga-release-1.1.0-1.noarch.rpm
   % sudo yum update
   % sudo yum install -y groonga
 
@@ -65,9 +65,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-2.0.9.tar.gz
-  % tar xvzf groonga-2.0.9.tar.gz
-  % cd groonga-2.0.9
+  % wget http://packages.groonga.org/source/groonga/groonga-2.1.0.tar.gz
+  % tar xvzf groonga-2.1.0.tar.gz
+  % cd groonga-2.1.0
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -36,9 +36,9 @@ Install `Xcode <https://developer.apple.com/xcode/>`_.
 
 Download source::
 
-  % curl -O http://packages.groonga.org/source/groonga/groonga-2.0.9.tar.gz
-  % tar xvzf groonga-2.0.9.tar.gz
-  % cd groonga-2.0.9
+  % curl -O http://packages.groonga.org/source/groonga/groonga-2.1.0.tar.gz
+  % tar xvzf groonga-2.1.0.tar.gz
+  % cd groonga-2.1.0
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -74,9 +74,9 @@ Build from source
 Groonga uses GNU build system. So the following is the simplest build
 steps::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-2.0.9.tar.gz
-  % tar xvzf groonga-2.0.9.tar.gz
-  % cd groonga-2.0.9
+  % wget http://packages.groonga.org/source/groonga/groonga-2.1.0.tar.gz
+  % tar xvzf groonga-2.1.0.tar.gz
+  % cd groonga-2.1.0
   % ./configure
   % make
   % sudo make install

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

@@ -17,9 +17,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-2.0.9.tar.gz
-  % gtar xvzf groonga-2.0.9.tar.gz
-  % cd groonga-2.0.9
+  % wget http://packages.groonga.org/source/groonga/groonga-2.1.0.tar.gz
+  % gtar xvzf groonga-2.1.0.tar.gz
+  % cd groonga-2.1.0
 
 Configure with ``CFLAGS="-m64" CXXFLAGS="-m64"`` variables. They are
 needed for building 64-bit version. To build 32-bit version, just

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

@@ -49,45 +49,6 @@ 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.
 
-Install groonga-munin-plugins package::
-
-  % sudo apt-get -y install groonga-munin-plugins
-
-11.04 Natty Narwhal
--------------------
-
-.. note::
-
-   Enable the universe repository to install groonga::
-
-     % sudo cp /etc/apt/sources.list /etc/apt/sources.list.d/universe.list
-     % sudo sed -i'' -e 's/main/universe/' /etc/apt/sources.list.d/universe.list
-
-Add the groonga apt repository.
-
-/etc/apt/sources.list.d/groonga.list::
-
-  deb http://packages.groonga.org/ubuntu/ natty universe
-  deb-src http://packages.groonga.org/ubuntu/ natty universe
-
-Install::
-
-  % sudo apt-get update
-  % sudo apt-get -y --allow-unauthenticated install groonga-keyring
-  % sudo apt-get update
-  % sudo apt-get -y install groonga
-
-If you want to use `MeCab <http://mecab.sourceforge.net/>`_ as a
-tokenizer, install groonga-tokenizer-mecab package.
-
-Install groonga-tokenizer-mecab package::
-
-  % sudo apt-get -y install groonga-tokenizer-mecab
-
-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.
-
 Install groonga-munin-plugins package::
 
   % sudo apt-get -y install groonga-munin-plugins
@@ -218,9 +179,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-2.0.9.tar.gz
-  % tar xvzf groonga-2.0.9.tar.gz
-  % cd groonga-2.0.9
+  % wget http://packages.groonga.org/source/groonga/groonga-2.1.0.tar.gz
+  % tar xvzf groonga-2.1.0.tar.gz
+  % cd groonga-2.1.0
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -17,12 +17,12 @@ size data.
 Installer
 ---------
 
-For 32-bit environment, download `groonga-2.0.9-x86.exe
-<http://packages.groonga.org/windows/groonga/groonga-2.0.9-x86.exe>`_
+For 32-bit environment, download `groonga-2.1.0-x86.exe
+<http://packages.groonga.org/windows/groonga/groonga-2.1.0-x86.exe>`_
 and run it.
 
-For 64-bit environment, download `groonga-2.0.9-x64.exe
-<http://packages.groonga.org/windows/groonga/groonga-2.0.9-x64.exe>`_
+For 64-bit environment, download `groonga-2.1.0-x64.exe
+<http://packages.groonga.org/windows/groonga/groonga-2.1.0-x64.exe>`_
 and run it.
 
 Use command prompt for :doc:`/reference/executables/groonga` installed in start menu.
@@ -30,12 +30,12 @@ Use command prompt for :doc:`/reference/executables/groonga` installed in start
 zip
 ---
 
-For 32-bit environment, download `groonga-2.0.9-x86.zip
-<http://packages.groonga.org/windows/groonga/groonga-2.0.9-x86.zip>`_
+For 32-bit environment, download `groonga-2.1.0-x86.zip
+<http://packages.groonga.org/windows/groonga/groonga-2.1.0-x86.zip>`_
 and extract it.
 
-For 64-bit environment, download `groonga-2.0.9-x64.zip
-<http://packages.groonga.org/windows/groonga/groonga-2.0.9-x64.zip>`_
+For 64-bit environment, download `groonga-2.1.0-x64.zip
+<http://packages.groonga.org/windows/groonga/groonga-2.1.0-x64.zip>`_
 and extract it.
 
 :doc:`/reference/executables/groonga` is in ``bin`` folder.
@@ -50,38 +50,38 @@ Windows. Here are required tools:
     <http://www.microsoft.com/japan/msdn/vstudio/express/>`_
   * `CMake <http://www.cmake.org/>`_
 
-Download zipped source `groonga-2.0.9.zip
-<http://packages.groonga.org/source/groonga/groonga-2.0.9.zip>`_
+Download zipped source `groonga-2.1.0.zip
+<http://packages.groonga.org/source/groonga/groonga-2.1.0.zip>`_
 and extract it.
 
 Start ``Visual Studio Command Prompt (2010)`` installed by Microsoft
 Visual Studio 2010 Express and move to the groonga's source folder::
 
-  > cd c:\Users\%USERNAME%\Downloads\groonga-2.0.9
+  > cd c:\Users\%USERNAME%\Downloads\groonga-2.1.0
 
 Configure by ``cmake``. The following commnad line is for 64-bit
 version. To build 32-bit version, use ``-G "Visual Studio 10"``
 parameter instead::
 
-  groonga-2.0.9> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
+  groonga-2.1.0> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
 
 Build by Visual C++ 2010 Express::
 
-  groonga-2.0.9> msbuild groonga.sln /p:Configuration=Release
+  groonga-2.1.0> msbuild groonga.sln /p:Configuration=Release
 
 Install by Visual C++ 2010 Express::
 
-  groonga-2.0.9> msbuild groonga.sln /p:Configuration=Release /t:Install
+  groonga-2.1.0> msbuild groonga.sln /p:Configuration=Release /t:Install
 
 If you installed Visual Studio 2010, use can use devenv instead.
 
 Build by Visual Studio 2010::
 
-  groonga-2.0.9> devenv groonga.sln /Build Release
+  groonga-2.1.0> devenv groonga.sln /Build Release
 
 Install by Visual Studio 2010::
 
-  groonga-2.0.9> devenv groonga.sln /Build Release /Project Install
+  groonga-2.1.0> devenv groonga.sln /Build Release /Project Install
 
 After the above steps, :doc:`/reference/executables/groonga` is found in
 ``c:\groonga\bin\groonga.exe``.

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

@@ -5,6 +5,65 @@
 News
 ====
 
+.. _release-2-1-0:
+
+Release 2.1.0 - 2012/12/29
+--------------------------
+
+.. Caution::
+
+   This release has backward incompatible changes against ``table_list`` and
+   ``column_list`` commands. If you use own program which depends on the output
+   results above commands, you need to support null instead of "null" string.
+
+   This release has supported ``--normalizer`` option, but there is side effect for
+   this feature. If you open old version of groonga database at least once, 
+   you can not open its database by old version of groonga.
+
+   There is also another backward incompatible change agaist plugin API for
+   tokenizer. The argument of ``grn_tokenizer_query_open`` API has changed.
+   This API change affects developer of tokenizer plugin.
+
+Improvements
+^^^^^^^^^^^^
+
+* [doc] Added documentation about :ref:`nested-index-search`.
+* Supported the expression as :doc:`/reference/functions/snippet_html` arguments.
+  This change enables you to use ``snippet_html("STRING" + "STRING")`` for example.
+  You can specify column name or literal for "STRING". [Reported by Tomoatsu Shimada]
+* Supported to create own normalizer as a plugin.
+* Moved ``groonga-query-log-analyzer`` as
+  `groonga-query-log <http://rubygems.org/gems/groonga-query-log>`_ RubyGems.
+  It enables you to analyze query logs without installing groonga package.
+* Supported ``--normalizer`` option for :doc:`/reference/commands/table_create` command.
+  This change enables you to specify normalizer plugin.
+* Changed "null" string to null value as meaning for "No Object".
+  This is backward incompatible change and affects output results of introspection
+  related commands such as ``table_list`` and ``column_list``.
+* Added a flag which controls behavior about normalizer as the last argument
+  of ``grn_tokenizer_query_open`` API.
+* Supported continuous line in command list.
+* Improved to support not only no key table, but also hash table, patricia trie
+  and double array trie for :ref:`nested-index-search`.
+
+Fixes
+^^^^^
+
+* [windows] Added missing ``O_BINARY`` flag to open file correctly.
+  This change fixes the infinite loop problem about groonga HTTP server.
+  [GitHub#47] [Patch by Shimomura Tatsuya]
+* Fixed a bug that ``--default-match-escalation-threshold`` doesn't accept
+  negative value to disable functionality.
+  This fix enable you to disable search escalation.
+  see :option:`--default-match-escalation-threshold` about details.
+* Fixed a bug that ``_score`` after "*" is ignored in ``--output_columns``.
+
+Thanks
+^^^^^^
+
+* Tomoatsu Shimada
+* Shimomura Tatsuya
+
 .. _release-2-0-9:
 
 Release 2.0.9 - 2012/11/29

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

@@ -83,6 +83,135 @@ match_columnsオプションで、検索対象のカラムを複数指定する
 
 .. TODO: match_columnsにインデックス名を指定しての検索についても触れる。
 
+
+.. _nested-index-search:
+
+Nested index search among related table by column index
+--------------------------------------------------------
+
+If there are relationships among multiple table with column index,
+you can search multiple table by specifying reference column name.
+
+Here is the concrete example.
+
+There are tables which store blog articles, comments for articles.
+The table which stores articles has columns for article and comment.
+And the comment column refers Comments table.
+The table which stores comments has columns for comment and column index to article table.
+
+if you want to search the articles which contain specified keyword in comment,
+you need to execute fulltext search for table of comment, then search the records which contains fulltext search results.
+
+But, you can search the records by specifying the reference column index at once.
+
+Here is the sample schema.
+
+.. groonga-command
+.. include:: ../example/tutorial/match_columns-nested-index-schema.log
+.. table_create Comments TABLE_HASH_KEY UInt32
+.. column_create Comments content COLUMN_SCALAR ShortText
+.. table_create Articles TABLE_NO_KEY
+.. column_create Articles content COLUMN_SCALAR Text
+.. column_create Articles comment COLUMN_SCALAR Comments
+.. table_create Lexicon TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram
+.. column_create Lexicon articles_content COLUMN_INDEX|WITH_POSITION Articles content
+.. column_create Lexicon comments_content COLUMN_INDEX|WITH_POSITION Comments content
+.. column_create Comments article COLUMN_INDEX Articles comment
+
+Here is the sample data.
+
+.. groonga-command
+.. include:: ../example/tutorial/match_columns-nested-index-data.log
+.. load --table Comments
+.. [
+.. {"_key": 1, "content": "I'm using groonga too!"},
+.. {"_key": 2, "content": "I'm using groonga and mroonga!"},
+.. {"_key": 3, "content": "I'm using mroonga too!"}
+.. ]
+.. load --table Articles
+.. [
+.. {"content": "Groonga is fast!", "comment": 1},
+.. {"content": "Groonga is useful!"},
+.. {"content": "Mroonga is fast!", "comment": 3}
+.. ]
+
+You can write the query that search the records which contains specified keyword as a comment, then fetch the articles which refers to it.
+
+Query for searching the records described above::
+
+  select Articles --match_columns comment.content --query groonga --output_columns "_id, _score, *" 
+
+You need to concatenate comment column of Articles table and content column of Comments table with period(.) as --match_columns arguments.
+
+At first, this query execute fulltext search from content of Comments table, then fetch the records of Articles table which refers to already searched records of Comments table.
+(Because of this, if you comment out the query which create column index 'article' of Comments table, you can't get intended search results.)
+
+.. groonga-command
+.. include:: ../example/tutorial/match_columns-nested-index-select.log
+.. select Articles --match_columns comment.content --query groonga --output_columns "_id, _score, *" 
+
+Now, you can search articles which contains specific keywords as a comment.
+
+The feature of nested index search is not limited to the relationship between two table only.
+
+Here is the sample schema similar to previous one. The difference is added table which express 'Reply' and relationship is extended to three tables.
+
+.. groonga-command
+.. include:: ../example/tutorial/match_columns-nested-index-schema-with-three-relationship.log
+.. table_create Replies2 TABLE_HASH_KEY UInt32
+.. column_create Replies2 content COLUMN_SCALAR ShortText
+.. table_create Comments2 TABLE_HASH_KEY UInt32
+.. column_create Comments2 content COLUMN_SCALAR ShortText
+.. column_create Comments2 comment COLUMN_SCALAR Replies2
+.. table_create Articles2 TABLE_NO_KEY
+.. column_create Articles2 content COLUMN_SCALAR Text
+.. column_create Articles2 comment COLUMN_SCALAR Comments2
+.. table_create Lexicon2 TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram
+.. column_create Lexicon2 articles_content COLUMN_INDEX|WITH_POSITION Articles2 content
+.. column_create Lexicon2 comments_content COLUMN_INDEX|WITH_POSITION Comments2 content
+.. column_create Lexicon2 replies_content COLUMN_INDEX|WITH_POSITION Replies2 content
+.. column_create Comments2 article COLUMN_INDEX Articles2 comment
+.. column_create Replies2 reply_to COLUMN_INDEX Comments2 comment
+
+Here is the sample data.
+
+.. groonga-command
+.. include:: ../example/tutorial/match_columns-nested-index-data-with-three-relationship.log
+.. load --table Replies2
+.. [
+.. {"_key": 1, "content": "I'm using rroonga too!"},
+.. {"_key": 2, "content": "I'm using groonga and mroonga and rroonga!"},
+.. {"_key": 3, "content": "I'm using nroonga too!"}
+.. ]
+.. load --table Comments2
+.. [
+.. {"_key": 1, "content": "I'm using groonga too!", "comment": 1},
+.. {"_key": 2, "content": "I'm using groonga and mroonga!", "comment": 2},
+.. {"_key": 3, "content": "I'm using mroonga too!"}
+.. ]
+.. load --table Articles2
+.. [
+.. {"content": "Groonga is fast!", "comment": 1},
+.. {"content": "Groonga is useful!", "comment": 2},
+.. {"content": "Mroonga is fast!", "comment": 3}
+.. ]
+
+Query for searching the records described above::
+
+  select Articles2 --match_columns comment.content --query mroonga --output_columns "_id, _score, *" 
+  select Articles2 --match_columns comment.comment.content --query mroonga --output_columns "_id, _score, *" 
+
+The first query searches 'mroonga' from Comments2 table, the second one searches 'mroonga' from Replies2 and Comment2 table by using reference column index.
+
+.. groonga-command
+.. include:: ../example/tutorial/match_columns-nested-index-select-with-three-relationship.log
+.. select Articles2 --match_columns comment.content --query mroonga --output_columns "_id, _score, *" 
+.. select Articles2 --match_columns comment.comment.content --query mroonga --output_columns "_id, _score, *" 
+
+As a result, the first query matches two article because of Comments2 table has two records which contains 'mroonga' as keyword.
+
+On the other hand, the second one matches one article only because of Replies2 table has only one record which contains 'mroonga' as keyword, and there is one record which contains same keyword and refers to the record in Comments2 table.
+
 インデックスの重み
 ------------------