Naoya Murakami
null+****@clear*****
Sat Jan 14 20:11:17 JST 2017
Naoya Murakami 2017-01-14 20:11:17 +0900 (Sat, 14 Jan 2017) New Revision: 9202dcd3c719c13f710190cc58f8afe0b3b0a303 https://github.com/groonga/groonga/commit/9202dcd3c719c13f710190cc58f8afe0b3b0a303 Merged b8c4ffd: Merge pull request #627 from naoa/dont-output-label-if-cant-sort Message: Clear error if don't find sort_keys in drilldowns/slices Modified files: lib/proc/proc_select.c Modified: lib/proc/proc_select.c (+6 -2) =================================================================== --- lib/proc/proc_select.c 2017-01-14 19:06:09 +0900 (23d3602) +++ lib/proc/proc_select.c 2017-01-14 20:11:17 +0900 (14d099e) @@ -1939,7 +1939,9 @@ grn_select_output_slices(grn_ctx *ctx, slice->sort_keys.value, slice->sort_keys.length, slice->table, &n_sort_keys); - if (sort_keys) { + if (!sort_keys) { + GRN_PLUGIN_CLEAR_ERROR(ctx); + } else { grn_obj *sorted; sorted = grn_table_create(ctx, NULL, 0, NULL, GRN_OBJ_TABLE_NO_KEY, NULL, slice->table); @@ -2524,7 +2526,9 @@ grn_select_output_drilldowns(grn_ctx *ctx, drilldown->sort_keys.value, drilldown->sort_keys.length, target_table, &n_sort_keys); - if (sort_keys) { + if (!sort_keys) { + GRN_PLUGIN_CLEAR_ERROR(ctx); + } else { grn_obj *sorted; sorted = grn_table_create(ctx, NULL, 0, NULL, GRN_OBJ_TABLE_NO_KEY, NULL, target_table); -------------- next part -------------- HTML����������������������������...下载
