rroonga 6.0.5-x64-mingw32 → 6.0.7-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c98624838e48a79cf0ad172314047638414b2a45
-  data.tar.gz: a9402ee25da0a8432ca938e555a31f11ac7e90d7
+  metadata.gz: 0dd827a3adbf099dc3bb135c6d557c7c931a1517
+  data.tar.gz: 6d8cf01d317ddc5a0885b82033a5e583d325dea2
 SHA512:
-  metadata.gz: a834b65556ecbebf50c61c4d82f2e41d36a63d1523be352e3cedb0939dbd87ccd79bb44caf96c06a2315a92745c57453cc14601624c8c15a36da04405b91ff68
-  data.tar.gz: a2fcc9aa091fee92774c0f139b8799b9059ddd72fcfde4285577708c75feb664347b17020cd853abb9ec9b9f7491150b08a4fd162056572dc7ca52a97acedef1
+  metadata.gz: 9b224ef06ab0c2bf780b804209c2e21d7dfea64a11d2ceaa84ece82f1672c18f7a34468a9c9f6b3c29107fd7c0ecfdb761667372b207cd667cbd19172a9e2cc0
+  data.tar.gz: 37eb175a0f367e79bcbf5f9c65f85db436f1063e48c145e61ce395c30da150ad853017288c988907d2543c0693b2e4581623a6234b89a4b8c7bb9f8f342f2441

data/doc/text/news.md

@@ -1,5 +1,20 @@
 # NEWS
 
+## 6.0.7: 2016-08-13 {#version-6-0-7}
+
+### Improvements
+
+  * Supported Groonga 6.0.7. Groonga 6.0.5 or older aren't supported.
+
+  * Improved integration with libraries that uses `at_exit` such as
+    test-unit.
+
+### Fixes
+
+  * {Groonga::FixSizeColumn#inspect}: Fixed wrong flags.
+
+  * {Groonga::VariableSizeColumn#inspect}: Fixed wrong flags.
+
 ## 6.0.5: 2016-07-15 {#version-6-0-5}
 
 ### Improvements

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

@@ -72,13 +72,15 @@ rb_grn_column_bind (RbGrnColumn *rb_column,
                     grn_ctx *context, grn_obj *column)
 {
     RbGrnObject *rb_grn_object;
+    grn_column_flags flags;
     int column_type;
     unsigned char value_type;
 
     rb_grn_object = RB_GRN_OBJECT(rb_column);
     rb_grn_named_object_bind(RB_GRN_NAMED_OBJECT(rb_column), context, column);
 
-    column_type = (column->header.flags & GRN_OBJ_COLUMN_TYPE_MASK);
+    flags = grn_column_get_flags(context, column);
+    column_type = (flags & GRN_OBJ_COLUMN_TYPE_MASK);
     if (column_type == GRN_OBJ_COLUMN_VECTOR) {
         switch (rb_grn_object->range->header.type) {
         case GRN_TABLE_HASH_KEY:
@@ -644,18 +646,20 @@ rb_grn_column_vector_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *column;
+    grn_column_flags flags;
+    grn_column_flags column_type;
 
     rb_grn_column_deconstruct(SELF(self), &column, &context,
                              NULL, NULL,
                              NULL, NULL, NULL);
 
-    if (column->header.type == GRN_COLUMN_VAR_SIZE &&
-        ((column->header.flags & GRN_OBJ_COLUMN_TYPE_MASK) ==
-         GRN_OBJ_COLUMN_VECTOR)) {
-        return Qtrue;
-    } else {
+    if (column->header.type != GRN_COLUMN_VAR_SIZE) {
         return Qfalse;
     }
+
+    flags = grn_column_get_flags(context, column);
+    column_type = (flags & GRN_OBJ_COLUMN_TYPE_MASK);
+    return CBOOL2RVAL(column_type == GRN_OBJ_COLUMN_VECTOR);
 }
 
 /*
@@ -671,22 +675,21 @@ rb_grn_column_scalar_p (VALUE self)
 {
     grn_ctx *context;
     grn_obj *column;
+    grn_column_flags flags;
+    grn_column_flags column_type;
 
     rb_grn_column_deconstruct(SELF(self), &column, &context,
                              NULL, NULL,
                              NULL, NULL, NULL);
 
     switch (column->header.type) {
-      case GRN_COLUMN_FIX_SIZE:
+    case GRN_COLUMN_FIX_SIZE:
         return Qtrue;
-      case GRN_COLUMN_VAR_SIZE:
-        if ((column->header.flags & GRN_OBJ_COLUMN_TYPE_MASK) ==
-            GRN_OBJ_COLUMN_SCALAR) {
-            return Qtrue;
-        } else {
-            return Qfalse;
-        }
-      default:
+    case GRN_COLUMN_VAR_SIZE:
+        flags = grn_column_get_flags(context, column);
+        column_type = (flags & GRN_OBJ_COLUMN_TYPE_MASK);
+        return CBOOL2RVAL(column_type == GRN_OBJ_COLUMN_SCALAR);
+    default:
         return Qfalse;
     }
 }
@@ -701,12 +704,15 @@ static VALUE
 rb_grn_column_with_weight_p(VALUE self)
 {
     grn_obj *column;
+    grn_ctx *context;
+    grn_column_flags flags;
 
-    rb_grn_column_deconstruct(SELF(self), &column, NULL,
+    rb_grn_column_deconstruct(SELF(self), &column, &context,
                               NULL, NULL,
                               NULL, NULL, NULL);
 
-    return CBOOL2RVAL(column->header.flags & GRN_OBJ_WITH_WEIGHT);
+    flags = grn_column_get_flags(context, column);
+    return CBOOL2RVAL(flags & GRN_OBJ_WITH_WEIGHT);
 }
 
 /*

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

@@ -175,29 +175,36 @@ rb_grn_context_unlink_database (grn_ctx *context)
 }
 
 static void
-rb_grn_context_fin (grn_ctx *context)
+rb_grn_context_fin (RbGrnContext *rb_grn_context)
 {
-    if (context->stat == GRN_CTX_FIN)
-        return;
+    grn_ctx *context;
 
-    if (!(context->flags & GRN_CTX_PER_DB)) {
-        rb_grn_context_unlink_database(context);
+    context = rb_grn_context->context;
+
+    debug("context-fin: %p\n", context);
+
+    rb_grn_context_close_floating_objects(rb_grn_context);
+
+    if (context && context->stat != GRN_CTX_FIN && !rb_grn_exited) {
+        if (!(context->flags & GRN_CTX_PER_DB)) {
+            rb_grn_context_unlink_database(context);
+        }
+        grn_ctx_fin(context);
     }
-    grn_ctx_fin(context);
+
+    debug("context-fin: %p: done\n", context);
+
+    rb_grn_context->context = NULL;
 }
 
 static void
 rb_grn_context_free (void *pointer)
 {
     RbGrnContext *rb_grn_context = pointer;
-    grn_ctx *context;
 
-    context = rb_grn_context->context;
-    debug("context-free: %p\n", context);
-    rb_grn_context_close_floating_objects(rb_grn_context);
-    if (context && !rb_grn_exited)
-        rb_grn_context_fin(context);
-    debug("context-free: %p: done\n", context);
+    debug("context-free: %p\n", rb_grn_context);
+    rb_grn_context_fin(rb_grn_context);
+    debug("context-free: %p: done\n", rb_grn_context);
     xfree(rb_grn_context);
 }
 
@@ -248,7 +255,7 @@ rb_grn_context_to_exception (grn_ctx *context, VALUE related_object)
         return Qnil;
 
     exception_class = rb_grn_rc_to_exception(context->rc);
-    message = rb_grn_rc_to_message(context->rc);
+    message = grn_rc_to_string(context->rc);
 
     GRN_OBJ_INIT(&bulk, GRN_BULK, 0, GRN_ID_NIL);
     GRN_TEXT_PUTS(context, &bulk, message);
@@ -482,16 +489,11 @@ rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
 static VALUE
 rb_grn_context_close (VALUE self)
 {
-    int rc;
-    grn_ctx *context;
     RbGrnContext *rb_grn_context;
 
-    context = SELF(self);
-    if (context) {
-        rc = grn_ctx_fin(context);
-        Data_Get_Struct(self, RbGrnContext, rb_grn_context);
-        rb_grn_context->context = NULL;
-        rb_grn_rc_check(rc, self);
+    Data_Get_Struct(self, RbGrnContext, rb_grn_context);
+    if (rb_grn_context->context) {
+        rb_grn_context_fin(rb_grn_context);
     }
 
     return Qnil;

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
-  Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2016  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
@@ -357,260 +357,6 @@ rb_grn_rc_to_exception (grn_rc rc)
     return exception;
 }
 
-const char *
-rb_grn_rc_to_message (grn_rc rc)
-{
-    const char *message = NULL;
-
-    switch (rc) {
-      case GRN_SUCCESS:
-        return NULL;
-        break;
-      case GRN_END_OF_DATA:
-        message = "end of data";
-        break;
-      case GRN_UNKNOWN_ERROR:
-        message = "unknown error";
-        break;
-      case GRN_OPERATION_NOT_PERMITTED:
-        message = "operation not permitted";
-        break;
-      case GRN_NO_SUCH_FILE_OR_DIRECTORY:
-        message = "no such file or directory";
-        break;
-      case GRN_NO_SUCH_PROCESS:
-        message = "no such process";
-        break;
-      case GRN_INTERRUPTED_FUNCTION_CALL:
-        message = "interrupted function call";
-        break;
-      case GRN_INPUT_OUTPUT_ERROR:
-        message = "input output error";
-        break;
-      case GRN_NO_SUCH_DEVICE_OR_ADDRESS:
-        message = "no such device or address";
-        break;
-      case GRN_ARG_LIST_TOO_LONG:
-        message = "argument list too long";
-        break;
-      case GRN_EXEC_FORMAT_ERROR:
-        message = "exec format error";
-        break;
-      case GRN_BAD_FILE_DESCRIPTOR:
-        message = "bad file descriptor";
-        break;
-      case GRN_NO_CHILD_PROCESSES:
-        message = "no child processes";
-        break;
-      case GRN_RESOURCE_TEMPORARILY_UNAVAILABLE:
-        message = "resource temporarily unavailable";
-        break;
-      case GRN_NOT_ENOUGH_SPACE:
-        message = "not enough space";
-        break;
-      case GRN_PERMISSION_DENIED:
-        message = "permission denied";
-        break;
-      case GRN_BAD_ADDRESS:
-        message = "bad address";
-        break;
-      case GRN_RESOURCE_BUSY:
-        message = "resource busy";
-        break;
-      case GRN_FILE_EXISTS:
-        message = "file exists";
-        break;
-      case GRN_IMPROPER_LINK:
-        message = "improper link";
-        break;
-      case GRN_NO_SUCH_DEVICE:
-        message = "no such device";
-        break;
-      case GRN_NOT_A_DIRECTORY:
-        message = "not a directory";
-        break;
-      case GRN_IS_A_DIRECTORY:
-        message = "is a directory";
-        break;
-      case GRN_INVALID_ARGUMENT:
-        message = "invalid argument";
-        break;
-      case GRN_TOO_MANY_OPEN_FILES_IN_SYSTEM:
-        message = "too many open files in system";
-        break;
-      case GRN_TOO_MANY_OPEN_FILES:
-        message = "too many open files";
-        break;
-      case GRN_INAPPROPRIATE_I_O_CONTROL_OPERATION:
-        message = "inappropriate I/O control operation";
-        break;
-      case GRN_FILE_TOO_LARGE:
-        message = "file too large";
-        break;
-      case GRN_NO_SPACE_LEFT_ON_DEVICE:
-        message = "no space left on device";
-        break;
-      case GRN_INVALID_SEEK:
-        message = "invalid seek";
-        break;
-      case GRN_READ_ONLY_FILE_SYSTEM:
-        message = "read only file system";
-        break;
-      case GRN_TOO_MANY_LINKS:
-        message = "too many links";
-        break;
-      case GRN_BROKEN_PIPE:
-        message = "broken pipe";
-        break;
-      case GRN_DOMAIN_ERROR:
-        message = "domain error";
-        break;
-      case GRN_RESULT_TOO_LARGE:
-        message = "result too large";
-        break;
-      case GRN_RESOURCE_DEADLOCK_AVOIDED:
-        message = "resource deadlock avoided";
-        break;
-      case GRN_NO_MEMORY_AVAILABLE:
-        message = "no memory available";
-        break;
-      case GRN_FILENAME_TOO_LONG:
-        message = "filename too long";
-        break;
-      case GRN_NO_LOCKS_AVAILABLE:
-        message = "no locks available";
-        break;
-      case GRN_FUNCTION_NOT_IMPLEMENTED:
-        message = "function not implemented";
-        break;
-      case GRN_DIRECTORY_NOT_EMPTY:
-        message = "directory not empty";
-        break;
-      case GRN_ILLEGAL_BYTE_SEQUENCE:
-        message = "illegal byte sequence";
-        break;
-      case GRN_SOCKET_NOT_INITIALIZED:
-        message = "socket not initialized";
-        break;
-      case GRN_OPERATION_WOULD_BLOCK:
-        message = "operation would block";
-        break;
-      case GRN_ADDRESS_IS_NOT_AVAILABLE:
-        message = "address is not available";
-        break;
-      case GRN_NETWORK_IS_DOWN:
-        message = "network is down";
-        break;
-      case GRN_NO_BUFFER:
-        message = "no buffer";
-        break;
-      case GRN_SOCKET_IS_ALREADY_CONNECTED:
-        message = "socket is already connected";
-        break;
-      case GRN_SOCKET_IS_NOT_CONNECTED:
-        message = "socket is not connected";
-        break;
-      case GRN_SOCKET_IS_ALREADY_SHUTDOWNED:
-        message = "socket is already shutdowned";
-        break;
-      case GRN_OPERATION_TIMEOUT:
-        message = "operation timeout";
-        break;
-      case GRN_CONNECTION_REFUSED:
-        message = "connection refused";
-        break;
-      case GRN_RANGE_ERROR:
-        message = "range error";
-        break;
-      case GRN_TOKENIZER_ERROR:
-        message = "tokenizer error";
-        break;
-      case GRN_FILE_CORRUPT:
-        message = "file corrupt";
-        break;
-      case GRN_INVALID_FORMAT:
-        message = "invalid format";
-        break;
-      case GRN_OBJECT_CORRUPT:
-        message = "object corrupt";
-        break;
-      case GRN_TOO_MANY_SYMBOLIC_LINKS:
-        message = "too many symbolic links";
-        break;
-      case GRN_NOT_SOCKET:
-        message = "not socket";
-        break;
-      case GRN_OPERATION_NOT_SUPPORTED:
-        message = "operation not supported";
-        break;
-      case GRN_ADDRESS_IS_IN_USE:
-        message = "address is in use";
-        break;
-      case GRN_ZLIB_ERROR:
-        message = "ZLib error";
-        break;
-      case GRN_LZ4_ERROR:
-        message = "LZ4 error";
-        break;
-      case GRN_STACK_OVER_FLOW:
-        message = "stack over flow";
-        break;
-      case GRN_SYNTAX_ERROR:
-        message = "syntax error";
-        break;
-      case GRN_RETRY_MAX:
-        message = "retry max";
-        break;
-      case GRN_INCOMPATIBLE_FILE_FORMAT:
-        message = "incompatible file format";
-        break;
-      case GRN_UPDATE_NOT_ALLOWED:
-        message = "update isn't allowed";
-        break;
-      case GRN_TOO_SMALL_OFFSET:
-        message = "too small offset";
-        break;
-      case GRN_TOO_LARGE_OFFSET:
-        message = "too large offset";
-        break;
-      case GRN_TOO_SMALL_LIMIT:
-        message = "too small limit";
-        break;
-      case GRN_CAS_ERROR:
-        message = "CAS error";
-        break;
-      case GRN_UNSUPPORTED_COMMAND_VERSION:
-        message = "unsupported command version";
-        break;
-      case GRN_NORMALIZER_ERROR:
-        message = "normalizer error";
-        break;
-      case GRN_TOKEN_FILTER_ERROR:
-        message = "token filter error";
-        break;
-      case GRN_COMMAND_ERROR:
-        message = "command error";
-        break;
-      case GRN_PLUGIN_ERROR:
-        message = "plugin error";
-        break;
-      case GRN_SCORER_ERROR:
-        message = "scorer error";
-        break;
-      case GRN_CANCEL:
-        message = "cancel";
-        break;
-      case GRN_WINDOW_FUNCTION_ERROR:
-        message = "window function error";
-        break;
-    }
-
-    if (!message)
-        rb_raise(rb_eGrnError, "invalid return code: %d", rc);
-
-    return message;
-}
-
 void
 rb_grn_rc_check (grn_rc rc, VALUE related_object)
 {
@@ -620,7 +366,7 @@ rb_grn_rc_check (grn_rc rc, VALUE related_object)
     exception = rb_grn_rc_to_exception(rc);
     if (NIL_P(exception))
         return;
-    message = rb_grn_rc_to_message(rc);
+    message = grn_rc_to_string(rc);
 
     if (NIL_P(related_object))
         rb_raise(exception, "%s", message);