Kouhei Sutou
null+****@clear*****
Sun May 22 17:20:46 JST 2016
Kouhei Sutou 2016-05-22 17:20:46 +0900 (Sun, 22 May 2016) New Revision: aa51814995aa87a249a08720f11a51d623db8de6 https://github.com/groonga/groonga/commit/aa51814995aa87a249a08720f11a51d623db8de6 Message: select: move error check code Modified files: lib/proc/proc_select.c Modified: lib/proc/proc_select.c (+5 -4) =================================================================== --- lib/proc/proc_select.c 2016-05-22 17:15:14 +0900 (ef1e8ca) +++ lib/proc/proc_select.c 2016-05-22 17:20:46 +0900 (37c5f98) @@ -1458,7 +1458,7 @@ grn_select_output(grn_ctx *ctx, GRN_QUERY_LOG(ctx, GRN_QUERY_LOG_SIZE, ":", "output(%d)", data->limit); - return GRN_TRUE; + return ctx->rc == GRN_SUCCESS; } static grn_bool @@ -2472,9 +2472,10 @@ grn_select(grn_ctx *ctx, grn_select_data *data) GRN_OUTPUT_ARRAY_OPEN("RESULT", data->output.n_elements); if (!grn_select_output(ctx, data)) { + GRN_OUTPUT_ARRAY_CLOSE(); goto exit; } - if (!ctx->rc) { + if (data->slices) { grn_select_slices(ctx, data, data->tables.result, data->slices); } @@ -2491,9 +2492,9 @@ grn_select(grn_ctx *ctx, grn_select_data *data) data->tables.result, data->drilldowns); } - } + + GRN_OUTPUT_ARRAY_CLOSE(); } - GRN_OUTPUT_ARRAY_CLOSE(); if (!ctx->rc && data->cacheable && cache_key_size <= GRN_CACHE_MAX_KEY_SIZE && -------------- next part -------------- HTML����������������������������...Download
