wjp719 commented on a change in pull request #731: URL: https://github.com/apache/lucene/pull/731#discussion_r838052200
########## File path: lucene/sandbox/src/java/org/apache/lucene/sandbox/search/MultiRangeQuery.java ########## @@ -163,6 +165,60 @@ public void visit(QueryVisitor visitor) { } } + @Override + public Query rewrite(IndexReader reader) throws IOException { + List<RangeClause> mergedRanges = mergeOverlappingRanges(); + if (mergedRanges != rangeClauses) { + return new MultiRangeQuery(field, numDims, bytesPerDim, mergedRanges) { + @Override + protected String toString(int dimension, byte[] value) { + return MultiRangeQuery.this.toString(dimension, value); + } + }; + } else { + return this; + } + } + + private List<RangeClause> mergeOverlappingRanges() { + if (numDims != 1 || rangeClauses.size() <= 1) { + return rangeClauses; + } + List<RangeClause> originRangeClause = new ArrayList<>(rangeClauses); + final ArrayUtil.ByteArrayComparator comparator = ArrayUtil.getUnsignedComparator(bytesPerDim); + originRangeClause.sort( + new Comparator<RangeClause>() { + @Override + public int compare(RangeClause o1, RangeClause o2) { + int result = comparator.compare(o1.lowerValue, 0, o2.lowerValue, 0); + if (result == 0) { + return comparator.compare(o1.upperValue, 0, o2.upperValue, 0); + } else { + return result; + } + } + }); + List<RangeClause> finalRangeClause = new ArrayList<>(); + RangeClause current = originRangeClause.get(0); + for (int i = 1; i < originRangeClause.size(); i++) { + RangeClause nextClause = originRangeClause.get(i); + if (comparator.compare(nextClause.lowerValue, 0, current.upperValue, 0) > 0) { + finalRangeClause.add(current); + current = nextClause; + } else { + if (comparator.compare(nextClause.upperValue, 0, current.upperValue, 0) > 0) { + current = new RangeClause(current.lowerValue, nextClause.upperValue); + } + } + } + finalRangeClause.add(current); + if (finalRangeClause.size() != rangeClauses.size()) { Review comment: done -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org