Kouhei Sutou
null+****@clear*****
Thu Apr 6 16:29:26 JST 2017
Kouhei Sutou 2017-04-06 16:29:26 +0900 (Thu, 06 Apr 2017) New Revision: 425a95dd9d3db25c48a8fd351a96833bfac05769 https://github.com/groonga/groonga/commit/425a95dd9d3db25c48a8fd351a96833bfac05769 Message: object_inspect: simplify Modified files: lib/proc/proc_object_inspect.c Modified: lib/proc/proc_object_inspect.c (+16 -18) =================================================================== --- lib/proc/proc_object_inspect.c 2017-04-06 16:27:13 +0900 (b79d38a) +++ lib/proc/proc_object_inspect.c 2017-04-06 16:29:26 +0900 (2a55134) @@ -229,26 +229,24 @@ command_object_inspect_column_type(grn_ctx *ctx, grn_obj *column) } static void -command_object_inspect_column_compress(grn_ctx *ctx, grn_obj *column) +command_object_inspect_column_value_compress(grn_ctx *ctx, grn_obj *column) { const char *compress = NULL; + grn_column_flags column_flags; - if (column->header.type != GRN_COLUMN_INDEX) { - grn_column_flags column_flags; - column_flags = grn_column_get_flags(ctx, column); - switch (column_flags & GRN_OBJ_COMPRESS_MASK) { - case GRN_OBJ_COMPRESS_ZLIB : - compress = "zlib"; - break; - case GRN_OBJ_COMPRESS_LZ4 : - compress = "lz4"; - break; - case GRN_OBJ_COMPRESS_ZSTD : - compress = "zstd"; - break; - default : - break; - } + column_flags = grn_column_get_flags(ctx, column); + switch (column_flags & GRN_OBJ_COMPRESS_MASK) { + case GRN_OBJ_COMPRESS_ZLIB : + compress = "zlib"; + break; + case GRN_OBJ_COMPRESS_LZ4 : + compress = "lz4"; + break; + case GRN_OBJ_COMPRESS_ZSTD : + compress = "zstd"; + break; + default : + break; } if (compress) { @@ -288,7 +286,7 @@ command_object_inspect_column_value(grn_ctx *ctx, grn_obj *column) grn_ctx_output_bool(ctx, (column_flags & GRN_OBJ_WITH_POSITION) != 0); } else { grn_ctx_output_cstr(ctx, "compress"); - command_object_inspect_column_compress(ctx, column); + command_object_inspect_column_valkue_compress(ctx, column); } } grn_ctx_output_map_close(ctx); -------------- next part -------------- HTML����������������������������...下载
