rroonga 6.1.3-x86-mingw32 → 7.0.2-x86-mingw32

data/test/test-index-cursor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2017  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
@@ -22,20 +22,62 @@ class IndexCursorTest < Test::Unit::TestCase
     setup_records
   end
 
-  def test_open_cursor
-    postings = []
-    @terms.open_cursor do |table_cursor|
-      index_cursor = nil
-      @content_index.open_cursor(table_cursor) do |cursor|
-        cursor.each do |posting|
-          postings << posting.to_hash
+  sub_test_case("#open_cursor") do
+    def test_table_cursor
+      postings = []
+      @terms.open_cursor do |table_cursor|
+        index_cursor = nil
+        @content_index.open_cursor(table_cursor) do |cursor|
+          cursor.each do |posting|
+            postings << posting.to_hash
+          end
+          index_cursor = cursor
+        end
+        assert_predicate(index_cursor, :closed?)
+      end
+
+      assert_equal(expected_postings(:with_position => true),
+                   postings)
+    end
+
+    def test_term_id_without_position
+      postings = []
+      @terms.open_cursor do |table_cursor|
+        table_cursor.each do |term|
+          index_cursor = nil
+          @content_index.open_cursor(term.id,
+                                     :with_position => false) do |cursor|
+            cursor.each do |posting|
+              postings << posting.to_hash
+            end
+            index_cursor = cursor
+          end
+          assert_predicate(index_cursor, :closed?)
         end
-        index_cursor = cursor
       end
-      assert_predicate(index_cursor, :closed?)
+
+      assert_equal(expected_postings(:with_position => false),
+                   postings)
     end
 
-    assert_equal(expected_postings, postings)
+    def test_term_id_with_position
+      postings = []
+      @terms.open_cursor do |table_cursor|
+        table_cursor.each do |term|
+          index_cursor = nil
+          @content_index.open_cursor(term.id) do |cursor|
+            cursor.each do |posting|
+              postings << posting.to_hash
+            end
+            index_cursor = cursor
+          end
+          assert_predicate(index_cursor, :closed?)
+        end
+      end
+
+      assert_equal(expected_postings(:with_position => true),
+                   postings)
+    end
   end
 
   def test_enumerable
@@ -45,7 +87,8 @@ class IndexCursorTest < Test::Unit::TestCase
         postings = cursor.collect do |posting|
           posting.to_hash
         end
-        assert_equal(expected_postings, postings)
+        assert_equal(expected_postings(:with_position => true),
+                     postings)
         opened = true
       end
     end
@@ -58,7 +101,8 @@ class IndexCursorTest < Test::Unit::TestCase
     @terms.open_cursor do |table_cursor|
       @content_index.open_cursor(table_cursor) do |cursor|
         postings = cursor.each.collect(&:to_hash)
-        assert_equal(expected_postings, postings)
+        assert_equal(expected_postings(:with_position => true),
+                     postings)
         opened = true
       end
     end
@@ -78,7 +122,8 @@ class IndexCursorTest < Test::Unit::TestCase
         end
         assert_equal([posting_object_ids.first] * posting_object_ids.size,
                      posting_object_ids)
-        assert_equal(expected_postings, postings)
+        assert_equal(expected_postings(:with_position => true),
+                     postings)
         opened = true
       end
     end
@@ -149,20 +194,40 @@ class IndexCursorTest < Test::Unit::TestCase
     @articles.add("3", :content => "hello")
   end
 
-  def expected_postings
-    parameters = [:record_id, :section_id, :term_id, :position,
-                  :term_frequency, :weight, :n_rest_postings]
-
-    expected = [
-                [1, 1, 1, 0, 1, 0, 0],
-                [2, 1, 1, 1, 1, 0, 0],
-                [2, 1, 2, 0, 1, 0, 0],
-                [3, 1, 2, 2, 1, 0, 0],
-                [3, 1, 3, 0, 1, 0, 0],
-                [3, 1, 4, 1, 1, 0, 0],
-                [3, 1, 5, 3, 1, 0, 0],
-                [3, 1, 6, 4, 1, 0, 0]
-               ]
+  def expected_postings(options={})
+    parameters = [
+      :record_id,
+      :section_id,
+      :term_id,
+      :position,
+      :term_frequency,
+      :weight,
+      :n_rest_postings,
+    ]
+
+    if options[:with_position]
+      expected = [
+        [1, 1, 1, 0, 1, 0, 0],
+        [2, 1, 1, 1, 1, 0, 0],
+        [2, 1, 2, 0, 1, 0, 0],
+        [3, 1, 2, 2, 1, 0, 0],
+        [3, 1, 3, 0, 1, 0, 0],
+        [3, 1, 4, 1, 1, 0, 0],
+        [3, 1, 5, 3, 1, 0, 0],
+        [3, 1, 6, 4, 1, 0, 0]
+      ]
+    else
+      expected = [
+        [1, 1, 1, 0, 1, 0, 1],
+        [2, 1, 1, 0, 1, 0, 1],
+        [2, 1, 2, 0, 1, 0, 1],
+        [3, 1, 2, 0, 1, 0, 1],
+        [3, 1, 3, 0, 1, 0, 0],
+        [3, 1, 4, 1, 1, 0, 0],
+        [3, 1, 5, 3, 1, 0, 0],
+        [3, 1, 6, 4, 1, 0, 0]
+      ]
+    end
 
     create_hashes(parameters, expected)
   end

data/test/test-patricia-trie.rb

@@ -124,6 +124,13 @@ class PatriciaTrieTest < Test::Unit::TestCase
     end
   end
 
+  def test_key?
+    users = Groonga::PatriciaTrie.create(:name => "Users")
+    assert_false(users.key?("morita"))
+    users.add("morita")
+    assert_true(users.key?("morita"))
+  end
+
   def test_has_key?
     users = Groonga::PatriciaTrie.create(:name => "Users")
     assert_false(users.has_key?("morita"))

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

@@ -46,6 +46,13 @@ class VariableSizeColumnTest < Test::Unit::TestCase
       @users.define_column("nick_names", "ShortText",
                            :type => :vector,
                            :path => @users_nick_names_column_path.to_s)
+
+    @users_tags_column_path = @columns_dir + "tags"
+    @tags =
+      @users.define_column("tags", "ShortText",
+                           :type => :vector,
+                           :with_weight => true,
+                           :path => @users_tags_column_path.to_s)
   end
 
   def setup_users
@@ -62,10 +69,22 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     assert_predicate(@nick_names, :vector?)
   end
 
+  def test_weigth_vector?
+    assert do
+      @tags.weight_vector?
+    end
+  end
+
   def test_scalar?
     assert_not_predicate(@nick_names, :scalar?)
   end
 
+  def test_data?
+    assert do
+      @nick_names.data?
+    end
+  end
+
   def test_compressed?
     description = @users.define_column("description", "ShortText",
                                        :compress => :zlib)

data/vendor/local/bin/mecab-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/vagrant/dist-x86
+prefix=/build/dist-x86
 exec_prefix=${prefix}
 exec_prefix_set=no
 
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 	;;
 
     --libexecdir)
-       	echo /vagrant/dist-x86/libexec/mecab
+       	echo /build/dist-x86/libexec/mecab
        	;;
 	
     --sysconfdir)

data/vendor/local/bin/onigmo-config

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (C) 2006  K.Kosako (sndgk393 AT ybb DOT ne DOT jp)
 
-ONIGMO_VERSION=6.0.0
+ONIGMO_VERSION=6.1.1
 
 show_usage()
 {
@@ -27,7 +27,7 @@ if test $# -eq 0; then
   show_usage
 fi
 
-prefix=/vagrant/dist-x86
+prefix=/build/dist-x86
 exec_prefix=${prefix}
 is_set_exec_prefix=no
 

data/vendor/local/bin/pcre-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/vagrant/dist-x86
+prefix=/build/dist-x86
 exec_prefix=${prefix}
 exec_prefix_set=no
 

data/vendor/local/etc/groonga/httpd/groonga-httpd.conf

@@ -1,5 +1,5 @@
 worker_processes 1;
-pid /vagrant/dist-x86/var/run/groonga-httpd.pid;
+pid /build/dist-x86/var/run/groonga-httpd.pid;
 
 # Match this to the file owner of Groonga database files if groonga-httpd is
 # run as root.
@@ -23,7 +23,7 @@ http {
   keepalive_timeout 65;
 
   # The default Groonga database path.
-  groonga_database /vagrant/dist-x86/var/lib/groonga/db/db;
+  groonga_database /build/dist-x86/var/lib/groonga/db/db;
 
   # Create a Groonga database automatically if the Groonga database doesn't
   # exist.
@@ -38,6 +38,19 @@ http {
   # for each worker. It can't be set for each Groonga database.
   # groonga_cache_limit 100;
 
+  # The base path where Groonga cache data are stored. If you specify
+  # base path, there are the following merits:
+  #
+  #   * All workers share cache data.
+  #     It means that cache hit rate will be increased.
+  #
+  #   * Cache data aren't cleared after groonga-httpd restart.
+  #     It means that you don't need to warm up cache after
+  #     groonga-httpd restart.
+  #
+  # You must specify base path on memory file system for performance.
+  # groonga_cache_base_path /dev/shm/groonga-httpd-cache;
+
   server {
     listen 10041;
     server_name localhost;
@@ -56,7 +69,7 @@ http {
     }
 
     location / {
-      root /vagrant/dist-x86/share/groonga/html/admin;
+      root /build/dist-x86/share/groonga/html/admin;
       index index.html;
     }
 

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

@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2014-2016 Brazil
+  Copyright(C) 2014-2017 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,7 @@
 
 #include "groonga/accessor.h"
 #include "groonga/array.h"
+#include "groonga/cache.h"
 #include "groonga/column.h"
 #include "groonga/config.h"
 #include "groonga/dat.h"

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

@@ -0,0 +1,49 @@
+/*
+  Copyright(C) 2013-2017 Brazil
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#pragma once
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define GRN_CACHE_DEFAULT_MAX_N_ENTRIES 100
+typedef struct _grn_cache grn_cache;
+
+GRN_API void grn_set_default_cache_base_path(const char *base_path);
+GRN_API const char *grn_get_default_cache_base_path(void);
+
+GRN_API grn_cache *grn_cache_open(grn_ctx *ctx);
+GRN_API grn_cache *grn_persistent_cache_open(grn_ctx *ctx,
+                                             const char *base_path);
+GRN_API grn_rc grn_cache_close(grn_ctx *ctx, grn_cache *cache);
+
+GRN_API grn_rc grn_cache_current_set(grn_ctx *ctx, grn_cache *cache);
+GRN_API grn_cache *grn_cache_current_get(grn_ctx *ctx);
+
+GRN_API grn_rc grn_cache_default_reopen(void);
+
+GRN_API grn_rc grn_cache_set_max_n_entries(grn_ctx *ctx,
+                                           grn_cache *cache,
+                                           unsigned int n);
+GRN_API unsigned int grn_cache_get_max_n_entries(grn_ctx *ctx,
+                                                 grn_cache *cache);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2009-2016 Brazil
+  Copyright(C) 2009-2017 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

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

@@ -275,22 +275,6 @@ GRN_API grn_rc grn_set_default_match_escalation_threshold(long long int threshol
 GRN_API int grn_get_lock_timeout(void);
 GRN_API grn_rc grn_set_lock_timeout(int timeout);
 
-/* cache */
-#define GRN_CACHE_DEFAULT_MAX_N_ENTRIES 100
-typedef struct _grn_cache grn_cache;
-
-GRN_API grn_cache *grn_cache_open(grn_ctx *ctx);
-GRN_API grn_rc grn_cache_close(grn_ctx *ctx, grn_cache *cache);
-
-GRN_API grn_rc grn_cache_current_set(grn_ctx *ctx, grn_cache *cache);
-GRN_API grn_cache *grn_cache_current_get(grn_ctx *ctx);
-
-GRN_API grn_rc grn_cache_set_max_n_entries(grn_ctx *ctx,
-                                           grn_cache *cache,
-                                           unsigned int n);
-GRN_API unsigned int grn_cache_get_max_n_entries(grn_ctx *ctx,
-                                                 grn_cache *cache);
-
 /* grn_encoding */
 
 GRN_API const char *grn_encoding_to_string(grn_encoding encoding);
@@ -1302,6 +1286,10 @@ GRN_API void grn_ctx_recv_handler_set(grn_ctx *,
 #define GRN_TEXT_VALUE(obj) GRN_BULK_HEAD(obj)
 #define GRN_TEXT_LEN(obj) GRN_BULK_VSIZE(obj)
 
+#define GRN_TEXT_EQUAL_CSTRING(bulk, string)\
+  (GRN_TEXT_LEN(bulk) == strlen(string) &&\
+   memcmp(GRN_TEXT_VALUE(bulk), string, GRN_TEXT_LEN(bulk)) == 0)
+
 #define GRN_BOOL_INIT(obj,flags) \
   GRN_VALUE_FIX_SIZE_INIT(obj, flags, GRN_DB_BOOL)
 #define GRN_INT8_INIT(obj,flags) \
@@ -1537,6 +1525,28 @@ GRN_API void grn_ctx_recv_handler_set(grn_ctx *,
   grn_bulk_write((ctx), (obj), (char *)&_val, sizeof(grn_obj *));\
 } while (0)
 
+#define GRN_BULK_POP(obj, value, type, default) do {\
+  if (GRN_BULK_VSIZE(obj) >= sizeof(type)) {\
+    GRN_BULK_INCR_LEN((obj), -(sizeof(type)));\
+    value = *(type *)(GRN_BULK_CURR(obj));\
+  } else {\
+    value = default;\
+  }\
+} while (0)
+#define GRN_BOOL_POP(obj, value) GRN_BULK_POP(obj, value, unsigned char, 0)
+#define GRN_INT8_POP(obj, value) GRN_BULK_POP(obj, value, int8_t, 0)
+#define GRN_UINT8_POP(obj, value) GRN_BULK_POP(obj, value, uint8_t, 0)
+#define GRN_INT16_POP(obj, value) GRN_BULK_POP(obj, value, int16_t, 0)
+#define GRN_UINT16_POP(obj, value) GRN_BULK_POP(obj, value, uint16_t, 0)
+#define GRN_INT32_POP(obj, value) GRN_BULK_POP(obj, value, int32_t, 0)
+#define GRN_UINT32_POP(obj, value) GRN_BULK_POP(obj, value, uint32_t, 0)
+#define GRN_INT64_POP(obj, value) GRN_BULK_POP(obj, value, int64_t, 0)
+#define GRN_UINT64_POP(obj, value) GRN_BULK_POP(obj, value, uint64_t, 0)
+#define GRN_FLOAT_POP(obj, value) GRN_BULK_POP(obj, value, double, 0.0)
+#define GRN_TIME_POP GRN_INT64_POP
+#define GRN_RECORD_POP(obj, value) GRN_BULK_POP(obj, value, grn_id, GRN_ID_NIL)
+#define GRN_PTR_POP(obj, value) GRN_BULK_POP(obj, value, grn_obj *, NULL)
+
 /* grn_str: deprecated. use grn_string instead. */
 
 typedef struct {