Kouhei Sutou
null+****@clear*****
Mon Mar 30 21:18:01 JST 2015
Kouhei Sutou 2015-03-30 21:18:01 +0900 (Mon, 30 Mar 2015) New Revision: 3946c76191e86b0ccde663dd4ffdc77e67376b2d https://github.com/groonga/groonga/commit/3946c76191e86b0ccde663dd4ffdc77e67376b2d Message: Use MSGPACK_OBJECT_STR with MessagePack 1.0.1 It's a part of MessagePack 1.0.1 support. MSGPACK_OBJECT_RAW is renamed to MSGPACK_OBJECT_STR. GitHub: #328 Reported by Hiroshi Hatake. Thanks!!! Modified files: lib/grn_ctx_impl.h src/suggest/groonga_suggest_httpd.c Modified: lib/grn_ctx_impl.h (+1 -0) =================================================================== --- lib/grn_ctx_impl.h 2015-03-30 21:15:00 +0900 (14d6efc) +++ lib/grn_ctx_impl.h 2015-03-30 21:18:01 +0900 (e68bb07) @@ -33,6 +33,7 @@ typedef unsigned int msgpack_size_t; # define msgpack_pack_str(packer, size) msgpack_pack_raw(packer, size) # define msgpack_pack_str_body(packer, value, size) \ msgpack_pack_raw_body(packer, value, size) +# define MSGPACK_OBJECT_STR MSGPACK_OBJECT_RAW # else /* MSGPACK_VERSION_MAJOR < 1 */ typedef size_t msgpack_size_t; # endif /* MSGPACK_VERSION_MAJOR < 1 */ Modified: src/suggest/groonga_suggest_httpd.c (+3 -3) =================================================================== --- src/suggest/groonga_suggest_httpd.c 2015-03-30 21:15:00 +0900 (e615b65) +++ src/suggest/groonga_suggest_httpd.c 2015-03-30 21:18:01 +0900 (7150780) @@ -420,7 +420,7 @@ msgpack2json(msgpack_object *o, grn_ctx *ctx, grn_obj *buf) case MSGPACK_OBJECT_POSITIVE_INTEGER: grn_text_ulltoa(ctx, buf, o->via.u64); break; - case MSGPACK_OBJECT_RAW: + case MSGPACK_OBJECT_STR: grn_text_esc(ctx, buf, o->via.raw.ptr, o->via.raw.size); break; case MSGPACK_OBJECT_ARRAY: @@ -447,9 +447,9 @@ load_from_learner(msgpack_object *o, grn_ctx *ctx, grn_obj *cmd_buf) if (o->type == MSGPACK_OBJECT_MAP && o->via.map.size) { msgpack_object_kv *kv; kv = &(o->via.map.ptr[0]); - if (kv->key.type == MSGPACK_OBJECT_RAW && kv->key.via.raw.size == 6 && + if (kv->key.type == MSGPACK_OBJECT_STR && kv->key.via.raw.size == 6 && !memcmp(kv->key.via.raw.ptr, CONST_STR_LEN("target"))) { - if (kv->val.type == MSGPACK_OBJECT_RAW) { + if (kv->val.type == MSGPACK_OBJECT_STR) { int i; GRN_BULK_REWIND(cmd_buf); GRN_TEXT_PUTS(ctx, cmd_buf, "load --table "); -------------- next part -------------- HTML����������������������������...下载
