YUKI Hiroshi
null+****@clear*****
Wed Dec 4 17:53:15 JST 2013
YUKI Hiroshi 2013-12-04 17:53:15 +0900 (Wed, 04 Dec 2013) New Revision: 2a8e52bfce487f86c707bf7a6cb1b0fc657d1a5b https://github.com/droonga/fluent-plugin-droonga/commit/2a8e52bfce487f86c707bf7a6cb1b0fc657d1a5b Message: Use "unifiable" in other cases Modified files: lib/droonga/plugin/distributor/search.rb Modified: lib/droonga/plugin/distributor/search.rb (+5 -5) =================================================================== --- lib/droonga/plugin/distributor/search.rb 2013-12-04 17:49:49 +0900 (9122040) +++ lib/droonga/plugin/distributor/search.rb 2013-12-04 17:53:15 +0900 (c320f28) @@ -33,7 +33,7 @@ module Droonga queries.each do |name, query| if unifiable?(name, queries) && query["output"] - query["output"]["canUnify"] = true + query["output"]["unifiable"] = true end end @@ -74,14 +74,14 @@ 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 = output["canUnify"] - if unify_by_key && !output["attributes"].include?("_key") + unifiable = output["unifiable"] + if unifiable && !output["attributes"].include?("_key") output["attributes"] << "_key" end elements[element] = sort_reducer(:attributes => output["attributes"], :sort_keys => query["sortBy"], - :unify_by_key => unify_by_key) + :unifiable => unifiable) # On the reducing phase, we apply only "limit". We cannot apply # "offset" on this phase because the collecter merges a pair of # results step by step even if there are three or more results. @@ -292,7 +292,7 @@ module Droonga "type" => "sort", "operators" => operators, } - if params[:unify_by_key] && !key_column_index.nil? + if params[:unifiable] && !key_column_index.nil? reducer["key_column"] = key_column_index end reducer -------------- next part -------------- HTML����������������������������...Download