Kouhei Sutou
null+****@clear*****
Fri Sep 23 17:46:45 JST 2016
Kouhei Sutou 2016-09-23 17:46:45 +0900 (Fri, 23 Sep 2016) New Revision: a9fb60479a9e1d2258ea92e33538b5d20505fcd4 https://github.com/groonga/groonga/commit/a9fb60479a9e1d2258ea92e33538b5d20505fcd4 Message: dump: add missing guard Modified files: lib/proc/proc_dump.c Modified: lib/proc/proc_dump.c (+9 -3) =================================================================== --- lib/proc/proc_dump.c 2016-09-23 17:41:02 +0900 (75fdf2c) +++ lib/proc/proc_dump.c 2016-09-23 17:46:45 +0900 (8dba556) @@ -478,15 +478,21 @@ dump_records(grn_ctx *ctx, grn_dumper *dumper, grn_obj *table) if (column) { if (grn_obj_is_index_column(ctx, column)) { have_index_column = GRN_TRUE; - grn_ctx_pop_temporary_open_space(ctx); + if (dumper->is_close_opened_object_mode) { + grn_ctx_pop_temporary_open_space(ctx); + } } else { have_data_column = GRN_TRUE; GRN_PTR_PUT(ctx, &columns, column); - grn_ctx_merge_temporary_open_space(ctx); + if (dumper->is_close_opened_object_mode) { + grn_ctx_merge_temporary_open_space(ctx); + } } } else { GRN_PLUGIN_CLEAR_ERROR(ctx); - grn_ctx_pop_temporary_open_space(ctx); + if (dumper->is_close_opened_object_mode) { + grn_ctx_pop_temporary_open_space(ctx); + } } } GRN_HASH_EACH_END(ctx, cursor); grn_hash_close(ctx, real_columns); -------------- next part -------------- HTML����������������������������...Download
