Kouhei Sutou
null+****@clear*****
Mon Mar 30 21:31:52 JST 2015
Kouhei Sutou 2015-03-30 21:31:52 +0900 (Mon, 30 Mar 2015) New Revision: 652a7397f0e085a532bbf0c0a5d9514ad63375e3 https://github.com/groonga/groonga/commit/652a7397f0e085a532bbf0c0a5d9514ad63375e3 Message: msgpack: don't omit "_OBJECT" Modified files: lib/grn_msgpack.h src/suggest/groonga_suggest_httpd.c Modified: lib/grn_msgpack.h (+6 -6) =================================================================== --- lib/grn_msgpack.h 2015-03-30 21:30:10 +0900 (c2c4719) +++ lib/grn_msgpack.h 2015-03-30 21:31:52 +0900 (db86987) @@ -31,17 +31,17 @@ typedef unsigned int msgpack_size_t; # define MSGPACK_OBJECT_STR MSGPACK_OBJECT_RAW # define MSGPACK_OBJECT_FLOAT MSGPACK_OBJECT_DOUBLE -# define MSGPACK_STR_PTR(object) (object)->via.raw.ptr -# define MSGPACK_STR_SIZE(object) (object)->via.raw.size +# define MSGPACK_OBJECT_STR_PTR(object) (object)->via.raw.ptr +# define MSGPACK_OBJECT_STR_SIZE(object) (object)->via.raw.size -# define MSGPACK_FLOAT(object) (object)->via.dec +# define MSGPACK_OBJECT_FLOAT_VALUE(object) (object)->via.dec # else /* MSGPACK_VERSION_MAJOR < 1 */ typedef size_t msgpack_size_t; -# define MSGPACK_STR_PTR(object) (object)->via.str.ptr -# define MSGPACK_STR_SIZE(object) (object)->via.str.size +# define MSGPACK_OBJECT_STR_PTR(object) (object)->via.str.ptr +# define MSGPACK_OBJECT_STR_SIZE(object) (object)->via.str.size -# define MSGPACK_FLOAT(object) (object)->via.f64 +# define MSGPACK_OBJECT_FLOAT_VALUE(object) (object)->via.f64 # endif /* MSGPACK_VERSION_MAJOR < 1 */ #endif /* GRN_WITH_MESSAGE_PACK */ Modified: src/suggest/groonga_suggest_httpd.c (+11 -9) =================================================================== --- src/suggest/groonga_suggest_httpd.c 2015-03-30 21:30:10 +0900 (f5c3aa5) +++ src/suggest/groonga_suggest_httpd.c 2015-03-30 21:31:52 +0900 (a6c9f3e) @@ -421,7 +421,9 @@ msgpack2json(msgpack_object *o, grn_ctx *ctx, grn_obj *buf) grn_text_ulltoa(ctx, buf, o->via.u64); break; case MSGPACK_OBJECT_STR: - grn_text_esc(ctx, buf, MSGPACK_STR_PTR(o), MSGPACK_STR_SIZE(o)); + grn_text_esc(ctx, buf, + MSGPACK_OBJECT_STR_PTR(o), + MSGPACK_OBJECT_STR_SIZE(o)); break; case MSGPACK_OBJECT_ARRAY: GRN_TEXT_PUTC(ctx, buf, '['); @@ -434,7 +436,7 @@ msgpack2json(msgpack_object *o, grn_ctx *ctx, grn_obj *buf) GRN_TEXT_PUTC(ctx, buf, ']'); break; case MSGPACK_OBJECT_FLOAT: - grn_text_ftoa(ctx, buf, MSGPACK_FLOAT(o)); + grn_text_ftoa(ctx, buf, MSGPACK_OBJECT_FLOAT_VALUE(o)); break; default: print_error("cannot handle this msgpack type."); @@ -451,20 +453,20 @@ load_from_learner(msgpack_object *o, grn_ctx *ctx, grn_obj *cmd_buf) kv = &(o->via.map.ptr[0]); key = &(kv->key); value = &(kv->val); - if (key->type == MSGPACK_OBJECT_STR && MSGPACK_STR_SIZE(key) == 6 && - !memcmp(MSGPACK_STR_PTR(key), CONST_STR_LEN("target"))) { + if (key->type == MSGPACK_OBJECT_STR && MSGPACK_OBJECT_STR_SIZE(key) == 6 && + !memcmp(MSGPACK_OBJECT_STR_PTR(key), CONST_STR_LEN("target"))) { if (value->type == MSGPACK_OBJECT_STR) { int i; GRN_BULK_REWIND(cmd_buf); GRN_TEXT_PUTS(ctx, cmd_buf, "load --table "); GRN_TEXT_PUT(ctx, cmd_buf, - MSGPACK_STR_PTR(value), - MSGPACK_STR_SIZE(value)); + MSGPACK_OBJECT_STR_PTR(value), + MSGPACK_OBJECT_STR_SIZE(value)); grn_ctx_send(ctx, GRN_TEXT_VALUE(cmd_buf), GRN_TEXT_LEN(cmd_buf), GRN_CTX_MORE); grn_ctx_send(ctx, CONST_STR_LEN("["), GRN_CTX_MORE); - if (MSGPACK_STR_SIZE(value) > 5) { - if (!memcmp(MSGPACK_STR_PTR(value), CONST_STR_LEN("item_")) || - !memcmp(MSGPACK_STR_PTR(value), CONST_STR_LEN("pair_"))) { + if (MSGPACK_OBJECT_STR_SIZE(value) > 5) { + if (!memcmp(MSGPACK_OBJECT_STR_PTR(value), CONST_STR_LEN("item_")) || + !memcmp(MSGPACK_OBJECT_STR_PTR(value), CONST_STR_LEN("pair_"))) { char delim = '{'; GRN_BULK_REWIND(cmd_buf); for (i = 1; i < o->via.map.size; i++) { -------------- next part -------------- HTML����������������������������...Download