From d4245582a75182f33e2b82b5a886477fd650700d Mon Sep 17 00:00:00 2001 From: aevitas Date: Sat, 1 Apr 2023 13:01:36 +0200 Subject: [PATCH] fix it --- .../search/common/query/QueryRankVisitor.java | 56 +++++++++---------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/src/java/com/twitter/search/common/query/QueryRankVisitor.java b/src/java/com/twitter/search/common/query/QueryRankVisitor.java index e6f657f6a..c221a03a3 100644 --- a/src/java/com/twitter/search/common/query/QueryRankVisitor.java +++ b/src/java/com/twitter/search/common/query/QueryRankVisitor.java @@ -15,42 +15,38 @@ import com.twitter.search.queryparser.visitors.DetectAnnotationVisitor; * A visitor that collects node ranks from :r annotation in the query */ public class QueryRankVisitor extends DetectAnnotationVisitor { - private final IdentityHashMap nodeToRankMap = Maps.newIdentityHashMap(); + private final IdentityHashMap nodeToRankMap = Maps.newIdentityHashMap(); - public QueryRankVisitor() { - super(Annotation.Type.NODE_RANK); - } - - @Override - protected boolean visitBooleanQuery(BooleanQuery query) throws QueryParserException { - if (query.hasAnnotationType(Annotation.Type.NODE_RANK)) { - collectNodeRank(query.getAnnotationOf(Annotation.Type.NODE_RANK).get(), query); + public QueryRankVisitor() { + super(Annotation.Type.NODE_RANK); } - boolean found = false; - for (Query child : query.getChildren()) { - found |= child.accept(this); - } - return found; - } + @Override + protected boolean visitBooleanQuery(BooleanQuery query) throws QueryParserException { + if (query.hasAnnotationType(Annotation.Type.NODE_RANK)) { + collectNodeRank(query.getAnnotationOf(Annotation.Type.NODE_RANK).get(), query); + } - @Override - protected boolean visitQuery(Query query) throws QueryParserException { - if (query.hasAnnotationType(Annotation.Type.NODE_RANK)) { - collectNodeRank(query.getAnnotationOf(Annotation.Type.NODE_RANK).get(), query); - return true; + return query.getChildren().stream().anyMatch(child -> child.accept(this)); } - return false; - } + @Override + protected boolean visitQuery(Query query) throws QueryParserException { + if (query.hasAnnotationType(Annotation.Type.NODE_RANK)) { + collectNodeRank(query.getAnnotationOf(Annotation.Type.NODE_RANK).get(), query); + return true; + } - private void collectNodeRank(Annotation anno, Query query) { - Preconditions.checkArgument(anno.getType() == Annotation.Type.NODE_RANK); - int rank = (Integer) anno.getValue(); - nodeToRankMap.put(query, rank); - } + return false; + } - public IdentityHashMap getNodeToRankMap() { - return nodeToRankMap; - } + private void collectNodeRank(Annotation anno, Query query) { + Preconditions.checkArgument(anno.getType() == Annotation.Type.NODE_RANK); + int rank = (Integer) anno.getValue(); + nodeToRankMap.put(query, rank); + } + + public IdentityHashMap getNodeToRankMap() { + return nodeToRankMap; + } }