rroonga 6.0.5-x86-mingw32 → 6.0.7-x86-mingw32

data/ext/groonga/rb-groonga.c

@@ -21,13 +21,14 @@
 
 grn_bool rb_grn_exited = GRN_FALSE;
 
-static void
+static VALUE
 finish_groonga (VALUE data)
 {
     debug("finish\n");
     grn_fin();
     rb_grn_exited = GRN_TRUE;
     debug("finish: done\n");
+    return Qnil;
 }
 
 /*
@@ -212,7 +213,7 @@ Init_groonga (void)
     rb_grn_init_exception(mGrn);
 
     rb_grn_rc_check(grn_init(), Qnil);
-    rb_set_end_proc(finish_groonga, Qnil);
+    rb_define_finalizer(mGrn, rb_proc_new(finish_groonga, Qnil));
 
     rb_grn_init_version(mGrn);
     rb_grn_init_lock_timeout(mGrn);

data/rroonga-build.rb

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

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

@@ -139,7 +139,7 @@ class FixSizeColumnTest < Test::Unit::TestCase
                    "path: <#{@n_viewed_column_path}>, " +
                    "domain: <Bookmarks>, " +
                    "range: <Int32>, " +
-                   "flags: <KEY_INT>" +
+                   "flags: <>" +
                    ">",
                    @n_viewed.inspect)
     end

data/test/test-schema.rb

@@ -371,7 +371,7 @@ class SchemaTest < Test::Unit::TestCase
                    "path: <#{path}>, " +
                    "domain: <Posts>, " +
                    "range: <Niku>, " +
-                   "flags: <KEY_VAR_SIZE|COMPRESS_LZ4>>",
+                   "flags: <COLUMN_VECTOR|COMPRESS_LZ4>>",
                    column.inspect)
     end
   end

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

@@ -103,7 +103,7 @@ class VariableSizeColumnTest < Test::Unit::TestCase
                  "path: <#{@users_name_column_path}>, " +
                  "domain: <Users>, " +
                  "range: <ShortText>, " +
-                 "flags: <KEY_VAR_SIZE>" +
+                 "flags: <>" +
                  ">",
                  @name.inspect)
   end

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

@@ -22,10 +22,12 @@
 #include "groonga/groonga.h"
 
 #include "groonga/array.h"
+#include "groonga/column.h"
 #include "groonga/config.h"
 #include "groonga/dat.h"
 #include "groonga/db.h"
 #include "groonga/dump.h"
+#include "groonga/error.h"
 #include "groonga/expr.h"
 #include "groonga/file_reader.h"
 #include "groonga/geo.h"

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

@@ -0,0 +1,29 @@
+/*
+  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
+
+GRN_API grn_column_flags grn_column_get_flags(grn_ctx *ctx, grn_obj *column);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -26,7 +26,7 @@ GRN_API grn_rc grn_dump_table_create_flags(grn_ctx *ctx,
                                            grn_table_flags flags,
                                            grn_obj *buffer);
 GRN_API grn_rc grn_dump_column_create_flags(grn_ctx *ctx,
-                                            grn_obj_flags flags,
+                                            grn_column_flags flags,
                                             grn_obj *buffer);
 
 #ifdef __cplusplus

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

@@ -0,0 +1,29 @@
+/*
+  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
+
+GRN_API const char *grn_rc_to_string(grn_rc rc);
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -295,6 +295,7 @@ GRN_API grn_encoding grn_encoding_parse(const char *name);
 
 typedef uint16_t grn_obj_flags;
 typedef uint32_t grn_table_flags;
+typedef uint32_t grn_column_flags;
 
 /* flags for grn_obj_flags and grn_table_flags */
 
@@ -357,6 +358,10 @@ typedef uint32_t grn_table_flags;
 
 #define GRN_OBJ_KEY_LARGE              (0x01<<16)
 
+/* flags only for grn_column_flags */
+
+#define GRN_OBJ_INDEX_TINY             (0x01<<16)
+
 /* obj types */
 
 #define GRN_VOID                       (0x00)
@@ -644,7 +649,7 @@ GRN_API grn_obj *grn_obj_column(grn_ctx *ctx, grn_obj *table,
 
 GRN_API grn_obj *grn_column_create(grn_ctx *ctx, grn_obj *table,
                                    const char *name, unsigned int name_size,
-                                   const char *path, grn_obj_flags flags, grn_obj *type);
+                                   const char *path, grn_column_flags flags, grn_obj *type);
 
 #define GRN_COLUMN_OPEN_OR_CREATE(ctx,table,name,name_size,path,flags,type,column) \
   (((column) = grn_obj_column((ctx), (table), (name), (name_size))) ||\

data/vendor/local/include/msgpack/adaptor/adaptor_base.hpp

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2015 KONDO Takatoshi
+// Copyright (C) 2015-2016 KONDO Takatoshi
 //
 //    Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,75 +10,9 @@
 #ifndef MSGPACK_ADAPTOR_BASE_HPP
 #define MSGPACK_ADAPTOR_BASE_HPP
 
-#include "msgpack/object_fwd.hpp"
-
-namespace msgpack {
-
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-template <typename Stream>
-class packer;
-
-namespace adaptor {
-
-// Adaptor functors
-
-template <typename T, typename Enabler = void>
-struct convert {
-    msgpack::object const& operator()(msgpack::object const& o, T& v) const;
-};
-
-template <typename T, typename Enabler = void>
-struct pack {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, T const& v) const;
-};
-
-template <typename T, typename Enabler = void>
-struct object {
-    void operator()(msgpack::object& o, T const& v) const;
-};
-
-template <typename T, typename Enabler = void>
-struct object_with_zone {
-    void operator()(msgpack::object::with_zone& o, T const& v) const;
-};
-
-} // namespace adaptor
-
-// operators
-
-template <typename T>
-inline
-msgpack::object const& operator>> (msgpack::object const& o, T& v) {
-    return adaptor::convert<T>()(o, v);
-}
-
-template <typename Stream, typename T>
-inline
-msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, T const& v) {
-    return adaptor::pack<T>()(o, v);
-}
-
-template <typename T>
-inline
-void operator<< (msgpack::object& o, T const& v) {
-    adaptor::object<T>()(o, v);
-}
-
-template <typename T>
-inline
-void operator<< (msgpack::object::with_zone& o, T const& v) {
-    adaptor::object_with_zone<T>()(o, v);
-}
-
-/// @cond
-} // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-} // namespace msgpack
+#include "msgpack/adaptor/adaptor_base_decl.hpp"
 
+#include "msgpack/v1/adaptor/adaptor_base.hpp"
+#include "msgpack/v2/adaptor/adaptor_base.hpp"
 
 #endif // MSGPACK_ADAPTOR_BASE_HPP

data/vendor/local/include/msgpack/adaptor/adaptor_base_decl.hpp

@@ -0,0 +1,16 @@
+//
+// MessagePack for C++ static resolution routine
+//
+// Copyright (C) 2016 KONDO Takatoshi
+//
+//    Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//    http://www.boost.org/LICENSE_1_0.txt)
+//
+#ifndef MSGPACK_ADAPTOR_BASE_DECL_HPP
+#define MSGPACK_ADAPTOR_BASE_DECL_HPP
+
+#include "msgpack/v1/adaptor/adaptor_base_decl.hpp"
+#include "msgpack/v2/adaptor/adaptor_base_decl.hpp"
+
+#endif // MSGPACK_ADAPTOR_BASE_DECL_HPP

data/vendor/local/include/msgpack/adaptor/array_ref.hpp

@@ -1,7 +1,7 @@
 //
 // MessagePack for C++ static resolution routine
 //
-// Copyright (C) 2008-2009 FURUHASHI Sadayuki
+// Copyright (C) 2008-2016 FURUHASHI Sadayuki and KONDO Takatoshi
 //
 //    Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,165 +10,8 @@
 #ifndef MSGPACK_TYPE_ARRAY_REF_HPP
 #define MSGPACK_TYPE_ARRAY_REF_HPP
 
-#include "msgpack/versioning.hpp"
-#include "msgpack/adaptor/adaptor_base.hpp"
-#include "msgpack/adaptor/check_container_size.hpp"
-#include <cstring>
-#include <string>
+#include "msgpack/adaptor/array_ref_decl.hpp"
 
-namespace msgpack {
+#include "msgpack/v1/adaptor/array_ref.hpp"
 
-/// @cond
-MSGPACK_API_VERSION_NAMESPACE(v1) {
-/// @endcond
-
-namespace type {
-
-template <typename T>
-struct array_ref {
-    array_ref() : data(nullptr) {}
-    array_ref(T& t) : data(&t) {}
-
-    T* data;
-
-    template <typename U>
-    bool operator==(array_ref<U> const& t) const {
-        return *data == *t.data;
-    }
-    template <typename U>
-    bool operator!=(array_ref<U> const& t) const {
-        return !(*data == *t.data);
-    }
-    template <typename U>
-    bool operator< (array_ref<U> const& t) const
-    {
-        return *data < *t.data;
-    }
-    template <typename U>
-    bool operator> (array_ref<U> const& t) const
-    {
-        return *t.data < *data;
-    }
-    template <typename U>
-    bool operator<= (array_ref<U> const& t) const
-    {
-        return !(*t.data < *data);
-    }
-    template <typename U>
-    bool operator>= (array_ref<U> const& t) const
-    {
-        return !(*data < *t.data);
-    }
-};
-
-template <typename T>
-inline array_ref<T const> make_array_ref(T const& t) {
-    return array_ref<T const>(t);
-}
-
-template <typename T>
-inline array_ref<T> make_array_ref(T& t) {
-    return array_ref<T>(t);
-}
-
-
-} // namespace type
-
-namespace adaptor {
-
-template <typename T>
-struct convert<msgpack::type::array_ref<T> > {
-    msgpack::object const& operator()(msgpack::object const& o, msgpack::type::array_ref<T>& v) const {
-        if (!v.data) { throw msgpack::type_error(); }
-        if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-        if (v.data->size() < o.via.bin.size) { throw msgpack::type_error(); }
-        if (o.via.array.size > 0) {
-            msgpack::object* p = o.via.array.ptr;
-            msgpack::object* const pend = o.via.array.ptr + o.via.array.size;
-            typename T::iterator it = v.data->begin();
-            do {
-                p->convert(*it);
-                ++p;
-                ++it;
-            } while(p < pend);
-        }
-        return o;
-    }
-};
-
-template <typename T>
-struct convert<msgpack::type::array_ref<std::vector<T> > > {
-    msgpack::object const& operator()(msgpack::object const& o, msgpack::type::array_ref<std::vector<T> >& v) const {
-        if (!v.data) { throw msgpack::type_error(); }
-        if (o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
-        v.data->resize(o.via.bin.size);
-        if (o.via.array.size > 0) {
-            msgpack::object* p = o.via.array.ptr;
-            msgpack::object* const pend = o.via.array.ptr + o.via.array.size;
-            typename std::vector<T>::iterator it = v.data->begin();
-            do {
-                p->convert(*it);
-                ++p;
-                ++it;
-            } while(p < pend);
-        }
-        return o;
-    }
-};
-
-template <typename T>
-struct pack<msgpack::type::array_ref<T> > {
-    template <typename Stream>
-    msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const msgpack::type::array_ref<T>& v) const {
-        if (!v.data) { throw msgpack::type_error(); }
-        uint32_t size = checked_get_container_size(v.data->size());
-        o.pack_array(size);
-        for (typename T::const_iterator it(v.data->begin()), it_end(v.data->end());
-            it != it_end; ++it) {
-            o.pack(*it);
-        }
-        return o;
-    }
-};
-
-template <typename T>
-struct object_with_zone<msgpack::type::array_ref<T> > {
-    void operator()(msgpack::object::with_zone& o, const msgpack::type::array_ref<T>& v) const {
-        if (!v.data) { throw msgpack::type_error(); }
-        o.type = msgpack::type::ARRAY;
-        if (v.data->empty()) {
-            o.via.array.ptr = nullptr;
-            o.via.array.size = 0;
-        }
-        else {
-            uint32_t size = checked_get_container_size(v.data->size());
-            msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size));
-            msgpack::object* const pend = p + size;
-            o.via.array.ptr = p;
-            o.via.array.size = size;
-            typename T::const_iterator it(v.data->begin());
-            do {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
-                *p = msgpack::object(*it, o.zone);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
-                ++p;
-                ++it;
-            } while(p < pend);
-        }
-    }
-};
-
-} // namespace adaptor
-
-/// @cond
-} // MSGPACK_API_VERSION_NAMESPACE(v1)
-/// @endcond
-
-} // namespace msgpack
-
-#endif // MSGPACK_TYPE_ARRAY_REF_HPP
+#endif // MSGPACK_TYPE_ARRAY_REFL_HPP