YUKI Hiroshi
null+****@clear*****
Wed Dec 4 14:56:16 JST 2013
YUKI Hiroshi 2013-12-04 14:56:16 +0900 (Wed, 04 Dec 2013) New Revision: e8a03ccd8e82d1f482b8b6afdf4e501f0f091afc https://github.com/droonga/fluent-plugin-droonga/commit/e8a03ccd8e82d1f482b8b6afdf4e501f0f091afc Message: Unify only grouped records Modified files: lib/droonga/plugin/distributor/search.rb Modified: lib/droonga/plugin/distributor/search.rb (+13 -2) =================================================================== --- lib/droonga/plugin/distributor/search.rb 2013-12-04 14:37:57 +0900 (44ebfa6) +++ lib/droonga/plugin/distributor/search.rb 2013-12-04 14:56:16 +0900 (42b4680) @@ -29,7 +29,18 @@ module Droonga output_mapper = {} request = envelope["body"] - request["queries"].each do |input_name, query| + queries = request["queries"] + + queries.each do |input_name, query| + source = query["source"] + if queries.keys.include?(source) && + queries[source]["groupBy"] && + query["output"] + query["output"]["canUnify"] = true + end + end + + queries.each do |input_name, query| output = query["output"] # Skip reducing phase for a result with no output. next unless output @@ -66,7 +77,7 @@ module Droonga final_attributes = collect_output_attributes(output["attributes"]) output["attributes"] = format_attributes_to_array_style(output["attributes"]) output["attributes"] += collect_sort_attributes(output["attributes"], query["sortBy"]) - unify_by_key = true + unify_by_key = output["canUnify"] if unify_by_key && !output["attributes"].include?("_key") output["attributes"] << "_key" end -------------- next part -------------- HTML����������������������������...Download