rroonga 6.0.0-x64-mingw32 → 6.0.2-x64-mingw32

data/vendor/local/lib/groonga/scripts/ruby/scan_info_builder.rb

@@ -76,6 +76,12 @@ module Groonga
           @data_list << data
           data = nil
         when *LOGICAL_OPERATORS
+          if status == Status::CONST
+            data.op = Operator::PUSH
+            data.end = data.start
+            @data_list << data
+            data = nil
+          end
           put_logical_op(code.op, i)
           # TODO: rescue and return nil
           status = Status::START
@@ -90,6 +96,14 @@ module Groonga
             end
             status = Status::CONST
           end
+          if code.modify > 0 and
+              LOGICAL_OPERATORS.include?(codes[i + code.modify].op)
+            data.op = Operator::PUSH
+            data.end = data.start
+            @data_list << data
+            data = nil
+            status = Status::START
+          end
         when Operator::GET_VALUE
           case status
           when Status::START
@@ -169,14 +183,29 @@ module Groonga
           status = Status::START
           return false if n_relation_expressions != (n_logical_expressions + 1)
         when *LOGICAL_OPERATORS
-          return false if status != Status::START
-          n_logical_expressions += 1
-          return false if n_logical_expressions >= n_relation_expressions
+          case status
+          when Status::START
+            n_logical_expressions += 1
+            return false if n_logical_expressions >= n_relation_expressions
+          when Status::CONST
+            n_logical_expressions += 1
+            n_relation_expressions += 1
+            return false if n_logical_expressions >= n_relation_expressions
+            status = Status::START
+          else
+            return false
+          end
         when Operator::PUSH
-          if code.value == variable
-            status = Status::VAR
+          if code.modify > 0 and
+              LOGICAL_OPERATORS.include?(codes[i + code.modify].op)
+            n_relation_expressions += 1
+            status = Status::START
           else
-            status = Status::CONST
+            if code.value == variable
+              status = Status::VAR
+            else
+              status = Status::CONST
+            end
           end
         when Operator::GET_VALUE
           case status

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

@@ -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=6.0.0
+groonga_version=6.0.2
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 6.0.0
+Version: 6.0.2
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga

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: 854339bcc6ea7ba27acbbd757eeb3f0a
+config: bfc9d3724004ca2676fddac668bf3138
 tags: 645f666f9bcd5a90fca523b33c5a78b7

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

@@ -421,7 +421,7 @@ grntestを実行するためにはGroongaのテストデータとgrntestのソ
 grntestの実行方法
 ~~~~~~~~~~~~~~~~~
 
-grntestではGroongaコマンドを明示的にしていすることができます。
+grntestではGroongaコマンドを明示的に指定することができます。
 後述のパッケージごとのgrntestによる動作確認では以下のようにして実行します。::
 
     % GROONGA=(groongaのパス指定) test/function/run-test.sh
@@ -628,6 +628,15 @@ blogroongaのリリースエントリには「リンクをあなたのフォロ
 この作業はblogroongaの英語版、日本語版それぞれで行います。
 あらかじめgroongaアカウントでログインしておくとアナウンスを円滑に行うことができます。
 
+Facebookでリリースアナウンスをする
+----------------------------------
+
+FacebookにGroongaグループがあります。
+https://www.facebook.com/groonga/
+
+Groongaグループのメンバーになると、個人のアカウントではなく、Groongaグループのメンバーとして投稿できます。
+ブログエントリなどをもとに、リリースアナウンスを投稿します。
+
 以上でリリース作業は終了です。
 
 リリース後にやること

data/vendor/local/share/doc/groonga/en/html/_sources/contribution/documentation/i18n.txt

@@ -26,13 +26,14 @@ After doc/source/\*.txt are updated, we can start translation.
 
 Here is a translation flow:
 
-1. Clone groonga repository.
-2. Update .po files.
-3. Edit .po files.
-4. Generate HTML files.
-5. Confirm HTML output.
-6. Repeat 2.-4. until you get good result.
-7. Send your works to us!
+1. Install Sphinx, if it is not installed.
+2. Clone Groonga repository.
+3. Update .po files.
+4. Edit .po files.
+5. Generate HTML files.
+6. Confirm HTML output.
+7. Repeat 2.-4. until you get good result.
+8. Send your works to us!
 
 Here are command lines to do the above flow. Following
 sections describes details.
@@ -42,7 +43,7 @@ sections describes details.
   # Please fork https://github.com/groonga/groonga on GitHub
   % git clone https://github.com/${YOUR_GITHUB_ACCOUNT}/groonga.git
   % ./autogen.sh
-  % ./configure
+  % ./configure --enable-document
   % cd doc/locale/${LANGUAGE}/LC_MESSAGES # ${LANGUAGE} is language code such as 'ja'.
   % make update # *.po are updated
   % editor *.po # translate *.po # you can use your favorite editor
@@ -53,12 +54,17 @@ sections describes details.
   % git commit
   % git push
 
-How to clone groonga repository
+How to install Sphinx
+---------------------
+
+See the :doc:`introduction`.
+
+How to clone Groonga repository
 -------------------------------
 
-First, please fork groonga repository on GitHub. You
+First, please fork Groonga repository on GitHub. You
 just access https://github.com/groonga/groonga and press
-`Fork` button. Now you can clone your groonga repository::
+`Fork` button. Now you can clone your Groonga repository::
 
   % git clone https://github.com/${YOUR_GITHUB_ACCOUNT}/groonga.git
 
@@ -66,7 +72,7 @@ Then you need to configure your cloned repository::
 
   % cd groonga
   % ./autogen.sh
-  % ./configure
+  % ./configure --enable-document
 
 The above steps are just needed at the first setup.
 
@@ -176,7 +182,7 @@ How to send .po files
 Please archive doc/locale/${LANGUAGE}/LC_MESSAGES/ (Please
 substitute `${LANGUAGE}` with your language code such as
 'ja'.) and send it to us! We extract and merge them to the
-groonga repository.
+Groonga repository.
 
 .. seealso:: :doc:`/community` describes our contact information.
 

data/vendor/local/share/doc/groonga/en/html/_sources/contribution/documentation/introduction.txt

@@ -33,6 +33,15 @@ OS X::
   % export PATH=`brew --prefix gettext`/bin:$PATH
   % pip install sphinx
 
+If the version of Python on your platform is too old, you'll need to
+install a newer version of Python 2.7 by your hand. For example, here
+are installation steps based on `pyenv
+<https://github.com/yyuu/pyenv>`_::
+
+  % pyenv install 2.7.11
+  % pyenv global 2.7.11
+  % pip install sphinx
+
 Run ``configure`` with ``--enable-document``
 --------------------------------------------
 

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

@@ -121,8 +121,7 @@ CentOS 7
 
 Install::
 
-  % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
-  % sudo yum makecache
+  % sudo yum install -y http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
   % sudo yum install -y groonga
 
 .. include:: server-use.inc
@@ -170,9 +169,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-6.0.0.tar.gz
-  % tar xvzf groonga-6.0.0.tar.gz
-  % cd groonga-6.0.0
+  % wget http://packages.groonga.org/source/groonga/groonga-6.0.2.tar.gz
+  % tar xvzf groonga-6.0.2.tar.gz
+  % cd groonga-6.0.2
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -14,15 +14,17 @@ just only for tests or development. You will encounter an out of
 memory error with a 32-bit package even if you just process medium
 size data.
 
-wheezy
+jessie
 ------
 
+.. versionadded:: 5.0.3
+
 Add the Groonga apt repository.
 
 /etc/apt/sources.list.d/groonga.list::
 
-  deb http://packages.groonga.org/debian/ wheezy main
-  deb-src http://packages.groonga.org/debian/ wheezy main
+  deb http://packages.groonga.org/debian/ jessie main
+  deb-src http://packages.groonga.org/debian/ jessie main
 
 Install::
 
@@ -63,56 +65,20 @@ Install groonga-normalizer-mysql package::
 
   % sudo apt-get install -y -V groonga-normalizer-mysql
 
-jessie
-------
-
-.. versionadded:: 5.0.3
-
-Add the Groonga apt repository.
-
-/etc/apt/sources.list.d/groonga.list::
-
-  deb http://packages.groonga.org/debian/ jessie main
-  deb-src http://packages.groonga.org/debian/ jessie main
-
-Install::
-
-  % sudo apt-get update
-  % sudo apt-get install -y --allow-unauthenticated groonga-keyring
-  % sudo apt-get update
-  % sudo apt-get install -y -V groonga
-
-.. include:: server-use.inc
-
-If you want to use `MeCab <http://mecab.sourceforge.net/>`_ as a
-tokenizer, install groonga-tokenizer-mecab package.
+.. note::
 
-Install groonga-tokenizer-mecab package::
+   If you use systemd as init, current version of Groonga does not support
+   to register start-up service automatically during installation.
+   If you want to register groonga-httpd/groonga-server-gqtp as
+   a automatic start-up service, please execute the following commands:
 
-  % sudo apt-get install -y -V groonga-tokenizer-mecab
+   For groonga-httpd:
 
-If you want to use ``TokenFilterStem`` as a token filter, install
-groonga-token-filter-stem package.
+     % sudo systemctl enable groonga-httpd
 
-Install groonga-token-filter-stem package::
-
-  % sudo apt-get install -y -V groonga-token-filter-stem
+   For groonga-server-gqtp:
 
-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 install -y -V groonga-munin-plugins
-
-There is a package that provides MySQL compatible normalizer as
-a Groonga plugin.
-If you want to use that one, install groonga-normalizer-mysql package.
-
-Install groonga-normalizer-mysql package::
-
-  % sudo apt-get install -y -V groonga-normalizer-mysql
+     % sudo systemctl enable groonga-server-gqtp
 
 Build from source
 -----------------
@@ -123,9 +89,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-6.0.0.tar.gz
-  % tar xvzf groonga-6.0.0.tar.gz
-  % cd groonga-6.0.0
+  % wget http://packages.groonga.org/source/groonga/groonga-6.0.2.tar.gz
+  % tar xvzf groonga-6.0.2.tar.gz
+  % cd groonga-6.0.2
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

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

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

@@ -32,6 +32,16 @@ tokenizer, specify ``--with-mecab`` option::
 
   % brew install groonga --with-mecab
 
+Then install and configure MeCab dictionary.
+
+Install::
+
+  % brew install mecab-ipadic
+
+Configure::
+
+  % sed -i '' -e 's,dicrc.*=.*,dicrc = /usr/local/lib/mecab/dic/ipadic,g' /usr/local/etc/mecabrc
+
 Build from source
 -----------------
 
@@ -39,9 +49,9 @@ Install `Xcode <https://developer.apple.com/xcode/>`_.
 
 Download source::
 
-  % curl -O http://packages.groonga.org/source/groonga/groonga-6.0.0.tar.gz
-  % tar xvzf groonga-6.0.0.tar.gz
-  % cd groonga-6.0.0
+  % curl -O http://packages.groonga.org/source/groonga/groonga-6.0.2.tar.gz
+  % tar xvzf groonga-6.0.2.tar.gz
+  % cd groonga-6.0.2
 
 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-6.0.0.tar.gz
-  % tar xvzf groonga-6.0.0.tar.gz
-  % cd groonga-6.0.0
+  % wget http://packages.groonga.org/source/groonga/groonga-6.0.2.tar.gz
+  % tar xvzf groonga-6.0.2.tar.gz
+  % cd groonga-6.0.2
   % ./configure
   % make
   % sudo make install
@@ -224,16 +224,18 @@ Here is an example that installs Munin plugins for Groonga::
 ++++++++++++++++++++++++++++++++++++
 
 Installs platform specific system management files such as init
-script. Available platforms are ``redhat`` and ``fedora``. ``redhat``
-is for Red Hat and Red Hat clone distributions such as
-CentOS. ``fedora`` is for Fedora.
+script. Available platforms are ``centos``, ``centos5``, ``centos6``,
+``centos7`` and ``fedora``. Platform starts with ``centos`` are for
+Red Hat and Red Hat clone distributions such as CentOS. If ``centos``
+is specified, distribution version is guessed. ``fedora`` is for
+Fedora.
 
 Those system management files are not installed by default.
 
 Here is an example that installs CentOS specific system management
 files::
 
-  % ./configure --with-package-platform=redhat
+  % ./configure --with-package-platform=centos
 
 ``--help``
 ++++++++++