rroonga 6.0.7-x86-mingw32 → 6.0.9-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cbd36734030a363e2c696cb0341a2649bedc4e3
-  data.tar.gz: 7686c9c2b99e2781bc7a46e6feec24b5ed529e77
+  metadata.gz: 4efbcbc567fa11c35ac52bc6687f10509b1f262a
+  data.tar.gz: 40eacb99daf7d0dbafcba026289daa7523dbad1e
 SHA512:
-  metadata.gz: 36e4929abedd96d8a8fe8ab5add80b68a6137ddd13d26f0269126cbe2dcd140b0ae6088a06c408413e5d98888245b3774b20943376d9312617d66972d930edcd
-  data.tar.gz: b9108068d321d7c4bb2bcbe8672be75640134990c146e939149399a346de897514570c93ac803cd3fa8c8479cefabb1eef17ea13f6394cdfae4ebd2f9ffa5d45
+  metadata.gz: 6d6798ee794374e8412f346b0fafaba04579a29788c0cf6a37615de32eb01208437ad23829d422b584fb6769b200416507e961ca88471aaf54631a0b694eb5e0
+  data.tar.gz: 20890e28a30436b33e5bf486235e7767a693750d5bd4c07afe46a0753da8a6db19ccd5f222e9005ec0639ff131f4f74694ffd4383932e312a976fa0177a3fa6d

data/doc/text/cross-compile.md

@@ -1,14 +1,30 @@
-How to Cross compile Rroonga
-===
+# How to Cross compile Rroonga
 
-# For Debian GNU/Linux like Linux distribution Users
+## For rake-compiler-dock
 
-## apt
+`rake-compiler-dock` depends `docker` and some platform requires docker client such as `docker-machine`.
+Please install `docker` and docker client before cross compiling with `rake-compiler-dock`.
+
+### cross compiling with rake-compiler-dock
+
+execute following rake task:
+
+```bash
+$ bundle exec rake build:windows
+```
+
+Then, `pkg` directory is created. And cross compiled gems move into `pkg` directory.
+
+## Manual procedure for Debian GNU/Linux like Linux distribution Users
+
+This is the manual procedure without rake-compiler-dock.
+
+### apt
 
 * mingw-w64
 * build-essential
 
-## prepare ruby and rubygems
+### prepare ruby and rubygems
 
 ```bash
 $ rbenv install 1.9.3-p547
@@ -21,7 +37,7 @@ $ rbenv install 2.1.3
 $ gem install bundler
 ```
 
-## bundle install
+### bundle install
 
 ```bash
 $ rbenv local 1.9.3-p547
@@ -32,7 +48,7 @@ $ rbenv local 2.1.3
 $ bundle install [--path vendor/bundle]
 ```
 
-## rake-compiler
+### rake-compiler
 
 ```bash
 $ rbenv local 1.9.3-p547
@@ -46,7 +62,7 @@ $ bundle exec rake-compiler cross-ruby HOST=i686-w64-mingw32 VERSION=2.1.3 [EXTS
 $ bundle exec rake-compiler cross-ruby HOST=x86_64-w64-mingw32 VERSION=2.1.3 [EXTS=--without-extensions]
 ```
 
-## cross compile
+### cross compile
 
 ```bash
 $ rbenv local 1.9.3-p547
@@ -55,18 +71,3 @@ $ bundle exec rake RUBY_CC_VERSION=1.9.3:2.0.0:2.1.3 cross clean native gem
 $ bundle exec rake clean:groonga
 $ bundle exec rake RUBY_CC_VERSION=1.9.3:2.0.0:2.1.3 cross RROONGA_USE_GROONGA_X64=true clean native gem
 ```
-
-# For rake-compiler-dock
-
-`rake-compiler-dock` depends `docker` and some platform requires docker client such as `docker-machine`.
-Please install `docker` and docker client before cross compiling with `rake-compiler-dock`.
-
-## cross compiling with rake-compiler-dock
-
-execute following rake task:
-
-```bash
-$ bundle exec rake build:windows
-```
-
-Then, `pkg` directory is created. And cross compiled gems move into `pkg` directory.

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # NEWS
 
+## 6.0.9: 2016-10-07 {#version-6-0-9}
+
+### Improvements
+
+  * Supported Groonga 6.0.9. Groonga 6.0.8 or older aren't supported.
+  * {Groonga::Database#remove_force}: Added a new method that removes
+    broken object.
+  * {Groonga::ID.builtin_type?}: Added a new predicate method that checks
+    whether the given ID is ID for builtin_type object or not.
+
 ## 6.0.7: 2016-08-13 {#version-6-0-7}
 
 ### Improvements

data/ext/groonga/rb-grn-database.c

@@ -705,6 +705,38 @@ rb_grn_database_reindex (VALUE self)
     return Qnil;
 }
 
+/*
+ * Removes a broken object.
+ *
+ * You should use {Groonga::Object#remove} normally.
+ *
+ * @overload remove_force(name)
+ *
+ *   @param [String] name The target object name.
+ *
+ * @since 6.0.9
+ */
+static VALUE
+rb_grn_database_remove_force (VALUE self, VALUE rb_name)
+{
+    grn_rc rc;
+    grn_ctx *context;
+    char *name;
+    int name_size;
+
+    rb_grn_database_deconstruct(SELF(self), NULL, &context,
+                                NULL, NULL, NULL, NULL);
+
+    name = StringValueCStr(rb_name);
+    name_size = RSTRING_LEN(rb_name);
+
+    rc = grn_obj_remove_force(context, name, name_size);
+    rb_grn_context_check(context, self);
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
 void
 rb_grn_init_database (VALUE mGrn)
 {
@@ -740,4 +772,5 @@ rb_grn_init_database (VALUE mGrn)
     rb_define_method(rb_cGrnDatabase, "recover", rb_grn_database_recover, 0);
     rb_define_method(rb_cGrnDatabase, "unmap", rb_grn_database_unmap, 0);
     rb_define_method(rb_cGrnDatabase, "reindex", rb_grn_database_reindex, 0);
+    rb_define_method(rb_cGrnDatabase, "remove_force", rb_grn_database_remove_force, 1);
 }

data/ext/groonga/rb-grn-id.c

@@ -42,6 +42,24 @@ rb_grn_id_s_builtin_p (VALUE self, VALUE rb_id)
     return CBOOL2RVAL(grn_id_is_builtin(ctx, id));
 }
 
+/*
+ * @overload builtin_type?(id)
+ *   @param [Integer] id The ID to be confirmed.
+ *   @return [Boolean] `true` if the `id` is builtin_type, `false` otherwise.
+ *
+ * @since 6.0.9
+ */
+static VALUE
+rb_grn_id_s_builtin_type_p (VALUE self, VALUE rb_id)
+{
+    grn_ctx *ctx = NULL;
+    grn_id id;
+
+    id = NUM2INT(rb_id);
+
+    return CBOOL2RVAL(grn_id_is_builtin_type(ctx, id));
+}
+
 void
 rb_grn_init_id (VALUE mGrn)
 {
@@ -53,4 +71,5 @@ rb_grn_init_id (VALUE mGrn)
     rb_define_const(mGrnID, "MAX", INT2NUM(GRN_ID_MAX));
 
     rb_define_singleton_method(mGrnID, "builtin?", rb_grn_id_s_builtin_p, 1);
+    rb_define_singleton_method(mGrnID, "builtin_type?", rb_grn_id_s_builtin_type_p, 1);
 }

data/ext/groonga/rb-grn-table.c

@@ -583,6 +583,7 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
     grn_ctx *context = NULL;
     grn_obj *table;
     grn_obj *columns;
+    grn_obj *key_type;
     grn_rc rc;
     int n;
     grn_table_cursor *cursor;
@@ -603,8 +604,9 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
         name_size = RSTRING_LEN(rb_name);
     }
 
+    key_type = grn_ctx_at(context, GRN_DB_SHORT_TEXT);
     columns = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_HASH_KEY,
-                               NULL, 0);
+                               key_type, 0);
     rb_grn_context_check(context, self);
     n = grn_table_columns(context, table, name, name_size, columns);
     rb_grn_context_check(context, self);

data/ext/groonga/rb-grn.h

@@ -99,7 +99,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 6
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 7
+#define RB_GRN_MICRO_VERSION 9
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/rroonga-build.rb

@@ -18,15 +18,15 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 6
     MINOR = 0
-    MICRO = 7
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2016, 7, 29)
+    RELEASED_DATE = Time.utc(2016, 9, 29)
   end
 
   module LatestGroongaVersion
     MAJOR = 6
     MINOR = 0
-    MICRO = 7
+    MICRO = 9
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-database.rb

@@ -276,6 +276,27 @@ class DatabaseTest < Test::Unit::TestCase
                  terms.collect(&:_key).sort)
   end
 
+  def test_remove_force
+    setup_database
+    table_name = "Bookmarks"
+    table = Groonga::Array.create(:name => table_name)
+    table_path = Pathname.new(table.path)
+    @database.unmap
+    table_path.open("w") do |file|
+      file.print("BROKEN")
+    end
+    assert_raise(Groonga::IncompatibleFileFormat) do
+      context[table_name]
+    end
+    assert do
+      table_path.exist?
+    end
+    @database.remove_force(table_name)
+    assert do
+      not table_path.exist?
+    end
+  end
+
   class RemoveTest < self
     setup :setup_database
 
@@ -377,7 +398,6 @@ class DatabaseTest < Test::Unit::TestCase
     end
 
     def test_dirty?
-      omit("TODO: Enable this after Groonga 6.0.6 is released.")
       assert do
         not @database.dirty?
       end

data/test/test-id.rb

@@ -44,4 +44,20 @@ class IDTest < Test::Unit::TestCase
       end
     end
   end
+
+  sub_test_case(".builtin_type?") do
+    test "true" do
+      assert do
+        Groonga::ID.builtin_type?(Groonga::Type::INT32)
+      end
+    end
+
+    test "false" do
+      token_bigram_id = Groonga["TokenBigram"].id
+
+      assert do
+        not Groonga::ID.builtin_type?(token_bigram_id)
+      end
+    end
+  end
 end

data/vendor/local/bin/pcre-config

@@ -0,0 +1,133 @@
+#!/bin/sh
+
+prefix=/vagrant/dist-x86
+exec_prefix=${prefix}
+exec_prefix_set=no
+
+cflags="[--cflags]"
+
+if test yes = yes ; then
+  libs="[--libs-cpp]"
+else
+  libs=
+fi
+
+if test no = yes ; then
+  libs="[--libs16] $libs"
+fi
+
+if test no = yes ; then
+  libs="[--libs32] $libs"
+fi
+
+if test yes = yes ; then
+  libs="[--libs] [--libs-posix] $libs"
+  cflags="$cflags [--cflags-posix]"
+fi
+
+usage="Usage: pcre-config [--prefix] [--exec-prefix] [--version] $libs $cflags"
+
+if test $# -eq 0; then
+      echo "${usage}" 1>&2
+      exit 1
+fi
+
+libR=
+case `uname -s` in
+  *SunOS*)
+  libR=" -R${exec_prefix}/lib"
+  ;;
+  *BSD*)
+  libR=" -Wl,-R${exec_prefix}/lib"
+  ;;
+esac
+
+libS=
+if test ${exec_prefix}/lib != /usr/lib ; then
+  libS=-L${exec_prefix}/lib
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      if test $exec_prefix_set = no ; then
+        exec_prefix=$optarg
+      fi
+      ;;
+    --prefix)
+      echo $prefix
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo $exec_prefix
+      ;;
+    --version)
+      echo 8.39
+      ;;
+    --cflags)
+      if test ${prefix}/include != /usr/include ; then
+        includes=-I${prefix}/include
+      fi
+      echo $includes 
+      ;;
+    --cflags-posix)
+      if test yes = yes ; then
+        if test ${prefix}/include != /usr/include ; then
+          includes=-I${prefix}/include
+        fi
+        echo $includes 
+      else
+        echo "${usage}" 1>&2
+      fi
+      ;;
+    --libs-posix)
+      if test yes = yes ; then
+        echo $libS$libR -lpcreposix -lpcre
+      else
+        echo "${usage}" 1>&2
+      fi
+      ;;
+    --libs)
+      if test yes = yes ; then
+        echo $libS$libR -lpcre
+      else
+        echo "${usage}" 1>&2
+      fi
+      ;;
+    --libs16)
+      if test no = yes ; then
+        echo $libS$libR -lpcre16
+      else
+        echo "${usage}" 1>&2
+      fi
+      ;;
+    --libs32)
+      if test no = yes ; then
+        echo $libS$libR -lpcre32
+      else
+        echo "${usage}" 1>&2
+      fi
+      ;;
+    --libs-cpp)
+      if test yes = yes ; then
+        echo $libS$libR -lpcrecpp -lpcre
+      else
+        echo "${usage}" 1>&2
+      fi
+      ;;
+    *)
+      echo "${usage}" 1>&2
+      exit 1
+      ;;
+  esac
+  shift
+done

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

@@ -41,6 +41,28 @@ GRN_API grn_rc grn_db_unmap(grn_ctx *ctx, grn_obj *db);
 GRN_API uint32_t grn_db_get_last_modified(grn_ctx *ctx, grn_obj *db);
 GRN_API grn_bool grn_db_is_dirty(grn_ctx *ctx, grn_obj *db);
 
+#define GRN_DB_EACH_BEGIN_FLAGS(ctx, cursor, id, flags)                 \
+  GRN_TABLE_EACH_BEGIN_FLAGS(ctx,                                       \
+                             grn_ctx_db((ctx)),                         \
+                             cursor,                                    \
+                             id,                                        \
+                             flags)
+
+#define GRN_DB_EACH_BEGIN_BY_ID(ctx, cursor, id)                        \
+  GRN_DB_EACH_BEGIN_FLAGS(ctx,                                          \
+                          cursor,                                       \
+                          id,                                           \
+                          GRN_CURSOR_BY_ID | GRN_CURSOR_ASCENDING)
+
+#define GRN_DB_EACH_BEGIN_BY_KEY(ctx, cursor, id)                       \
+  GRN_DB_EACH_BEGIN_FLAGS(ctx,                                          \
+                          cursor,                                       \
+                          id,                                           \
+                          GRN_CURSOR_BY_KEY | GRN_CURSOR_ASCENDING)
+
+#define GRN_DB_EACH_END(ctx, cursor)            \
+  GRN_TABLE_EACH_END(ctx, cursor)
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -247,6 +247,10 @@ GRN_API grn_ctx *grn_ctx_open(int flags);
 GRN_API grn_rc grn_ctx_close(grn_ctx *ctx);
 GRN_API grn_rc grn_ctx_set_finalizer(grn_ctx *ctx, grn_proc_func *func);
 
+GRN_API grn_rc grn_ctx_push_temporary_open_space(grn_ctx *ctx);
+GRN_API grn_rc grn_ctx_pop_temporary_open_space(grn_ctx *ctx);
+GRN_API grn_rc grn_ctx_merge_temporary_open_space(grn_ctx *ctx);
+
 GRN_API grn_encoding grn_get_default_encoding(void);
 GRN_API grn_rc grn_set_default_encoding(grn_encoding encoding);
 
@@ -360,7 +364,8 @@ typedef uint32_t grn_column_flags;
 
 /* flags only for grn_column_flags */
 
-#define GRN_OBJ_INDEX_TINY             (0x01<<16)
+#define GRN_OBJ_INDEX_SMALL            (0x01<<16)
+#define GRN_OBJ_INDEX_MEDIUM           (0x01<<17)
 
 /* obj types */
 
@@ -737,6 +742,9 @@ GRN_API int grn_obj_get_values(grn_ctx *ctx, grn_obj *obj, grn_id offset, void *
 GRN_API grn_rc grn_obj_set_value(grn_ctx *ctx, grn_obj *obj, grn_id id, grn_obj *value, int flags);
 GRN_API grn_rc grn_obj_remove(grn_ctx *ctx, grn_obj *obj);
 GRN_API grn_rc grn_obj_remove_dependent(grn_ctx *ctx, grn_obj *obj);
+GRN_API grn_rc grn_obj_remove_force(grn_ctx *ctx,
+                                    const char *name,
+                                    int name_size);
 GRN_API grn_rc grn_obj_rename(grn_ctx *ctx, grn_obj *obj,
                               const char *name, unsigned int name_size);
 GRN_API grn_rc grn_table_rename(grn_ctx *ctx, grn_obj *table,
@@ -814,6 +822,11 @@ typedef grn_rc grn_selector_func(grn_ctx *ctx, grn_obj *table, grn_obj *index,
 
 GRN_API grn_rc grn_proc_set_selector(grn_ctx *ctx, grn_obj *proc,
                                      grn_selector_func selector);
+GRN_API grn_rc grn_proc_set_selector_operator(grn_ctx *ctx,
+                                              grn_obj *proc,
+                                              grn_operator selector_op);
+GRN_API grn_operator grn_proc_get_selector_operator(grn_ctx *ctx,
+                                                    grn_obj *proc);
 
 /*-------------------------------------------------------------
  * grn_vector
@@ -1137,6 +1150,13 @@ GRN_API off_t grn_default_query_logger_get_rotate_threshold_size(void);
     }\
   }\
 } while (0)
+#define GRN_BULK_INCR_LEN(bulk,len) do {\
+  if (GRN_BULK_OUTP(bulk)) {\
+    (bulk)->u.b.curr += (len);\
+  } else {\
+    (bulk)->header.flags += (grn_obj_flags)(len);\
+  }\
+} while (0)
 #define GRN_BULK_WSIZE(bulk) \
   (GRN_BULK_OUTP(bulk)\
    ? ((bulk)->u.b.tail - (bulk)->u.b.head)\

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

@@ -24,6 +24,7 @@ extern "C" {
 #endif
 
 GRN_API grn_bool grn_id_is_builtin(grn_ctx *ctx, grn_id id);
+GRN_API grn_bool grn_id_is_builtin_type(grn_ctx *ctx, grn_id id);
 
 #ifdef __cplusplus
 }