rroonga 6.0.2-x86-mingw32 → 6.0.4-x86-mingw32

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

@@ -0,0 +1,216 @@
+/*
+  Copyright(C) 2009-2016 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_TABLE_MAX_KEY_SIZE         (0x1000)
+
+GRN_API grn_obj *grn_table_create(grn_ctx *ctx,
+                                  const char *name, unsigned int name_size,
+                                  const char *path, grn_table_flags flags,
+                                  grn_obj *key_type, grn_obj *value_type);
+
+#define GRN_TABLE_OPEN_OR_CREATE(ctx,name,name_size,path,flags,key_type,value_type,table) \
+  (((table) = grn_ctx_get((ctx), (name), (name_size))) ||\
+   ((table) = grn_table_create((ctx), (name), (name_size), (path), (flags), (key_type), (value_type))))
+
+/* TODO: int *added -> grn_bool *added */
+GRN_API grn_id grn_table_add(grn_ctx *ctx, grn_obj *table,
+                             const void *key, unsigned int key_size, int *added);
+GRN_API grn_id grn_table_get(grn_ctx *ctx, grn_obj *table,
+                             const void *key, unsigned int key_size);
+GRN_API grn_id grn_table_at(grn_ctx *ctx, grn_obj *table, grn_id id);
+GRN_API grn_id grn_table_lcp_search(grn_ctx *ctx, grn_obj *table,
+                                    const void *key, unsigned int key_size);
+GRN_API int grn_table_get_key(grn_ctx *ctx, grn_obj *table,
+                              grn_id id, void *keybuf, int buf_size);
+GRN_API grn_rc grn_table_delete(grn_ctx *ctx, grn_obj *table,
+                                const void *key, unsigned int key_size);
+GRN_API grn_rc grn_table_delete_by_id(grn_ctx *ctx, grn_obj *table, grn_id id);
+GRN_API grn_rc grn_table_update_by_id(grn_ctx *ctx, grn_obj *table, grn_id id,
+                                      const void *dest_key, unsigned int dest_key_size);
+GRN_API grn_rc grn_table_update(grn_ctx *ctx, grn_obj *table,
+                                const void *src_key, unsigned int src_key_size,
+                                const void *dest_key, unsigned int dest_key_size);
+GRN_API grn_rc grn_table_truncate(grn_ctx *ctx, grn_obj *table);
+
+#define GRN_CURSOR_ASCENDING           (0x00<<0)
+#define GRN_CURSOR_DESCENDING          (0x01<<0)
+#define GRN_CURSOR_GE                  (0x00<<1)
+#define GRN_CURSOR_GT                  (0x01<<1)
+#define GRN_CURSOR_LE                  (0x00<<2)
+#define GRN_CURSOR_LT                  (0x01<<2)
+#define GRN_CURSOR_BY_KEY              (0x00<<3)
+#define GRN_CURSOR_BY_ID               (0x01<<3)
+#define GRN_CURSOR_PREFIX              (0x01<<4)
+#define GRN_CURSOR_SIZE_BY_BIT         (0x01<<5)
+#define GRN_CURSOR_RK                  (0x01<<6)
+
+GRN_API grn_table_cursor *grn_table_cursor_open(grn_ctx *ctx, grn_obj *table,
+                                                const void *min, unsigned int min_size,
+                                                const void *max, unsigned int max_size,
+                                                int offset, int limit, int flags);
+GRN_API grn_rc grn_table_cursor_close(grn_ctx *ctx, grn_table_cursor *tc);
+GRN_API grn_id grn_table_cursor_next(grn_ctx *ctx, grn_table_cursor *tc);
+GRN_API int grn_table_cursor_get_key(grn_ctx *ctx, grn_table_cursor *tc, void **key);
+GRN_API int grn_table_cursor_get_value(grn_ctx *ctx, grn_table_cursor *tc, void **value);
+GRN_API grn_rc grn_table_cursor_set_value(grn_ctx *ctx, grn_table_cursor *tc,
+                                          const void *value, int flags);
+GRN_API grn_rc grn_table_cursor_delete(grn_ctx *ctx, grn_table_cursor *tc);
+GRN_API grn_obj *grn_table_cursor_table(grn_ctx *ctx, grn_table_cursor *tc);
+
+GRN_API grn_obj *grn_index_cursor_open(grn_ctx *ctx, grn_table_cursor *tc, grn_obj *index,
+                                       grn_id rid_min, grn_id rid_max, int flags);
+GRN_API grn_posting *grn_index_cursor_next(grn_ctx *ctx, grn_obj *ic, grn_id *tid);
+
+#define GRN_TABLE_EACH(ctx,table,head,tail,id,key,key_size,value,block) do {\
+  (ctx)->errlvl = GRN_LOG_NOTICE;\
+  (ctx)->rc = GRN_SUCCESS;\
+  if ((ctx)->seqno & 1) {\
+    (ctx)->subno++;\
+  } else {\
+    (ctx)->seqno++;\
+  }\
+  if (table) {\
+    switch ((table)->header.type) {\
+    case GRN_TABLE_PAT_KEY :\
+      GRN_PAT_EACH((ctx), (grn_pat *)(table), (id), (key), (key_size), (value), block);\
+      break;\
+    case GRN_TABLE_DAT_KEY :\
+      GRN_DAT_EACH((ctx), (grn_dat *)(table), (id), (key), (key_size), block);\
+      break;\
+    case GRN_TABLE_HASH_KEY :\
+      GRN_HASH_EACH((ctx), (grn_hash *)(table), (id), (key), (key_size), (value), block);\
+      break;\
+    case GRN_TABLE_NO_KEY :\
+      GRN_ARRAY_EACH((ctx), (grn_array *)(table), (head), (tail), (id), (value), block);\
+      break;\
+    }\
+  }\
+  if ((ctx)->subno) {\
+    (ctx)->subno--;\
+  } else {\
+    (ctx)->seqno++;\
+  }\
+} while (0)
+
+#define GRN_TABLE_EACH_BEGIN(ctx, table, cursor, id) do {\
+  if (table) {\
+    grn_table_cursor *cursor;\
+    cursor = grn_table_cursor_open((ctx), (table),\
+                                   NULL, 0,\
+                                   NULL, 0,\
+                                   0, -1, GRN_CURSOR_ASCENDING);\
+    if (cursor) {\
+      grn_id id;\
+      while ((id = grn_table_cursor_next((ctx), cursor))) {
+
+#define GRN_TABLE_EACH_END(ctx, cursor)\
+      }\
+      grn_table_cursor_close((ctx), cursor);\
+    }\
+  }\
+} while (0)
+
+typedef struct _grn_table_sort_key grn_table_sort_key;
+typedef unsigned char grn_table_sort_flags;
+
+#define GRN_TABLE_SORT_ASC             (0x00<<0)
+#define GRN_TABLE_SORT_DESC            (0x01<<0)
+
+struct _grn_table_sort_key {
+  grn_obj *key;
+  grn_table_sort_flags flags;
+  int offset;
+};
+
+GRN_API int grn_table_sort(grn_ctx *ctx, grn_obj *table, int offset, int limit,
+                           grn_obj *result, grn_table_sort_key *keys, int n_keys);
+
+typedef struct _grn_table_group_result grn_table_group_result;
+typedef uint32_t grn_table_group_flags;
+
+#define GRN_TABLE_GROUP_CALC_COUNT     (0x01<<3)
+#define GRN_TABLE_GROUP_CALC_MAX       (0x01<<4)
+#define GRN_TABLE_GROUP_CALC_MIN       (0x01<<5)
+#define GRN_TABLE_GROUP_CALC_SUM       (0x01<<6)
+#define GRN_TABLE_GROUP_CALC_AVG       (0x01<<7)
+
+struct _grn_table_group_result {
+  grn_obj *table;
+  unsigned char key_begin;
+  unsigned char key_end;
+  int limit;
+  grn_table_group_flags flags;
+  grn_operator op;
+  unsigned int max_n_subrecs;
+  grn_obj *calc_target;
+};
+
+GRN_API grn_rc grn_table_group(grn_ctx *ctx, grn_obj *table,
+                               grn_table_sort_key *keys, int n_keys,
+                               grn_table_group_result *results, int n_results);
+GRN_API grn_rc grn_table_setoperation(grn_ctx *ctx, grn_obj *table1, grn_obj *table2,
+                                      grn_obj *res, grn_operator op);
+GRN_API grn_rc grn_table_difference(grn_ctx *ctx, grn_obj *table1, grn_obj *table2,
+                                    grn_obj *res1, grn_obj *res2);
+GRN_API int grn_table_columns(grn_ctx *ctx, grn_obj *table,
+                              const char *name, unsigned int name_size,
+                              grn_obj *res);
+
+GRN_API unsigned int grn_table_size(grn_ctx *ctx, grn_obj *table);
+
+GRN_API grn_rc grn_table_rename(grn_ctx *ctx, grn_obj *table,
+                                const char *name, unsigned int name_size);
+
+GRN_API grn_obj *grn_table_select(grn_ctx *ctx, grn_obj *table, grn_obj *expr,
+                                  grn_obj *res, grn_operator op);
+
+GRN_API grn_table_sort_key *grn_table_sort_key_from_str(grn_ctx *ctx,
+                                                        const char *str, unsigned int str_size,
+                                                        grn_obj *table, unsigned int *nkeys);
+GRN_API grn_rc grn_table_sort_key_close(grn_ctx *ctx,
+                                        grn_table_sort_key *keys, unsigned int nkeys);
+
+GRN_API grn_bool grn_table_is_grouped(grn_ctx *ctx, grn_obj *table);
+
+GRN_API unsigned int grn_table_max_n_subrecs(grn_ctx *ctx, grn_obj *table);
+
+GRN_API grn_obj *grn_table_create_for_group(grn_ctx *ctx,
+                                            const char *name,
+                                            unsigned int name_size,
+                                            const char *path,
+                                            grn_obj *group_key,
+                                            grn_obj *value_type,
+                                            unsigned int max_n_subrecs);
+
+GRN_API unsigned int grn_table_get_subrecs(grn_ctx *ctx, grn_obj *table,
+                                           grn_id id, grn_id *subrecbuf,
+                                           int *scorebuf, int buf_size);
+
+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);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -0,0 +1,47 @@
+/*
+  Copyright(C) 2016 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
+
+#include <time.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define GRN_TIME_USEC_PER_SEC 1000000
+#define GRN_TIME_PACK(sec, usec) ((int64_t)(sec) * GRN_TIME_USEC_PER_SEC + (usec))
+#define GRN_TIME_UNPACK(time_value, sec, usec) do {\
+  sec = (time_value) / GRN_TIME_USEC_PER_SEC;\
+  usec = (time_value) % GRN_TIME_USEC_PER_SEC;\
+} while (0)
+
+GRN_API void grn_time_now(grn_ctx *ctx, grn_obj *obj);
+
+#define GRN_TIME_NOW(ctx,obj) (grn_time_now((ctx), (obj)))
+
+GRN_API grn_bool grn_time_to_tm(grn_ctx *ctx,
+                                int64_t time,
+                                struct tm *tm);
+GRN_API grn_bool grn_time_from_tm(grn_ctx *ctx,
+                                  int64_t *time,
+                                  struct tm *tm);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -0,0 +1,67 @@
+/*
+  Copyright(C) 2016 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
+
+typedef enum {
+  GRN_WINDOW_DIRECTION_ASCENDING,
+  GRN_WINDOW_DIRECTION_DESCENDING
+} grn_window_direction;
+
+typedef struct _grn_window grn_window;
+
+GRN_API grn_id grn_window_next(grn_ctx *ctx,
+                               grn_window *window);
+GRN_API grn_rc grn_window_rewind(grn_ctx *ctx,
+                                 grn_window *window);
+GRN_API grn_rc grn_window_set_direction(grn_ctx *ctx,
+                                        grn_window *window,
+                                        grn_window_direction direction);
+GRN_API grn_obj *grn_window_get_table(grn_ctx *ctx,
+                                      grn_window *window);
+
+typedef struct _grn_window_definition {
+  grn_table_sort_key *sort_keys;
+  size_t n_sort_keys;
+} grn_window_definition;
+
+typedef grn_rc grn_window_function_func(grn_ctx *ctx,
+                                        grn_obj *output_column,
+                                        grn_window *window,
+                                        grn_obj *args,
+                                        int n_args);
+
+GRN_API grn_obj *grn_window_function_create(grn_ctx *ctx,
+                                            const char *name,
+                                            int name_size,
+                                            grn_window_function_func func);
+
+
+GRN_API grn_rc grn_table_apply_window_function(grn_ctx *ctx,
+                                               grn_obj *table,
+                                               grn_obj *output_column,
+                                               grn_window_definition *definition,
+                                               grn_obj *window_function_call);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -24,6 +24,7 @@
 #include "groonga/array.h"
 #include "groonga/config.h"
 #include "groonga/dat.h"
+#include "groonga/db.h"
 #include "groonga/dump.h"
 #include "groonga/expr.h"
 #include "groonga/file_reader.h"
@@ -31,12 +32,16 @@
 #include "groonga/hash.h"
 #include "groonga/ii.h"
 #include "groonga/obj.h"
+#include "groonga/operator.h"
 #include "groonga/output.h"
 #include "groonga/pat.h"
 #include "groonga/request_canceler.h"
 #include "groonga/request_timer.h"
+#include "groonga/table.h"
 #include "groonga/thread.h"
+#include "groonga/time.h"
 #include "groonga/type.h"
 #include "groonga/util.h"
+#include "groonga/window_function.h"
 #include "groonga/windows.h"
 #include "groonga/windows_event_logger.h"

data/vendor/local/lib/groonga/plugins/functions/number.la

@@ -0,0 +1,41 @@
+# number.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-0.1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='number.dll'
+
+# Names of this library.
+library_names='number.dll.a'
+
+# The name of the static archive.
+old_library='number.a'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la /vagrant/dist-x86/lib/libmsgpack.la /vagrant/dist-x86/lib/libonig.la -lpthread -llz4 -lz -lws2_32'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for number.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/vagrant/dist-x86/lib/groonga/plugins/functions'

data/vendor/local/lib/groonga/plugins/functions/time.la

@@ -0,0 +1,41 @@
+# time.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-0.1
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='time.dll'
+
+# Names of this library.
+library_names='time.dll.a'
+
+# The name of the static archive.
+old_library='time.a'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la /vagrant/dist-x86/lib/libmsgpack.la /vagrant/dist-x86/lib/libonig.la -lpthread -llz4 -lz -lws2_32'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for time.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/vagrant/dist-x86/lib/groonga/plugins/functions'

data/vendor/local/lib/groonga/scripts/ruby/command_line/grndb.rb

@@ -101,14 +101,6 @@ module Groonga
       end
 
       def check(database, options, arguments)
-        if database.locked?
-          message =
-            "Database is locked. " +
-            "It may be broken. " +
-            "Re-create the database."
-          failed(message)
-        end
-
         checker = Checker.new
         checker.program_path = @program_path
         checker.database_path = @database_path
@@ -117,6 +109,8 @@ module Groonga
           failed(message)
         end
 
+        checker.check_database
+
         target_name = options[:target]
         if target_name
           checker.check_one(target_name)
@@ -136,6 +130,11 @@ module Groonga
           @checked = {}
         end
 
+        def check_database
+          check_database_locked
+          check_database_dirty
+        end
+
         def check_one(target_name)
           target = @context[target_name]
           if target.nil?
@@ -158,11 +157,10 @@ module Groonga
 
         def check_all
           open_database_cursor do |cursor|
-            context = Context.instance
             cursor.each do |id|
               next if ID.builtin?(id)
               next if builtin_object_name?(cursor.key)
-              next if context[id]
+              next if @context[id]
               failed_to_open(cursor.key)
             end
           end
@@ -173,6 +171,39 @@ module Groonga
         end
 
         private
+        def check_database_locked
+          return unless @database.locked?
+
+          message =
+            "Database is locked. " +
+            "It may be broken. " +
+            "Re-create the database."
+          failed(message)
+        end
+
+        def check_database_dirty
+          return unless @database.dirty?
+
+          last_modified = @database.last_modified
+          if File.stat(@database.path).mtime > last_modified
+            return
+          end
+
+          open_database_cursor do |cursor|
+            cursor.each do |id|
+              next if ID.builtin?(id)
+              path = "%s.%07x" % [@database.path, id]
+              return if File.stat(path).mtime > last_modified
+            end
+          end
+
+          message =
+            "Database wasn't closed successfully. " +
+            "It may be broken. " +
+            "Re-create the database."
+          failed(message)
+        end
+
         def check_object(object)
           return if @checked.key?(object.id)
           @checked[object.id] = true

data/vendor/local/lib/groonga/scripts/ruby/context/rc.rb

@@ -186,6 +186,8 @@ module Groonga
         register(:scorer_error, -76, ScorerError)
       CANCEL =
         register(:cancel, -77, Cancel)
+      WINDOW_FUNCTION_ERROR =
+        register(:window_function_error, -78, WindowFunctionError)
 
       GroongaError.rc = UNKNOWN_ERROR
     end

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=6.0.2
+groonga_version=6.0.4
 
 Name: Groonga
 Description: An Embeddable Fulltext Search Engine
-Version: 6.0.2
+Version: 6.0.4
 Libs: -L${libdir} -lgroonga
 Cflags: -I${includedir}/groonga