YUKI Hiroshi
null+****@clear*****
Thu Dec 26 19:45:14 JST 2013
YUKI Hiroshi 2013-12-26 19:45:14 +0900 (Thu, 26 Dec 2013) New Revision: 182f042a21bb144cd2aa45f160f9cebf134d731e https://github.com/droonga/fluent-plugin-droonga/commit/182f042a21bb144cd2aa45f160f9cebf134d731e Message: Use simple error type CyclicSource Added files: test/command/suite/search/error/cyclic-source.expected Removed files: test/command/suite/search/error/circular-reference-source.expected Modified files: lib/droonga/plugin/distributor/distributed_search_planner.rb lib/droonga/searcher.rb Renamed files: test/command/suite/search/error/cyclic-source.test (from test/command/suite/search/error/circular-reference-source.test) test/command/suite/search/error/deeply-cyclic-source.expected (from test/command/suite/search/error/deeply-circular-reference-source.expected) test/command/suite/search/error/deeply-cyclic-source.test (from test/command/suite/search/error/deeply-circular-reference-source.test) Modified: lib/droonga/plugin/distributor/distributed_search_planner.rb (+2 -2) =================================================================== --- lib/droonga/plugin/distributor/distributed_search_planner.rb 2013-12-26 19:40:09 +0900 (bb9904e) +++ lib/droonga/plugin/distributor/distributed_search_planner.rb 2013-12-26 19:45:14 +0900 (2dc70a1) @@ -36,8 +36,8 @@ module Droonga UNLIMITED = -1 def build_messages - if Searcher.have_circular_source?(@queries) - raise Searcher::CircularReferenceSource.new(@queries) + if Searcher.have_cyclic_source?(@queries) + raise Searcher::CyclicSource.new(@queries) end ensure_unifiable! Modified: lib/droonga/searcher.rb (+4 -4) =================================================================== --- lib/droonga/searcher.rb 2013-12-26 19:40:09 +0900 (e68acb8) +++ lib/droonga/searcher.rb 2013-12-26 19:45:14 +0900 (f31f715) @@ -37,15 +37,15 @@ module Droonga end end - class CircularReferenceSource < BadRequest + class CyclicSource < BadRequest def initialize(queries) - super("There is circular reference of queries.", + super("There is cyclic reference of sources.", queries) end end class << self - def have_circular_source?(queries) + def have_cyclic_source?(queries) query_sorter = QuerySorter.new queries.each do |name, query| source = query["source"] @@ -91,7 +91,7 @@ module Droonga begin sorted_queries = query_sorter.tsort rescue TSort::Cyclic - raise CircularReferenceSource.new + raise CyclicSource.new(queries) end $log.trace("#{log_tag}: process_queries: sort: done") outputs = {} Deleted: test/command/suite/search/error/circular-reference-source.expected (+0 -18) 100644 =================================================================== --- test/command/suite/search/error/circular-reference-source.expected 2013-12-26 19:40:09 +0900 (35ff156) +++ /dev/null @@ -1,18 +0,0 @@ -[ - "droonga.message", - 0, - { - "inReplyTo": null, - "statusCode": 400, - "type": "search.result", - "body": { - "name": "CircularReferenceSource", - "message": "There is circular reference of queries.", - "detail": { - "recursive-source": { - "source": "recursive-source" - } - } - } - } -] Added: test/command/suite/search/error/cyclic-source.expected (+18 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/search/error/cyclic-source.expected 2013-12-26 19:45:14 +0900 (90da662) @@ -0,0 +1,18 @@ +[ + "droonga.message", + 0, + { + "inReplyTo": null, + "statusCode": 400, + "type": "search.result", + "body": { + "name": "CyclicSource", + "message": "There is cyclic reference of sources.", + "detail": { + "cyclic-source": { + "source": "cyclic-source" + } + } + } + } +] Renamed: test/command/suite/search/error/cyclic-source.test (+2 -2) 66% =================================================================== --- test/command/suite/search/error/circular-reference-source.test 2013-12-26 19:40:09 +0900 (1e2d375) +++ test/command/suite/search/error/cyclic-source.test 2013-12-26 19:45:14 +0900 (8953a1c) @@ -4,8 +4,8 @@ "dataset": "Droonga", "body": { "queries": { - "recursive-source": { - "source": "recursive-source" + "cyclic-source": { + "source": "cyclic-source" } } } Renamed: test/command/suite/search/error/deeply-cyclic-source.expected (+2 -2) 71% =================================================================== --- test/command/suite/search/error/deeply-circular-reference-source.expected 2013-12-26 19:40:09 +0900 (0a0e752) +++ test/command/suite/search/error/deeply-cyclic-source.expected 2013-12-26 19:45:14 +0900 (6498e9a) @@ -6,8 +6,8 @@ "statusCode": 400, "type": "search.result", "body": { - "name": "CircularReferenceSource", - "message": "There is circular reference of queries.", + "name": "CyclicSource", + "message": "There is cyclic reference of sources.", "detail": { "a": { "source": "b" Renamed: test/command/suite/search/error/deeply-cyclic-source.test (+0 -0) 100% =================================================================== -------------- next part -------------- HTML����������������������������...Download