rroonga 6.1.3-x64-mingw32 → 7.0.2-x64-mingw32

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-x64
+prefix=/build/dist-x64
 exec_prefix=${prefix}
 exec_prefix_set=no
 
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 	;;
 
     --libexecdir)
-       	echo /vagrant/dist-x64/libexec/mecab
+       	echo /build/dist-x64/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-x64
+prefix=/build/dist-x64
 exec_prefix=${prefix}
 is_set_exec_prefix=no
 

data/vendor/local/bin/pcre-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-prefix=/vagrant/dist-x64
+prefix=/build/dist-x64
 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-x64/var/run/groonga-httpd.pid;
+pid /build/dist-x64/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-x64/var/lib/groonga/db/db;
+  groonga_database /build/dist-x64/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-x64/share/groonga/html/admin;
+      root /build/dist-x64/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 {

data/vendor/local/include/groonga/groonga/ii.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
@@ -27,6 +27,11 @@ extern "C" {
 typedef struct _grn_ii grn_ii;
 typedef struct _grn_ii_buffer grn_ii_buffer;
 
+GRN_API uint32_t grn_ii_get_n_elements(grn_ctx *ctx, grn_ii *ii);
+
+GRN_API void grn_ii_cursor_set_min_enable_set(grn_bool enable);
+GRN_API grn_bool grn_ii_cursor_set_min_enable_get(void);
+
 GRN_API uint32_t grn_ii_estimate_size(grn_ctx *ctx, grn_ii *ii, grn_id tid);
 GRN_API uint32_t grn_ii_estimate_size_for_query(grn_ctx *ctx, grn_ii *ii,
                                                 const char *query,
@@ -56,6 +61,7 @@ typedef struct _grn_ii_cursor grn_ii_cursor;
 GRN_API grn_ii_cursor *grn_ii_cursor_open(grn_ctx *ctx, grn_ii *ii, grn_id tid,
                                           grn_id min, grn_id max, int nelements, int flags);
 GRN_API grn_posting *grn_ii_cursor_next(grn_ctx *ctx, grn_ii_cursor *c);
+GRN_API grn_posting *grn_ii_cursor_next_pos(grn_ctx *ctx, grn_ii_cursor *c);
 GRN_API grn_rc grn_ii_cursor_close(grn_ctx *ctx, grn_ii_cursor *c);
 
 #ifdef __cplusplus

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

@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2015-2016 Brazil
+  Copyright(C) 2015-2017 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -31,9 +31,15 @@ extern "C" {
 GRN_API grn_bool grn_obj_is_true(grn_ctx *ctx, grn_obj *obj);
 
 GRN_API grn_bool grn_obj_is_builtin(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_bulk(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_text_family_bulk(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_table(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_column(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_scalar_column(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_vector_column(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_weight_vector_column(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_reference_column(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_data_column(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_index_column(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_accessor(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_key_accessor(grn_ctx *ctx, grn_obj *obj);
@@ -48,6 +54,7 @@ GRN_API grn_bool grn_obj_is_normalizer_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_token_filter_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_scorer_proc(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_bool grn_obj_is_window_function_proc(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_bool grn_obj_is_expr(grn_ctx *ctx, grn_obj *obj);
 
 GRN_API grn_rc grn_obj_cast(grn_ctx *ctx,
                             grn_obj *src,

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

@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2010-2016 Brazil
+  Copyright(C) 2010-2017 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -176,6 +176,11 @@ GRN_API const char *grn_plugin_proc_get_var_string(grn_ctx *ctx,
                                                    const char *name,
                                                    int name_size,
                                                    size_t *size);
+GRN_API grn_content_type grn_plugin_proc_get_var_content_type(grn_ctx *ctx,
+                                                              grn_user_data *user_data,
+                                                              const char *name,
+                                                              int name_size,
+                                                              grn_content_type default_value);
 
 GRN_API grn_obj *grn_plugin_proc_get_var_by_offset(grn_ctx *ctx,
                                                    grn_user_data *user_data,

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

@@ -222,6 +222,11 @@ GRN_API grn_obj *grn_table_tokenize(grn_ctx *ctx, grn_obj *table,
                                     const char *str, unsigned int str_len,
                                     grn_obj *buf, grn_bool addp);
 
+GRN_API grn_rc grn_table_apply_expr(grn_ctx *ctx,
+                                    grn_obj *table,
+                                    grn_obj *output_column,
+                                    grn_obj *expr);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2010-2016 Brazil
+  Copyright(C) 2010-2017 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,9 @@ extern "C" {
 GRN_API grn_obj *grn_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj);
 GRN_API grn_obj *grn_inspect_indented(grn_ctx *ctx, grn_obj *buffer,
                                       grn_obj *obj, const char *indent);
+GRN_API grn_obj *grn_inspect_limited(grn_ctx *ctx,
+                                     grn_obj *buffer,
+                                     grn_obj *obj);
 GRN_API grn_obj *grn_inspect_name(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj);
 GRN_API grn_obj *grn_inspect_encoding(grn_ctx *ctx, grn_obj *buffer, grn_encoding encoding);
 GRN_API grn_obj *grn_inspect_type(grn_ctx *ctx, grn_obj *buffer, unsigned char type);

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

@@ -38,16 +38,20 @@ GRN_API grn_rc grn_window_set_direction(grn_ctx *ctx,
                                         grn_window_direction direction);
 GRN_API grn_obj *grn_window_get_table(grn_ctx *ctx,
                                       grn_window *window);
+GRN_API grn_bool grn_window_is_sorted(grn_ctx *ctx,
+                                      grn_window *window);
 
 typedef struct _grn_window_definition {
   grn_table_sort_key *sort_keys;
   size_t n_sort_keys;
+  grn_table_sort_key *group_keys;
+  size_t n_group_keys;
 } grn_window_definition;
 
 typedef grn_rc grn_window_function_func(grn_ctx *ctx,
                                         grn_obj *output_column,
                                         grn_window *window,
-                                        grn_obj *args,
+                                        grn_obj **args,
                                         int n_args);
 
 GRN_API grn_obj *grn_window_function_create(grn_ctx *ctx,

data/vendor/local/include/onigmo.h

@@ -5,7 +5,7 @@
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc DOT jp>
+ * Copyright (c) 2011-2017  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,8 +38,8 @@ extern "C" {
 #endif
 
 #define ONIGMO_VERSION_MAJOR   6
-#define ONIGMO_VERSION_MINOR   0
-#define ONIGMO_VERSION_TEENY   0
+#define ONIGMO_VERSION_MINOR   1
+#define ONIGMO_VERSION_TEENY   1
 
 #ifndef ONIG_EXTERN
 # ifdef RUBY_EXTERN
@@ -580,7 +580,8 @@ ONIG_EXTERN const OnigSyntaxType*   OnigDefaultSyntax;
 #define ONIG_SYN_OP2_QMARK_VBAR_BRANCH_RESET    (1U<<28) /* (?|...) */         /* NOTIMPL */
 #define ONIG_SYN_OP2_QMARK_LPAREN_CONDITION     (1U<<29) /* (?(cond)yes...|no...) */
 #define ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP (1U<<30) /* (?P<name>...), (?P=name), (?P>name) -- Python/PCRE */
-#define ONIG_SYN_OP2_OPTION_JAVA                (1U<<31) /* (?idmsux), (?-idmsux) */ /* NOTIMPL */
+#define ONIG_SYN_OP2_QMARK_TILDE_ABSENT         (1U<<31) /* (?~...) */
+/* #define ONIG_SYN_OP2_OPTION_JAVA                (1U<<xx) */ /* (?idmsux), (?-idmsux) */ /* NOTIMPL */
 
 /* syntax (behavior) */
 #define ONIG_SYN_CONTEXT_INDEP_ANCHORS           (1U<<31) /* not implemented */
@@ -824,7 +825,7 @@ int onig_new(OnigRegex*, const OnigUChar* pattern, const OnigUChar* pattern_end,
 ONIG_EXTERN
 int onig_reg_init(OnigRegex reg, OnigOptionType option, OnigCaseFoldType case_fold_flag, OnigEncoding enc, const OnigSyntaxType* syntax);
 ONIG_EXTERN
-int onig_new_without_alloc(OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, OnigSyntaxType* syntax, OnigErrorInfo* einfo);
+int onig_new_without_alloc(OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, const OnigSyntaxType* syntax, OnigErrorInfo* einfo);
 ONIG_EXTERN
 int onig_new_deluxe(OnigRegex* reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo);
 ONIG_EXTERN