rroonga 3.0.2-x86-mingw32 → 3.0.4-x86-mingw32

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

@@ -2726,6 +2726,22 @@ GRN_API grn_table_sort_key *grn_table_sort_key_from_str(grn_ctx *ctx,
 GRN_API grn_rc grn_table_sort_key_close(grn_ctx *ctx,
                                         grn_table_sort_key *keys, unsigned int nkeys);
 
+GRN_API grn_bool grn_table_is_grouped(grn_ctx *ctx, grn_obj *table);
+
+GRN_API unsigned int grn_table_max_n_subrecs(grn_ctx *ctx, grn_obj *table);
+
+GRN_API grn_obj *grn_table_create_for_group(grn_ctx *ctx,
+                                            const char *name,
+                                            unsigned int name_size,
+                                            const char *path,
+                                            grn_obj *group_key,
+                                            grn_obj *value_type,
+                                            unsigned int max_n_subrecs);
+
+GRN_API unsigned int grn_table_get_subrecs(grn_ctx *ctx, grn_obj *table,
+                                           grn_id id, grn_id *subrecbuf,
+                                           int *scorebuf, int buf_size);
+
 GRN_API grn_rc grn_load(grn_ctx *ctx, grn_content_type input_type,
                         const char *table, unsigned int table_len,
                         const char *columns, unsigned int columns_len,
@@ -2844,6 +2860,7 @@ GRN_API grn_id grn_array_pull(grn_ctx *ctx, grn_array *array, grn_bool blockp,
                               void (*func)(grn_ctx *ctx, grn_array *array,
                                            grn_id id, void *func_arg),
                               void *func_arg);
+GRN_API void grn_array_unblock(grn_ctx *ctx, grn_array *array);
 GRN_API int grn_array_get_value(grn_ctx *ctx, grn_array *array, grn_id id, void *valuebuf);
 GRN_API grn_rc grn_array_set_value(grn_ctx *ctx, grn_array *array, grn_id id,
                                    const void *value, int flags);
@@ -3008,10 +3025,11 @@ GRN_API grn_rc grn_dat_cursor_delete(grn_ctx *ctx, grn_dat_cursor *c,
   grn_dat_cursor *_sc = grn_dat_cursor_open(ctx, dat, NULL, 0, NULL, 0, 0, -1, 0);\
   if (_sc) {\
     grn_id id;\
-    int *_ks = (key_size);\
+    unsigned int *_ks = (key_size);\
     if (_ks) {\
       while ((id = grn_dat_cursor_next(ctx, _sc))) {\
-        *(_ks) = grn_dat_cursor_get_key(ctx, _sc, (const void **)(key));\
+        int _ks_raw = grn_dat_cursor_get_key(ctx, _sc, (const void **)(key));\
+        *(_ks) = (unsigned int)_ks_raw;\
         block\
       }\
     } else {\

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=3.0.4
+groonga_version=3.0.5
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 3.0.4
+Version: 3.0.5
 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: 02a700127d3d7e787c36bf706d51b3cf
+config: b5c02ef72bf18bdf3558ffe24533fa3e
 tags: a205e9ed8462ae86fdd2f73488852ba9

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

@@ -531,7 +531,7 @@ cloneしたWebサイトのソースに対して以下のファイルを新規追
 
 jekyllのインストールを行ったら、以下のコマンドでローカルにwebサーバを起動します。::
 
-    % jekyll --server --auto
+    % jekyll serve --watch
 
 あとはブラウザにてhttp://localhost:4000にアクセスして内容に問題がないかを確認します。
 

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

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

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

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

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

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

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

@@ -40,9 +40,9 @@ Install `Xcode <https://developer.apple.com/xcode/>`_.
 
 Download source::
 
-  % curl -O http://packages.groonga.org/source/groonga/groonga-3.0.4.tar.gz
-  % tar xvzf groonga-3.0.4.tar.gz
-  % cd groonga-3.0.4
+  % curl -O http://packages.groonga.org/source/groonga/groonga-3.0.5.tar.gz
+  % tar xvzf groonga-3.0.5.tar.gz
+  % cd groonga-3.0.5
 
 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-3.0.4.tar.gz
-  % tar xvzf groonga-3.0.4.tar.gz
-  % cd groonga-3.0.4
+  % wget http://packages.groonga.org/source/groonga/groonga-3.0.5.tar.gz
+  % tar xvzf groonga-3.0.5.tar.gz
+  % cd groonga-3.0.5
   % ./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-3.0.4.tar.gz
-  % gtar xvzf groonga-3.0.4.tar.gz
-  % cd groonga-3.0.4
+  % wget http://packages.groonga.org/source/groonga/groonga-3.0.5.tar.gz
+  % gtar xvzf groonga-3.0.5.tar.gz
+  % cd groonga-3.0.5
 
 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

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

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

@@ -23,7 +23,7 @@ You can download such a binary by command line operation.
 
 Start command prompt ``cmd.exe`` and download x86 executable binary by default browser::
 
-  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.4-x86.exe
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.5-x86.exe
 
 Then run it.
 
@@ -32,7 +32,7 @@ For 64-bit environment, download x64 executable binary from packages.groonga.org
 
 Start command prompt ``cmd.exe`` and download x64 executable binary by default browser::
 
-  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.4-x64.exe
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.5-x64.exe
 
 Then run it.
 
@@ -47,7 +47,7 @@ You can download such a binary by command line operation.
 
 Start command prompt ``cmd.exe`` and download x86 zip archive by default browser::
 
-  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.4-x86.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.5-x86.zip
 
 Then extract it.
 
@@ -55,7 +55,7 @@ For 64-bit environment, download x64 zip archive from packages.groonga.org.
 
 Start command prompt ``cmd.exe`` and download x64 zip archive by default browser::
 
-  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.4-x64.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.5-x64.zip
 
 Then extract it.
 
@@ -79,27 +79,27 @@ Start ``Visual Studio Command Prompt (2010)`` installed by Microsoft
 Visual Studio 2010 Express and download it by default browser::
 
   > cd c:\Users\%USERNAME%\Downloads
-  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/source/groonga/groonga-3.0.4.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/source/groonga/groonga-3.0.5.zip
 
 Then extract it.
 
 Move to the groonga's source folder::
 
-  > cd c:\Users\%USERNAME%\Downloads\groonga-3.0.4
+  > cd c:\Users\%USERNAME%\Downloads\groonga-3.0.5
 
 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-3.0.4> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
+  groonga-3.0.5> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
 
 Build::
 
-  groonga-3.0.4> cmake --build . --config Release
+  groonga-3.0.5> cmake --build . --config Release
 
 Install::
 
-  groonga-3.0.4> cmake --build . --config Release --target Install
+  groonga-3.0.5> cmake --build . --config Release --target 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,47 @@
 News
 ====
 
+.. _release-3-0-5:
+
+Release 3.0.5 - 2013/06/29
+--------------------------
+
+Improvements
+^^^^^^^^^^^^
+
+* [doc] Added summary about ``match_column`` and ``query_string`` parameters in ``query()``.
+* Added subrecord information to table inspection.
+* Supported single quoted string literal in ``output_columns`` expression.
+  This means that "XXX, '...'" expression is supported.
+* [doc] Added notification about root privileges and well known port
+  when starting groonga server. [Reported by Kosuke Asami]
+* [experimental] Added :doc:`/reference/functions/html_untag` function.
+
+Fixes
+^^^^^
+
+* Fixed a crash bug of mroonga which is caused by missing lock for table creation.
+  [Reported by Y.Kentaro]
+* Fixed a lot of compilation warnings by clang and gcc.
+* Fixed a bug that ``sub_filter(...)`` is ignored if you use "XXX && sub_filter(...)"
+  expression.
+* Fixed a bug that wrong tag name is used in XML output.
+  This bug affects the case if you use "REFERENCE_VECTOR_COLUMN._key" expression
+  for ``output_columns``. Reference column isn't contained in XML ouput.
+* [doc] Fixed wrong arguments in ``sub_filter()`` documentation.
+* [deb] Fixed a bug that status action returns wrong exit code
+  when services are stopped. [GitHub#62] [Patch by @orangain]
+* Fixed a bug that the value of arithmetic operation is broken.
+  This bug affects the case if you assign calculated value to
+  ``_score`` pseudo column for example.
+
+Thanks
+^^^^^^
+
+* Y.Kentaro
+* Kosuke Asami
+* @orangain
+
 .. _release-3-0-4:
 
 Release 3.0.4 - 2013/05/29
@@ -46,6 +87,7 @@ Fixes
   [Reported by Y.Kentaro]
 * Fixed a bug that daemonize process doesn't work on OS X.
   [groonga-dev,01440] [Reported by Masahiro KONISHI]
+* [deb] Fixed a bug that HTTP/GQTP process is excuted as root user.
 
 Thanks
 ^^^^^^
@@ -55,6 +97,7 @@ Thanks
 * firewood
 * Y.Kentaro
 * Masahiro KONISHI
+* @orangain
 
 .. _release-3-0-3:
 

data/vendor/local/share/doc/groonga/en/html/_sources/reference/commands/tokenize.txt

@@ -155,7 +155,7 @@ Here is an example that uses ``ENABLE_TOKENIZED_DELIMITER``.
 ``TokenDelimit`` tokenizer is one of tokenized delimiter supported
 tokenizer. ``ENABLE_TOKENIZED_DELIMITER`` enables tokenized delimiter.
 Tokenized delimiter is special character that indicates token
-border. It is `U+FFFE`. The character is not assigned any
+border. It is ``U+FFFE``. The character is not assigned any
 character. It means that the character is not appeared in normal
 string. So the character is good character for this puropose. If
 ``ENABLE_TOKENIZED_DELIMITER`` is enabled, the target string is
@@ -177,7 +177,7 @@ the feature::
 
 ``tokens``
 
-  Tokens is an array of token. Token is an object that has the following
+  ``tokens`` is an array of token. Token is an object that has the following
   attributes.
 
   .. list-table::

data/vendor/local/share/doc/groonga/en/html/_sources/reference/functions/html_untag.txt

@@ -0,0 +1,75 @@
+.. -*- rst -*-
+
+.. highlightlang:: none
+
+.. groonga-command
+.. database: functions_html_untag
+
+html_untag
+==========
+
+Summary
+-------
+
+``html_untag`` strips HTML tags from HTML and outputs plain text.
+
+``html_untag`` is used in ``--output_columns`` described at :doc:`/reference/commands/select`.
+
+Syntax
+------
+
+``html_untag`` requires only one argument. It is ``column``.
+
+::
+
+  html_untag(column)
+
+
+Usage
+-----
+
+Here are a schema definition and sample data to show usage.
+
+Sample schema:
+
+.. groonga-command
+.. include:: ../../example/reference/functions/html_untag/usage_setup_schema.log
+.. table_create WebClips TABLE_NO_KEY
+.. column_create WebClips url COLUMN_SCALAR ShortText
+.. column_create WebClips content COLUMN_SCALAR ShortText
+.. column_create WebClips tag COLUMN_VECTOR ShortText
+
+Sample data:
+
+.. groonga-command
+.. include:: ../../example/reference/functions/html_untag/usage_setup_data.log
+.. load --table WebClips
+.. [
+.. {"_key": 1, "url": "http://groonga.org", "tag": ["groonga"], "content": "groonga is <span class='emphasize'>fast</span>"},
+.. {"_key": 2, "url": "http://mroonga.org", "tag": ["mroonga"], "content": "mroonga is <span class=\"emphasize\">fast</span>"},
+.. ]
+
+Here is the simple usage of ``html_untag`` function which strips HTML tags from content of column.
+
+.. groonga-command
+.. include:: ../../example/reference/functions/html_untag/usage_html_untag.log
+.. select WebClips --output_columns "_key, html_untag(content)" --command_version 2
+
+When executing the above query, you can see "span" tag with "class" attribute is stripped.
+Note that you must specify ``--command_version 2`` to use ``html_untag`` function.
+
+Parameters
+----------
+
+There is one required parameter, ``column``.
+
+``column``
+^^^^^^^^^^
+
+It specifies a column of the table.
+
+Return value
+------------
+
+``html_untag`` returns plain text which is stripped HTML tags from content of column.
+