Yasuhiro Horimoto
null+****@clear*****
Tue Apr 24 16:41:03 JST 2018
Yasuhiro Horimoto 2018-04-24 16:41:03 +0900 (Tue, 24 Apr 2018) New Revision: 602775ca7f58a2a787c2e61703aba6c93d93d552 https://github.com/groonga/groonga/commit/602775ca7f58a2a787c2e61703aba6c93d93d552 Merged 63e0b56: ii: add log enhancements that output contents of a token (#840) Message: ii: move variable definition before "DEFINE_NAME" Because "DEFINE_NAME" has code not variable definitions. Modified files: lib/ii.c Modified: lib/ii.c (+22 -22) =================================================================== --- lib/ii.c 2018-04-24 16:35:32 +0900 (71e92b565) +++ lib/ii.c 2018-04-24 16:41:03 +0900 (9c171616d) @@ -2743,8 +2743,8 @@ typedef struct { }\ }\ } else {\ - DEFINE_NAME(ii);\ grn_obj token;\ + DEFINE_NAME(ii);\ GRN_TEXT_INIT(&token, 0);\ grn_ii_get_token_from_token_id(ctx, ii, bt->tid, &token);\ CRIT(GRN_FILE_CORRUPT,\ @@ -4590,8 +4590,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h if (!u->tf || !u->sid) { return grn_ii_delete_one(ctx, ii, tid, u, h); } if (u->sid > ii->header->smax) { ii->header->smax = u->sid; } if (!(a = array_get(ctx, ii, tid))) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] failed to allocate an array: " @@ -4605,8 +4605,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h return ctx->rc; } if (!(bs = encode_rec(ctx, ii, u, &size, 0))) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] failed to encode a record: " @@ -4624,8 +4624,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h if (!(a[0] & 1)) { pos = a[0]; if ((pseg = buffer_open(ctx, ii, pos, &bt, &b)) == GRN_II_PSEG_NOT_ASSIGNED) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] failed to allocate a buffer: " @@ -4656,8 +4656,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h ii->header->total_chunk_size >> 10); buffer_split(ctx, ii, LSEG(pos), h); if (ctx->rc != GRN_SUCCESS) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); ERR(ctx->rc, @@ -4677,8 +4677,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h } buffer_flush(ctx, ii, LSEG(pos), h); if (ctx->rc != GRN_SUCCESS) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); ERR(ctx->rc, @@ -4702,8 +4702,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h if ((pseg = buffer_open(ctx, ii, pos, &bt, &b)) == GRN_II_PSEG_NOT_ASSIGNED) { GRN_LOG(ctx, GRN_LOG_CRIT, "buffer not found a[0]=%d", a[0]); { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] failed to reallocate a buffer: " @@ -4724,8 +4724,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h a[0], LSEG(a[0]), b, bfb, b->header.buffer_free, b->header.nterms, b->header.nterms_void); if (b->header.buffer_free < size) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] buffer is full: " @@ -4765,8 +4765,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h if (u2.rid != u->rid || u2.sid != u->sid) { uint8_t *bs2 = encode_rec(ctx, ii, &u2, &size2, 0); if (!bs2) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] failed to encode a record2: " @@ -4783,8 +4783,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h if (pseg == GRN_II_PSEG_NOT_ASSIGNED) { GRN_FREE(bs2); { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] failed to create a buffer2: " @@ -4810,8 +4810,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h GRN_FREE(bs2); buffer_close(ctx, ii, pseg); { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] failed to put to buffer: " @@ -4848,8 +4848,8 @@ grn_ii_update_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h } pseg = buffer_new(ctx, ii, size, &pos, &bt, &br, &b, tid, h); if (pseg == GRN_II_PSEG_NOT_ASSIGNED) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][update][one] failed to create a buffer: " @@ -4948,8 +4948,8 @@ grn_ii_delete_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h goto exit; } if (!(bs = encode_rec(ctx, ii, u, &size, 1))) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][delete][one] failed to encode a record: " @@ -4963,8 +4963,8 @@ grn_ii_delete_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h goto exit; } if ((pseg = buffer_open(ctx, ii, a[0], &bt, &b)) == GRN_II_PSEG_NOT_ASSIGNED) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][delete][one] failed to allocate a buffer: " @@ -4986,8 +4986,8 @@ grn_ii_delete_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h buffer_close(ctx, ii, pseg); buffer_flush(ctx, ii, LSEG(a[0]), h); if (ctx->rc != GRN_SUCCESS) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); ERR(ctx->rc, @@ -5009,8 +5009,8 @@ grn_ii_delete_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h continue; } if ((pseg = buffer_open(ctx, ii, a[0], &bt, &b)) == GRN_II_PSEG_NOT_ASSIGNED) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][delete][one] failed to reallocate a buffer: " @@ -5028,8 +5028,8 @@ grn_ii_delete_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_h GRN_LOG(ctx, GRN_LOG_DEBUG, "flushed! b=%p free=%d, seg(%d)", b, b->header.buffer_free, LSEG(a[0])); if (b->header.buffer_free < size) { - DEFINE_NAME(ii); grn_obj token; + DEFINE_NAME(ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii, tid, &token); MERR("[ii][delete][one] buffer is full: " @@ -10448,8 +10448,8 @@ grn_ii_buffer_merge(grn_ctx *ctx, grn_ii_buffer *ii_buffer, a = array_get(ctx, ii_buffer->ii, tid); if (!a) { - DEFINE_NAME(ii_buffer->ii); grn_obj token; + DEFINE_NAME(ii_buffer->ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii_buffer->ii, tid, &token); MERR("[ii][buffer][merge] failed to allocate an array: " @@ -10464,8 +10464,8 @@ grn_ii_buffer_merge(grn_ctx *ctx, grn_ii_buffer *ii_buffer, } term_buffer = get_term_buffer(ctx, ii_buffer); if (!term_buffer) { - DEFINE_NAME(ii_buffer->ii); grn_obj token; + DEFINE_NAME(ii_buffer->ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, ii_buffer->ii, tid, &token); MERR("[ii][buffer][merge] failed to allocate a term buffer: " @@ -12784,8 +12784,8 @@ grn_ii_builder_pack_chunk(grn_ctx *ctx, grn_ii_builder *builder, } a = array_get(ctx, builder->ii, chunk->tid); if (!a) { - DEFINE_NAME(builder->ii); grn_obj token; + DEFINE_NAME(builder->ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, builder->ii, chunk->tid, &token); MERR("[ii][builder][chunk][pack] failed to allocate an array: " @@ -12802,8 +12802,8 @@ grn_ii_builder_pack_chunk(grn_ctx *ctx, grn_ii_builder *builder, } else { a = array_get(ctx, builder->ii, chunk->tid); if (!a) { - DEFINE_NAME(builder->ii); grn_obj token; + DEFINE_NAME(builder->ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, builder->ii, chunk->tid, &token); MERR("[ii][builder][chunk][pack] failed to allocate an array: " @@ -13107,8 +13107,8 @@ grn_ii_builder_register_chunks(grn_ctx *ctx, grn_ii_builder *builder) a = array_get(ctx, builder->ii, builder->chunk.tid); if (!a) { - DEFINE_NAME(builder->ii); grn_obj token; + DEFINE_NAME(builder->ii); GRN_TEXT_INIT(&token, 0); grn_ii_get_token_from_token_id(ctx, builder->ii, builder->chunk.tid, &token); MERR("[ii][builder][chunk][register] " -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180424/ec32a2ca/attachment-0001.htm
