Kouhei Sutou
null+****@clear*****
Tue Oct 20 15:19:32 JST 2015
Kouhei Sutou 2015-10-20 15:19:32 +0900 (Tue, 20 Oct 2015) New Revision: 79a59cec8a3f98cea9697809ddda551f82bf2985 https://github.com/groonga/groonga/commit/79a59cec8a3f98cea9697809ddda551f82bf2985 Message: schema: use common code Modified files: lib/proc.c Modified: lib/proc.c (+9 -17) =================================================================== --- lib/proc.c 2015-10-20 15:16:39 +0900 (2d384b9) +++ lib/proc.c 2015-10-20 15:19:32 +0900 (1ff0aa3) @@ -7729,23 +7729,15 @@ proc_schema_table_command_collect_arguments(grn_ctx *ctx, ADD_OBJECT_NAME("name", table); - switch (table->header.type) { - case GRN_TABLE_NO_KEY : - ADD("flags", "TABLE_NO_KEY"); - break; - case GRN_TABLE_HASH_KEY : - ADD("flags", "TABLE_HASH_KEY"); - break; - case GRN_TABLE_PAT_KEY : - if (table->header.flags & GRN_OBJ_KEY_WITH_SIS) { - ADD("flags", "TABLE_PAT_KEY|KEY_WITH_SIS"); - } else { - ADD("flags", "TABLE_PAT_KEY"); - } - break; - case GRN_TABLE_DAT_KEY : - ADD("flags", "TABLE_DAT_KEY"); - break; + { + grn_obj flags; + grn_obj_flags ignored_flags = GRN_OBJ_KEY_NORMALIZE | GRN_OBJ_PERSISTENT; + GRN_TEXT_INIT(&flags, 0); + grn_table_create_flags_to_text(ctx, &flags, + table->header.flags & ~ignored_flags); + GRN_TEXT_PUTC(ctx, &flags, '\0'); + ADD("flags", GRN_TEXT_VALUE(&flags)); + GRN_OBJ_FIN(ctx, &flags); } { -------------- next part -------------- HTML����������������������������...Download