Kouhei Sutou
null+****@clear*****
Sun Apr 10 22:31:03 JST 2016
Kouhei Sutou 2016-04-10 22:31:03 +0900 (Sun, 10 Apr 2016) New Revision: 67d863b5bef41176ac6c4156a37cfa2dd80fd651 https://github.com/groonga/groonga/commit/67d863b5bef41176ac6c4156a37cfa2dd80fd651 Message: select drilldown: ignore invalid sort key drilldown Modified files: lib/proc/proc_select.c test/command/suite/select/drilldown/labeled/table/empty.expected Modified: lib/proc/proc_select.c (+1 -0) =================================================================== --- lib/proc/proc_select.c 2016-04-10 22:29:34 +0900 (e7b6ee2) +++ lib/proc/proc_select.c 2016-04-10 22:31:03 +0900 (689fff0) @@ -637,6 +637,7 @@ grn_select_drilldowns_execute(grn_ctx *ctx, drilldown->keys_len, target_table, &n_keys); if (!keys) { + GRN_PLUGIN_CLEAR_ERROR(ctx); continue; } Modified: test/command/suite/select/drilldown/labeled/table/empty.expected (+37 -6) =================================================================== --- test/command/suite/select/drilldown/labeled/table/empty.expected 2016-04-10 22:29:34 +0900 (1e31337) +++ test/command/suite/select/drilldown/labeled/table/empty.expected 2016-04-10 22:31:03 +0900 (1524aa2) @@ -24,12 +24,9 @@ load --table Tags select Memos --drilldown[category].table '' --drilldown[category].keys category --drilldown[category].output_columns _key,_nsubrecs --drilldown[tag].keys tag --drilldown[tag].output_columns _key,_nsubrecs,category [ [ - [ - -22, - 0.0, - 0.0 - ], - "invalid sort key: <category>(<category>)" + 0, + 0.0, + 0.0 ], [ [ @@ -72,6 +69,40 @@ select Memos --drilldown[category].table '' --drilldown[category].keys categ ] ], { + "tag": [ + [ + 3 + ], + [ + [ + "_key", + "ShortText" + ], + [ + "_nsubrecs", + "Int32" + ], + [ + "category", + "ShortText" + ] + ], + [ + "Groonga", + 2, + "C/C++" + ], + [ + "Mroonga", + 1, + "C/C++" + ], + [ + "Rroonga", + 1, + "Ruby" + ] + ] } ] ] -------------- next part -------------- HTML����������������������������...다운로드
