Kouhei Sutou
null+****@clear*****
Wed Jun 19 15:12:21 JST 2013
Kouhei Sutou 2013-06-19 15:12:21 +0900 (Wed, 19 Jun 2013) New Revision: 1e62bc52042a5d8c72d62acec48b70be331a814e https://github.com/groonga/groonga/commit/1e62bc52042a5d8c72d62acec48b70be331a814e Message: Extract table subrec inspection code Modified files: lib/util.c Modified: lib/util.c (+43 -34) =================================================================== --- lib/util.c 2013-06-19 15:11:21 +0900 (a302309) +++ lib/util.c 2013-06-19 15:12:21 +0900 (999e005) @@ -632,6 +632,47 @@ grn_table_keys_inspect(grn_ctx *ctx, grn_obj *buf, grn_obj *obj) } static grn_rc +grn_table_subrec_inspect(grn_ctx *ctx, grn_obj *buf, grn_obj *obj) +{ + GRN_TEXT_PUTS(ctx, buf, "subrec:"); + if (obj->header.flags & GRN_OBJ_WITH_SUBREC) { + switch (obj->header.flags & GRN_OBJ_UNIT_MASK) { + case GRN_OBJ_UNIT_DOCUMENT_NONE : + GRN_TEXT_PUTS(ctx, buf, "document:none"); + break; + case GRN_OBJ_UNIT_DOCUMENT_SECTION : + GRN_TEXT_PUTS(ctx, buf, "document:section"); + break; + case GRN_OBJ_UNIT_DOCUMENT_POSITION : + GRN_TEXT_PUTS(ctx, buf, "document:position"); + break; + case GRN_OBJ_UNIT_SECTION_NONE : + GRN_TEXT_PUTS(ctx, buf, "section:none"); + break; + case GRN_OBJ_UNIT_SECTION_POSITION : + GRN_TEXT_PUTS(ctx, buf, "section:popsition"); + break; + case GRN_OBJ_UNIT_POSITION_NONE : + GRN_TEXT_PUTS(ctx, buf, "section:none"); + break; + case GRN_OBJ_UNIT_USERDEF_DOCUMENT : + GRN_TEXT_PUTS(ctx, buf, "userdef:document"); + break; + case GRN_OBJ_UNIT_USERDEF_SECTION : + GRN_TEXT_PUTS(ctx, buf, "userdef:section"); + break; + case GRN_OBJ_UNIT_USERDEF_POSITION : + GRN_TEXT_PUTS(ctx, buf, "userdef:position"); + break; + } + } else { + GRN_TEXT_PUTS(ctx, buf, "none"); + } + + return GRN_SUCCESS; +} + +static grn_rc grn_table_inspect(grn_ctx *ctx, grn_obj *buf, grn_obj *obj) { grn_id range_id; @@ -679,40 +720,8 @@ grn_table_inspect(grn_ctx *ctx, grn_obj *buf, grn_obj *obj) grn_table_keys_inspect(ctx, buf, obj); } - GRN_TEXT_PUTS(ctx, buf, " subrec:"); - if (obj->header.flags & GRN_OBJ_WITH_SUBREC) { - switch (obj->header.flags & GRN_OBJ_UNIT_MASK) { - case GRN_OBJ_UNIT_DOCUMENT_NONE : - GRN_TEXT_PUTS(ctx, buf, "document:none"); - break; - case GRN_OBJ_UNIT_DOCUMENT_SECTION : - GRN_TEXT_PUTS(ctx, buf, "document:section"); - break; - case GRN_OBJ_UNIT_DOCUMENT_POSITION : - GRN_TEXT_PUTS(ctx, buf, "document:position"); - break; - case GRN_OBJ_UNIT_SECTION_NONE : - GRN_TEXT_PUTS(ctx, buf, "section:none"); - break; - case GRN_OBJ_UNIT_SECTION_POSITION : - GRN_TEXT_PUTS(ctx, buf, "section:popsition"); - break; - case GRN_OBJ_UNIT_POSITION_NONE : - GRN_TEXT_PUTS(ctx, buf, "section:none"); - break; - case GRN_OBJ_UNIT_USERDEF_DOCUMENT : - GRN_TEXT_PUTS(ctx, buf, "userdef:document"); - break; - case GRN_OBJ_UNIT_USERDEF_SECTION : - GRN_TEXT_PUTS(ctx, buf, "userdef:section"); - break; - case GRN_OBJ_UNIT_USERDEF_POSITION : - GRN_TEXT_PUTS(ctx, buf, "userdef:position"); - break; - } - } else { - GRN_TEXT_PUTS(ctx, buf, "none"); - } + GRN_TEXT_PUTS(ctx, buf, " "); + grn_table_subrec_inspect(ctx, buf, obj); if (obj->header.type == GRN_TABLE_PAT_KEY) { GRN_TEXT_PUTS(ctx, buf, " nodes:"); -------------- next part -------------- HTML����������������������������...Download