jpountz commented on a change in pull request #91: URL: https://github.com/apache/lucene/pull/91#discussion_r630403562
########## File path: lucene/core/src/java/org/apache/lucene/util/StableMSBRadixSorter.java ########## @@ -0,0 +1,78 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.util; + +/** + * Stable radix sorter for variable-length strings. + * + * @lucene.internal + */ +public abstract class StableMSBRadixSorter extends MSBRadixSorter { + + public StableMSBRadixSorter(int maxLength) { + super(maxLength); + } + + /** Save the i-th value into the j-th position in temporary storage. */ + protected abstract void save(int i, int j); + + /** Restore values between i-th and j-th(excluding) in temporary storage into original storage. */ + protected abstract void restore(int i, int j); + + @Override + protected Sorter getFallbackSorter(int k) { + return new InPlaceMergeSorter() { + @Override + protected void swap(int i, int j) { + StableMSBRadixSorter.this.swap(i, j); + } + + @Override + protected int compare(int i, int j) { + for (int o = k; o < maxLength; ++o) { + final int b1 = byteAt(i, o); Review comment: do we need to call Byte.toUnsignedInt to make sure we compare negative bytes correctly? ########## File path: lucene/core/src/test/org/apache/lucene/util/bkd/TestMutablePointsReaderUtils.java ########## @@ -180,15 +189,16 @@ private static BKDConfig createRandomConfig() { } private static Point[] createRandomPoints( - BKDConfig config, int maxDoc, int[] commonPrefixLengths) { + BKDConfig config, int maxDoc, int[] commonPrefixLengths, boolean isDocIdIncremental) { assertTrue(commonPrefixLengths.length == config.numDims); final int numPoints = TestUtil.nextInt(random(), 1, 100000); Point[] points = new Point[numPoints]; - if (random().nextInt(5) != 0) { + if (random().nextInt(10) != 0) { for (int i = 0; i < numPoints; ++i) { byte[] value = new byte[config.packedBytesLength]; random().nextBytes(value); - points[i] = new Point(value, random().nextInt(maxDoc)); + points[i] = + new Point(value, isDocIdIncremental ? Math.min(i, maxDoc) : random().nextInt(maxDoc)); Review comment: ```suggestion new Point(value, isDocIdIncremental ? Math.min(i, maxDoc - 1) : random().nextInt(maxDoc)); ``` -- 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. 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
