rroonga 4.0.0-x64-mingw32 → 4.0.1-x64-mingw32

data/test/test-table-dumper.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2014  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
@@ -350,4 +350,49 @@ load --table Users
 EOS
     end
   end
+
+  class WeightVectorIndexTest < self
+    def setup
+      Groonga::Schema.define do |schema|
+        schema.create_table("Products",
+                            :type => :patricia_trie,
+                            :key_type => "ShortText") do |table|
+          table.short_text("tags",
+                           :type => :vector,
+                           :with_weight => true)
+        end
+      end
+    end
+
+    def products
+      Groonga["Products"]
+    end
+
+    def test_weight
+      products.add("Groonga", :tags => [
+                     {
+                       :value  => "groonga",
+                       :weight => 100,
+                     },
+                   ])
+      products.add("Mroonga", :tags => [
+                     {
+                       :value  => "mroonga",
+                       :weight => 100,
+                     },
+                     {
+                       :value  => "groonga",
+                       :weight => 10,
+                     },
+                   ])
+      assert_equal(<<-COMMAND, dump("Products"))
+load --table Products
+[
+[\"_key\",\"tags\"],
+[\"Groonga\",{\"groonga\":100}],
+[\"Mroonga\",{\"groonga\":10,\"mroonga\":100}]
+]
+      COMMAND
+    end
+  end
 end

data/test/test-table-select-weight.rb

@@ -120,4 +120,16 @@ class TableSelectWeightTest < Test::Unit::TestCase
       [record.title, record.score]
     end
   end
+
+  def test_one_column_only
+    result = @comments.select do |record|
+      record.match("Hello") do |match_record|
+        match_record.title
+      end
+    end
+    assert_equal_select_result([["Hello", 1]],
+                               result) do |record|
+      [record.title, record.score]
+    end
+  end
 end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -18,7 +18,10 @@ class VariableSizeColumnTest < Test::Unit::TestCase
 
   def setup
     setup_database
+    setup_schema
+  end
 
+  def setup_schema
     setup_users_table
     setup_users
   end
@@ -113,8 +116,9 @@ class VariableSizeColumnTest < Test::Unit::TestCase
   end
 
   def test_defrag
-    1000.times do |i|
-      @users.add(:name => "user #{i}" * 1000)
+    large_data = "x" * (2 ** 16)
+    100.times do |i|
+      @users.add(:name => "user #{i}" + large_data)
     end
     assert_equal(1, @name.defrag)
   end
@@ -232,5 +236,85 @@ class VariableSizeColumnTest < Test::Unit::TestCase
                      groonga_org.modified_times.collect(&:key))
       end
     end
+
+    class WeightTest < self
+      def setup_schema
+        Groonga::Schema.define do |schema|
+          schema.create_table("Products",
+                              :type => :patricia_trie,
+                              :key_type => :short_text) do |table|
+            table.short_text("tags",
+                             :type => :vector,
+                             :with_weight => true)
+          end
+        end
+
+        @products = Groonga["Products"]
+      end
+
+      def test_string_key
+        groonga = @products.add("Groonga")
+        groonga.tags = [
+          {
+            "value"  => "groonga",
+            "weight" => 100,
+          },
+        ]
+
+        assert_equal([
+                       {
+                         :value  => "groonga",
+                         :weight => 100,
+                       },
+                     ],
+                     groonga.tags)
+      end
+
+      def test_array
+        groonga = @products.add("Groonga")
+        groonga.tags = [
+          {
+            :value  => "groonga",
+            :weight => 100,
+          },
+          {
+            :value  => "full text search",
+            :weight => 1000,
+          },
+        ]
+
+        assert_equal([
+                       {
+                         :value  => "groonga",
+                         :weight => 100,
+                       },
+                       {
+                         :value  => "full text search",
+                         :weight => 1000,
+                       },
+                     ],
+                     groonga.tags)
+      end
+
+      def test_hash
+        groonga = @products.add("Groonga")
+        groonga.tags = {
+          "groonga" => 100,
+          "full text search" => 1000,
+        }
+
+        assert_equal([
+                       {
+                         :value  => "groonga",
+                         :weight => 100,
+                       },
+                       {
+                         :value  => "full text search",
+                         :weight => 1000,
+                       },
+                     ],
+                     groonga.tags)
+      end
+    end
   end
 end

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

@@ -1204,7 +1204,11 @@ GRN_API grn_rc grn_text_time2rfc1123(grn_ctx *ctx, grn_obj *bulk, int sec);
 typedef struct _grn_obj_format grn_obj_format;
 
 #define GRN_OBJ_FORMAT_WITH_COLUMN_NAMES   (0x01<<0)
-#define GRN_OBJ_FORMAT_ASARRAY             (0x01<<3)
+#define GRN_OBJ_FORMAT_AS_ARRAY            (0x01<<3)
+/* Deprecated since 4.0.1. It will be removed at 5.0.0.
+   Use GRN_OBJ_FORMAT_AS_ARRAY instead.*/
+#define GRN_OBJ_FORMAT_ASARRAY             GRN_OBJ_FORMAT_AS_ARRAY
+#define GRN_OBJ_FORMAT_WITH_WEIGHT         (0x01<<4)
 
 struct _grn_obj_format {
   grn_obj columns;
@@ -1691,6 +1695,7 @@ typedef unsigned int grn_expr_flags;
 #define GRN_EXPR_SYNTAX_QUERY          (0x00)
 #define GRN_EXPR_SYNTAX_SCRIPT         (0x01)
 #define GRN_EXPR_SYNTAX_OUTPUT_COLUMNS (0x20)
+#define GRN_EXPR_SYNTAX_ADJUSTER       (0x40)
 #define GRN_EXPR_ALLOW_PRAGMA          (0x02)
 #define GRN_EXPR_ALLOW_COLUMN          (0x04)
 #define GRN_EXPR_ALLOW_UPDATE          (0x08)

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=4.0.0
+groonga_version=4.0.1
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 4.0.0
+Version: 4.0.1
 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: 4af8da25a5f0f8c19df5f9bce6969edb
+config: 33af4e772b9c6767bb9351f7c7dbb478
 tags: 645f666f9bcd5a90fca523b33c5a78b7

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-4.0.0.tar.gz
-  % tar xvzf groonga-4.0.0.tar.gz
-  % cd groonga-4.0.0
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.1.tar.gz
+  % tar xvzf groonga-4.0.1.tar.gz
+  % cd groonga-4.0.1
 
 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-4.0.0.tar.gz
-  % tar xvzf groonga-4.0.0.tar.gz
-  % cd groonga-4.0.0
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.1.tar.gz
+  % tar xvzf groonga-4.0.1.tar.gz
+  % cd groonga-4.0.1
 
 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-4.0.0.tar.gz
-  % tar xvzf groonga-4.0.0.tar.gz
-  % cd groonga-4.0.0
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.1.tar.gz
+  % tar xvzf groonga-4.0.1.tar.gz
+  % cd groonga-4.0.1
 
 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-4.0.0.tar.gz
-  % tar xvzf groonga-4.0.0.tar.gz
-  % cd groonga-4.0.0
+  % curl -O http://packages.groonga.org/source/groonga/groonga-4.0.1.tar.gz
+  % tar xvzf groonga-4.0.1.tar.gz
+  % cd groonga-4.0.1
 
 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-4.0.0.tar.gz
-  % tar xvzf groonga-4.0.0.tar.gz
-  % cd groonga-4.0.0
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.1.tar.gz
+  % tar xvzf groonga-4.0.1.tar.gz
+  % cd groonga-4.0.1
   % ./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-4.0.0.tar.gz
-  % gtar xvzf groonga-4.0.0.tar.gz
-  % cd groonga-4.0.0
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.1.tar.gz
+  % gtar xvzf groonga-4.0.1.tar.gz
+  % cd groonga-4.0.1
 
 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

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

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

@@ -21,14 +21,14 @@ Installer
 For 32-bit environment, download x86 executable binary from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-4.0.0-x86.exe
+  * http://packages.groonga.org/windows/groonga/groonga-4.0.1-x86.exe
 
 Then run it.
 
 For 64-bit environment, download x64 executable binary from
 packages.goronga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-4.0.0-x64.exe
+  * http://packages.groonga.org/windows/groonga/groonga-4.0.1-x64.exe
 
 Then run it.
 
@@ -41,14 +41,14 @@ zip
 For 32-bit environment, download x86 zip archive from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-4.0.0-x86.zip
+  * http://packages.groonga.org/windows/groonga/groonga-4.0.1-x86.zip
 
 Then extract it.
 
 For 64-bit environment, download x64 zip archive from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-4.0.0-x64.zip
+  * http://packages.groonga.org/windows/groonga/groonga-4.0.1-x64.zip
 
 Then extract it.
 
@@ -66,27 +66,27 @@ Windows. Here are required tools:
 
 Download zipped source from packages.groonga.org:
 
-  * http://packages.groonga.org/source/groonga/groonga-4.0.0.zip
+  * http://packages.groonga.org/source/groonga/groonga-4.0.1.zip
 
 Then extract it.
 
 Move to the Groonga's source folder::
 
-  > cd c:\Users\%USERNAME%\Downloads\groonga-4.0.0
+  > cd c:\Users\%USERNAME%\Downloads\groonga-4.0.1
 
 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-4.0.0> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
+  groonga-4.0.1> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
 
 Build::
 
-  groonga-4.0.0> cmake --build . --config Release
+  groonga-4.0.1> cmake --build . --config Release
 
 Install::
 
-  groonga-4.0.0> cmake --build . --config Release --target Install
+  groonga-4.0.1> cmake --build . --config Release --target Install
 
 After the above steps, :doc:`/reference/executables/groonga` is found in
 ``c:\groonga\bin\groonga.exe``.