rroonga 3.0.0-x86-mingw32 → 3.0.1-x86-mingw32

data/test/test-logger.rb

@@ -17,22 +17,23 @@ class LoggerTest < Test::Unit::TestCase
   include GroongaTestUtils
 
   def setup
-    @default_log_path = Groonga::Logger.log_path
-    @default_query_log_path = Groonga::Logger.query_log_path
+    @default_log_path = Groonga::Logger.path
+    @default_query_log_path = Groonga::QueryLogger.path
   end
 
   def teardown
-    Groonga::Logger.log_path = @default_log_path
-    Groonga::Logger.query_log_path = @default_query_log_path
+    Groonga::Logger.path = @default_log_path
+    Groonga::QueryLogger.path = @default_query_log_path
   end
 
   def test_reopen
     Groonga::Logger.unregister
-    if File.exist?(@default_log_path)
-      FileUtils.mv(@default_log_path, "#{@default_log_path}.old")
+    Groonga::Logger.path = @log_path.to_s
+    if @log_path.exist?
+      FileUtils.mv(@log_path, "#{@log_path}.old")
     end
-    assert_false(File.exist?(@default_log_path))
+    assert_false(@log_path.exist?)
     Groonga::Logger.reopen
-    assert_true(File.exist?(@default_log_path))
+    assert_true(@log_path.exist?)
   end
 end

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

@@ -1218,7 +1218,8 @@ typedef enum {
   GRN_OP_TABLE_SELECT,
   GRN_OP_TABLE_SORT,
   GRN_OP_TABLE_GROUP,
-  GRN_OP_JSON_PUT
+  GRN_OP_JSON_PUT,
+  GRN_OP_GET_MEMBER
 } grn_operator;
 
 struct _grn_table_group_result {
@@ -2084,6 +2085,9 @@ struct _grn_logger {
 
 GRN_API grn_rc grn_logger_set(grn_ctx *ctx, const grn_logger *logger);
 
+GRN_API void grn_logger_set_max_level(grn_ctx *ctx, grn_log_level max_level);
+GRN_API grn_log_level grn_logger_get_max_level(grn_ctx *ctx);
+
 #ifdef __GNUC__
 #define GRN_ATTRIBUTE_PRINTF(fmt_pos) \
   __attribute__ ((format(printf, fmt_pos, fmt_pos + 1)))
@@ -2149,10 +2153,22 @@ GRN_API const char *grn_default_query_logger_get_path(void);
 #define GRN_BULK_BUFSIZE (sizeof(grn_obj) - sizeof(grn_obj_header))
 #define GRN_BULK_OUTP(bulk) ((bulk)->header.impl_flags & GRN_OBJ_OUTPLACE)
 #define GRN_BULK_REWIND(bulk) do {\
-  if (GRN_BULK_OUTP(bulk)) {\
-    (bulk)->u.b.curr = (bulk)->u.b.head;\
+  if ((bulk)->header.type == GRN_VECTOR) {\
+    grn_obj *_body = (bulk)->u.v.body;\
+    if (_body) {\
+      if (GRN_BULK_OUTP(_body)) {\
+        (_body)->u.b.curr = (_body)->u.b.head;\
+      } else {\
+        (_body)->header.flags = 0;\
+      }\
+    }\
+    (bulk)->u.v.n_sections = 0;\
   } else {\
-    (bulk)->header.flags = 0;\
+    if (GRN_BULK_OUTP(bulk)) {\
+      (bulk)->u.b.curr = (bulk)->u.b.head;\
+    } else {\
+      (bulk)->header.flags = 0;\
+    }\
   }\
 } while (0)
 #define GRN_BULK_WSIZE(bulk) \

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

@@ -186,16 +186,16 @@ GRN_API const char *grn_plugin_win32_base_dir(void);
   are invalid as a character, grn_plugin_charlen() returns 0. See
   grn_encoding in "groonga.h" for more details of `encoding'
  */
-int grn_plugin_charlen(grn_ctx *ctx, const char *str_ptr,
-                       unsigned int str_length, grn_encoding encoding);
+GRN_API int grn_plugin_charlen(grn_ctx *ctx, const char *str_ptr,
+                               unsigned int str_length, grn_encoding encoding);
 
 /*
   grn_plugin_isspace() returns the length (#bytes) of the first character
   in the string specified by `str_ptr' and `str_length' if it is a space
   character. Otherwise, grn_plugin_isspace() returns 0.
  */
-int grn_plugin_isspace(grn_ctx *ctx, const char *str_ptr,
-                       unsigned int str_length, grn_encoding encoding);
+GRN_API int grn_plugin_isspace(grn_ctx *ctx, const char *str_ptr,
+                               unsigned int str_length, grn_encoding encoding);
 
 
 

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.2
+groonga_version=3.0.3
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 3.0.2
+Version: 3.0.3
 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: a519bdebb519bbc379ba7ea979ef4c84
+config: 2dacd914aab24711a2f798c9da36b264
 tags: a205e9ed8462ae86fdd2f73488852ba9

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

@@ -66,4 +66,4 @@ Groonga provides a built-in server command which supports HTTP, the memcached bi
 Groonga storage engine
 ----------------------
 
-Groonga works not only as an independent column-oriented DBMS but also as storage engines of well-known DBMSs. For example, `mroonga <http://mroonga.github.com/>`_ is a MySQL pluggable storage engine using groonga. By using mroonga, you can use groonga for column-oriented storage and full text search. A combination of a built-in storage engine, MyISAM or InnoDB, and a groonga-based full text search engine is also available. All the combinations have good and bad points and the best one depends on the application. See `related projects <http://groonga.org/related-projects.html>`_ for details.
+Groonga works not only as an independent column-oriented DBMS but also as storage engines of well-known DBMSs. For example, `mroonga <http://mroonga.org/>`_ is a MySQL pluggable storage engine using groonga. By using mroonga, you can use groonga for column-oriented storage and full text search. A combination of a built-in storage engine, MyISAM or InnoDB, and a groonga-based full text search engine is also available. All the combinations have good and bad points and the best one depends on the application. See `related projects <http://groonga.org/related-projects.html>`_ for details.

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.2.tar.gz
-  % tar xvzf groonga-3.0.2.tar.gz
-  % cd groonga-3.0.2
+  % wget http://packages.groonga.org/source/groonga/groonga-3.0.3.tar.gz
+  % tar xvzf groonga-3.0.3.tar.gz
+  % cd groonga-3.0.3
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

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

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

@@ -8,13 +8,15 @@ Fedora
 This section describes how to install groonga related RPM packages on
 Fedora. You can install them by ``yum``.
 
-Groonga related RPM pakcages are also in the official Fedora yum
-repository. So you can use them instead of the groonga yum
-repository. The different between the groonga yum repository and the
-official Fedora yum repository is that the groonga yum repository
-provides the latest version at the release day but the official Fedora
-yum repository provides the latest version a few days later. That is,
-the different is very small. :-)
+.. note::
+
+  Since groonga 3.0.2 release, Groonga related RPM pakcages are in the official
+  Fedora yum repository (Fedora 18). So you can use them instead of the groonga yum
+  repository now. There is some exceptions to use the groonga yum
+  repository because ``groonga-normalizer-mysql`` and mecab dictionaries
+  (mecab-ipadic or mecab-jumandic) are provided by
+  the groonga yum repository. But we will also plan to release
+  ``groonga-normalizer-mysql`` in the official Fedora yum repository in the future.
 
 We distribute both 32-bit and 64-bit packages but we strongly
 recommend a 64-bit package for server. You should use a 32-bit package
@@ -29,9 +31,14 @@ Fedora 18
 
 Install::
 
+  % sudo yum install -y groonga
+
+Note that additional packages such as ``groonga-normalizer-mysql``,
+``mecab-dic`` and ``mecab-jumandic`` packages require to install
+``groonga-release`` package which provides the groonga yum repository beforehand::
+
   % sudo rpm -ivh http://packages.groonga.org/fedora/groonga-release-1.1.0-1.noarch.rpm
   % sudo yum update
-  % sudo yum install -y groonga
 
 If you want to use `MeCab <http://mecab.sourceforge.net/>`_ as a
 tokenizer, install groonga-tokenizer-mecab package.
@@ -75,9 +82,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-3.0.2.tar.gz
-  % tar xvzf groonga-3.0.2.tar.gz
-  % cd groonga-3.0.2
+  % wget http://packages.groonga.org/source/groonga/groonga-3.0.3.tar.gz
+  % tar xvzf groonga-3.0.3.tar.gz
+  % cd groonga-3.0.3
 
 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.2.tar.gz
-  % tar xvzf groonga-3.0.2.tar.gz
-  % cd groonga-3.0.2
+  % curl -O http://packages.groonga.org/source/groonga/groonga-3.0.3.tar.gz
+  % tar xvzf groonga-3.0.3.tar.gz
+  % cd groonga-3.0.3
 
 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.2.tar.gz
-  % tar xvzf groonga-3.0.2.tar.gz
-  % cd groonga-3.0.2
+  % wget http://packages.groonga.org/source/groonga/groonga-3.0.3.tar.gz
+  % tar xvzf groonga-3.0.3.tar.gz
+  % cd groonga-3.0.3
   % ./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.2.tar.gz
-  % gtar xvzf groonga-3.0.2.tar.gz
-  % cd groonga-3.0.2
+  % wget http://packages.groonga.org/source/groonga/groonga-3.0.3.tar.gz
+  % gtar xvzf groonga-3.0.3.tar.gz
+  % cd groonga-3.0.3
 
 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

@@ -200,6 +200,53 @@ There is a package that provides MySQL compatible normalizer as
 groonga plugins.
 If you want to use that one, install groonga-normalizer-mysql package.
 
+Install groonga-normalizer-mysql package::
+
+  % sudo apt-get -y install groonga-normalizer-mysql
+
+13.04 Raring Ringtail
+---------------------
+
+.. 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/ raring universe
+  deb-src http://packages.groonga.org/ubuntu/ raring 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
+
+There is a package that provides MySQL compatible normalizer as
+groonga plugins.
+If you want to use that one, install groonga-normalizer-mysql package.
+
 Install groonga-normalizer-mysql package::
 
   % sudo apt-get -y install groonga-normalizer-mysql
@@ -213,9 +260,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-3.0.2.tar.gz
-  % tar xvzf groonga-3.0.2.tar.gz
-  % cd groonga-3.0.2
+  % wget http://packages.groonga.org/source/groonga/groonga-3.0.3.tar.gz
+  % tar xvzf groonga-3.0.3.tar.gz
+  % cd groonga-3.0.3
 
 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.2-x86.exe
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.3-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.2-x64.exe
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.3-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.2-x86.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.3-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.2-x64.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.3-x64.zip
 
 Then extract it.
 
@@ -79,37 +79,37 @@ 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.2.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/source/groonga/groonga-3.0.3.zip
 
 Then extract it.
 
 Move to the groonga's source folder::
 
-  > cd c:\Users\%USERNAME%\Downloads\groonga-3.0.2
+  > cd c:\Users\%USERNAME%\Downloads\groonga-3.0.3
 
 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.2> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
+  groonga-3.0.3> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
 
 Build by Visual C++ 2010 Express::
 
-  groonga-3.0.2> msbuild groonga.sln /p:Configuration=Release
+  groonga-3.0.3> msbuild groonga.sln /p:Configuration=Release
 
 Install by Visual C++ 2010 Express::
 
-  groonga-3.0.2> msbuild groonga.sln /p:Configuration=Release /t:Install
+  groonga-3.0.3> 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-3.0.2> devenv groonga.sln /Build Release
+  groonga-3.0.3> devenv groonga.sln /Build Release
 
 Install by Visual Studio 2010::
 
-  groonga-3.0.2> devenv groonga.sln /Build Release /Project Install
+  groonga-3.0.3> devenv groonga.sln /Build Release /Project Install
 
 After the above steps, :doc:`/reference/executables/groonga` is found in
 ``c:\groonga\bin\groonga.exe``.