Kouhei Sutou
null+****@clear*****
Sun Apr 3 11:31:19 JST 2016
Kouhei Sutou 2016-04-03 11:31:19 +0900 (Sun, 03 Apr 2016) New Revision: 6a0b9dcd13a9d11b89f0a3b3768b1664332b0fcd https://github.com/groonga/groonga/commit/6a0b9dcd13a9d11b89f0a3b3768b1664332b0fcd Message: table_tokenize: fix English estimate _size -> estimated_size + Modified files: lib/proc/proc_tokenize.c test/command/suite/table_tokenize/index_column.expected Modified: lib/proc/proc_tokenize.c (+7 -7) =================================================================== --- lib/proc/proc_tokenize.c 2016-04-03 11:29:06 +0900 (6595721) +++ lib/proc/proc_tokenize.c 2016-04-03 11:31:19 +0900 (1685908) @@ -72,13 +72,13 @@ static void output_tokens(grn_ctx *ctx, grn_obj *tokens, grn_obj *lexicon, grn_obj *index_column) { int i, n_tokens, n_elements; - grn_obj estimate_size; + grn_obj estimated_size; n_tokens = GRN_BULK_VSIZE(tokens) / sizeof(tokenize_token); n_elements = 3; if (index_column) { n_elements++; - GRN_UINT32_INIT(&estimate_size, 0); + GRN_UINT32_INIT(&estimated_size, 0); } grn_ctx_output_array_open(ctx, "TOKENS", n_tokens); @@ -103,17 +103,17 @@ output_tokens(grn_ctx *ctx, grn_obj *tokens, grn_obj *lexicon, grn_obj *index_co grn_ctx_output_bool(ctx, token->force_prefix); if (index_column) { - GRN_BULK_REWIND(&estimate_size); - grn_obj_get_value(ctx, index_column, token->id, &estimate_size); - grn_ctx_output_cstr(ctx, "estimate_size"); - grn_ctx_output_int64(ctx, GRN_UINT32_VALUE(&estimate_size)); + GRN_BULK_REWIND(&estimated_size); + grn_obj_get_value(ctx, index_column, token->id, &estimated_size); + grn_ctx_output_cstr(ctx, "estimated_size"); + grn_ctx_output_int64(ctx, GRN_UINT32_VALUE(&estimated_size)); } grn_ctx_output_map_close(ctx); } if (index_column) { - GRN_OBJ_FIN(ctx, &estimate_size); + GRN_OBJ_FIN(ctx, &estimated_size); } grn_ctx_output_array_close(ctx); Modified: test/command/suite/table_tokenize/index_column.expected (+5 -5) =================================================================== --- test/command/suite/table_tokenize/index_column.expected 2016-04-03 11:29:06 +0900 (61f4663) +++ test/command/suite/table_tokenize/index_column.expected 2016-04-03 11:31:19 +0900 (4ea1085) @@ -25,31 +25,31 @@ table_tokenize Terms "a ruby bindings of Groonga" --mode GET --index_column inde "value": "a", "position": 0, "force_prefix": false, - "estimate_size": 5 + "estimated_size": 5 }, { "value": "ruby", "position": 1, "force_prefix": false, - "estimate_size": 1 + "estimated_size": 1 }, { "value": "bindings", "position": 2, "force_prefix": false, - "estimate_size": 1 + "estimated_size": 1 }, { "value": "of", "position": 3, "force_prefix": false, - "estimate_size": 1 + "estimated_size": 1 }, { "value": "groonga", "position": 4, "force_prefix": false, - "estimate_size": 5 + "estimated_size": 5 } ] ] -------------- next part -------------- HTML����������������������������...다운로드
