rroonga 3.0.1-x86-mingw32 → 3.0.2-x86-mingw32

data/test/test-table.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -647,13 +647,14 @@ class TableTest < Test::Unit::TestCase
   def test_have_column_nsubrecs_existent
     users = Groonga::Hash.create(:name => "Users",
                                  :key_type => "ShortText")
-    assert_true(users.select.have_column?(:_nsubrecs))
+    grouped_users = users.group("_key")
+    assert_true(grouped_users.have_column?(:_nsubrecs))
   end
 
   def test_have_column_nsubrecs_nonexistent
     users = Groonga::Hash.create(:name => "Users",
                                  :key_type => "ShortText")
-    assert_false(users.have_column?(:_nsubrecs))
+    assert_false(users.select.have_column?(:_nsubrecs))
   end
 
   def test_have_column_score_existent

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

@@ -112,36 +112,125 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     assert_equal(@users, @name.table)
   end
 
-  def test_vector_append
-    assert_equal([], @morita["friends"])
-    @morita.append("friends", @yu)
-    assert_equal([@yu], @morita["friends"])
-    @morita.append("friends", @gunyara_kun)
-    assert_equal([@yu, @gunyara_kun], @morita["friends"])
-  end
-
-  def test_vector_prepend
-    assert_equal([], @morita["friends"])
-    @morita.prepend("friends", @yu)
-    assert_equal([@yu], @morita["friends"])
-    @morita.prepend("friends", @gunyara_kun)
-    assert_equal([@gunyara_kun, @yu], @morita["friends"])
-  end
-
-  def test_string_vector
-    omit("append/prepend for non table domain column " +
-         "isn't supported by groonga.")
-    assert_equal([], @morita["nick_names"])
-    @morita.append("nick_names", "morita")
-    assert_equal(["morita"], @morita["nick_names"])
-    @morita.prepend("nick_names", "moritapo")
-    assert_equal(["moritapo", "morita"], @morita["nick_names"])
-  end
-
   def test_defrag
     1000.times do |i|
       @users.add(:name => "user #{i}" * 1000)
     end
     assert_equal(3, @name.defrag)
   end
+
+  class VectorTest < self
+    class ReferenceTest < self
+      def test_append
+        assert_equal([], @morita["friends"])
+        @morita.append("friends", @yu)
+        assert_equal([@yu], @morita["friends"])
+        @morita.append("friends", @gunyara_kun)
+        assert_equal([@yu, @gunyara_kun], @morita["friends"])
+      end
+
+      def test_prepend
+        assert_equal([], @morita["friends"])
+        @morita.prepend("friends", @yu)
+        assert_equal([@yu], @morita["friends"])
+        @morita.prepend("friends", @gunyara_kun)
+        assert_equal([@gunyara_kun, @yu], @morita["friends"])
+      end
+    end
+
+    class StringTest < self
+      def test_append
+        omit("append for non table domain column isn't supported by groonga.")
+        assert_equal([], @morita["nick_names"])
+        @morita.append("nick_names", "morita")
+        assert_equal(["morita"], @morita["nick_names"])
+        @morita.append("nick_names", "moritapo")
+        assert_equal(["morita", "moritapo"], @morita["nick_names"])
+      end
+
+      def test_prepend
+        omit("prepend for non table domain column isn't supported by groonga.")
+        assert_equal([], @morita["nick_names"])
+        @morita.prepend("nick_names", "morita")
+        assert_equal(["morita"], @morita["nick_names"])
+        @morita.prepend("nick_names", "moritapo")
+        assert_equal(["moritapo", "morita"], @morita["nick_names"])
+      end
+    end
+
+    class TimeTest < self
+      def setup
+        setup_database
+        setup_schema
+        setup_shortcuts
+      end
+
+      def setup_schema
+        Groonga::Schema.define do |schema|
+          schema.create_table("Sites",
+                              :type => :hash,
+                              :key_type => :short_text) do |table|
+            table.time("modified_times", :type => :vector)
+          end
+        end
+      end
+
+      def setup_shortcuts
+        @sites = Groonga["Sites"]
+      end
+
+      def test_string
+        groonga_org = @sites.add("http://groonga.org/",
+                                 :modified_times => [
+                                   "2013-04-29 00:00:00",
+                                   "2013-05-02 01:46:48",
+                                 ])
+        assert_equal([
+                       Time.new(2013, 4, 29, 0,  0,  0),
+                       Time.new(2013, 5,  2, 1, 46, 48),
+                     ],
+                     groonga_org.modified_times)
+      end
+    end
+
+    class CastTest < self
+      def setup
+        setup_database
+        setup_schema
+        setup_shortcuts
+      end
+
+      def setup_schema
+        Groonga::Schema.define do |schema|
+          schema.create_table("Times",
+                              :type => :hash,
+                              :key_type => :time) do |table|
+          end
+
+          schema.create_table("Sites",
+                              :type => :hash,
+                              :key_type => :short_text) do |table|
+            table.reference("modified_times", "Times", :type => :vector)
+          end
+        end
+      end
+
+      def setup_shortcuts
+        @sites = Groonga["Sites"]
+      end
+
+      def test_reference
+        groonga_org = @sites.add("http://groonga.org/",
+                                 :modified_times => [
+                                   "2013-04-29 00:00:00",
+                                   "2013-05-02 01:46:48",
+                                 ])
+        assert_equal([
+                       Time.new(2013, 4, 29, 0,  0,  0),
+                       Time.new(2013, 5,  2, 1, 46, 48),
+                     ],
+                     groonga_org.modified_times.collect(&:key))
+      end
+    end
+  end
 end

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

@@ -215,14 +215,6 @@ struct _grn_ctx {
 
 #define GRN_CTX_USER_DATA(ctx) (&((ctx)->user_data))
 
-/**
- * grn_ctx_init:
- * @ctx: 初期化するctx構造体へのポインタを指定します。
- * @flags: 初期化するctxのオプションを指定します。
- *
- * ctxを初期化します。
- **/
-
 #define GRN_CTX_USE_QL                 (0x03)
 #define GRN_CTX_BATCH_MODE             (0x04)
 #define GRN_CTX_PER_DB                 (0x08)
@@ -2099,7 +2091,7 @@ GRN_API void grn_logger_put(grn_ctx *ctx, grn_log_level level,
                             const char *file, int line, const char *func, const char *fmt, ...) GRN_ATTRIBUTE_PRINTF(6);
 GRN_API void grn_logger_reopen(grn_ctx *ctx);
 
-GRN_API int grn_logger_pass(grn_ctx *ctx, grn_log_level level);
+GRN_API grn_bool grn_logger_pass(grn_ctx *ctx, grn_log_level level);
 
 #ifndef GRN_LOG_DEFAULT_LEVEL
 #define GRN_LOG_DEFAULT_LEVEL GRN_LOG_NOTICE

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-1ubuntu2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

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-1ubuntu2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

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-1ubuntu2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

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-1ubuntu2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

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-1ubuntu2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

data/vendor/local/lib/libmsgpack.la

@@ -1,5 +1,5 @@
 # libmsgpack.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

data/vendor/local/lib/libmsgpackc.la

@@ -1,5 +1,5 @@
 # libmsgpackc.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

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

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.3.tar.gz
-  % tar xvzf groonga-3.0.3.tar.gz
-  % cd groonga-3.0.3
+  % 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
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -92,6 +92,46 @@ 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 aptitude -V -D -y install groonga-normalizer-mysql
+
+jessie
+------
+
+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 -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 aptitude -V -D -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 aptitude -V -D -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 aptitude -V -D -y install groonga-normalizer-mysql
@@ -145,9 +185,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % 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
+  % 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
 
 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.3.tar.gz
-  % tar xvzf groonga-3.0.3.tar.gz
-  % cd groonga-3.0.3
+  % 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
 
 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.3.tar.gz
-  % tar xvzf groonga-3.0.3.tar.gz
-  % cd groonga-3.0.3
+  % 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
 
 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.3.tar.gz
-  % tar xvzf groonga-3.0.3.tar.gz
-  % cd groonga-3.0.3
+  % 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
   % ./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.3.tar.gz
-  % gtar xvzf groonga-3.0.3.tar.gz
-  % cd groonga-3.0.3
+  % 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
 
 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

@@ -59,53 +59,6 @@ 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
-
-11.10 Oneiric Ocelot
---------------------
-
-.. 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/ oneiric universe
-  deb-src http://packages.groonga.org/ubuntu/ oneiric 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
@@ -260,9 +213,9 @@ Install required packages to build groonga::
 
 Download source::
 
-  % 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
+  % 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
 
 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.3-x86.exe
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.4-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.3-x64.exe
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.4-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.3-x86.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.4-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.3-x64.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/windows/groonga/groonga-3.0.4-x64.zip
 
 Then extract it.
 
@@ -79,37 +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.3.zip
+  > "c:\\Program Files\\Internet Explorer\\iexplore.exe" http://packages.groonga.org/source/groonga/groonga-3.0.4.zip
 
 Then extract it.
 
 Move to the groonga's source folder::
 
-  > cd c:\Users\%USERNAME%\Downloads\groonga-3.0.3
+  > cd c:\Users\%USERNAME%\Downloads\groonga-3.0.4
 
 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.3> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
+  groonga-3.0.4> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
 
-Build by Visual C++ 2010 Express::
+Build::
 
-  groonga-3.0.3> msbuild groonga.sln /p:Configuration=Release
+  groonga-3.0.4> cmake --build . --config Release
 
-Install by Visual C++ 2010 Express::
+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.3> devenv groonga.sln /Build Release
-
-Install by Visual Studio 2010::
-
-  groonga-3.0.3> devenv groonga.sln /Build Release /Project Install
+  groonga-3.0.4> cmake --build . --config Release --target Install
 
 After the above steps, :doc:`/reference/executables/groonga` is found in
 ``c:\groonga\bin\groonga.exe``.