From 102483bc57024588b0a5efce30190994f17e65bd Mon Sep 17 00:00:00 2001
From: xiaoping <wjp719@gmail.com>
Date: Tue, 10 May 2022 19:10:00 +0800
Subject: [PATCH] fix bkd test logic error and doc error (#863)

---
 .../src/java/org/apache/lucene/util/RadixSelector.java   | 2 +-
 .../src/test/org/apache/lucene/util/bkd/TestBKD.java     | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/util/RadixSelector.java b/lucene/core/src/java/org/apache/lucene/util/RadixSelector.java
index 9ef63778642..6a916ed8f85 100644
--- a/lucene/core/src/java/org/apache/lucene/util/RadixSelector.java
+++ b/lucene/core/src/java/org/apache/lucene/util/RadixSelector.java
@@ -56,7 +56,7 @@ public abstract class RadixSelector extends Selector {
 
   /**
    * Return the k-th byte of the entry at index {@code i}, or {@code -1} if its length is less than
-   * or equal to {@code k}. This may only be called with a value of {@code i} between {@code 0}
+   * or equal to {@code k}. This may only be called with a value of {@code k} between {@code 0}
    * included and {@code maxLength} excluded.
    */
   protected abstract int byteAt(int i, int k);
diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java
index d187f5e9fd0..4552cd97cce 100644
--- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java
+++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java
@@ -1674,6 +1674,7 @@ public class TestBKD extends LuceneTestCase {
     final int numValues = 10;
     final int numBytesPerDim = TestUtil.nextInt(random(), 1, 4);
     final byte[][] pointValue = new byte[11][numBytesPerDim];
+    final int[] docId = new int[11];
     BKDWriter w =
         new BKDWriter(
             numValues + 1,
@@ -1684,6 +1685,7 @@ public class TestBKD extends LuceneTestCase {
             numValues);
     for (int i = 0; i < numValues + 1; i++) {
       random().nextBytes(pointValue[i]);
+      docId[i] = i;
     }
     MutablePointTree val =
         new MutablePointTree() {
@@ -1701,7 +1703,7 @@ public class TestBKD extends LuceneTestCase {
 
           @Override
           public int getDocID(int i) {
-            return i;
+            return docId[i];
           }
 
           @Override
@@ -1709,6 +1711,9 @@ public class TestBKD extends LuceneTestCase {
             byte[] temp = pointValue[i];
             pointValue[i] = pointValue[j];
             pointValue[j] = temp;
+            int tempDocId = docId[i];
+            docId[i] = docId[j];
+            docId[j] = tempDocId;
           }
 
           @Override
@@ -1729,7 +1734,7 @@ public class TestBKD extends LuceneTestCase {
           @Override
           public void visitDocValues(IntersectVisitor visitor) throws IOException {
             for (int i = 0; i < size(); i++) {
-              visitor.visit(i, pointValue[i]);
+              visitor.visit(docId[i], pointValue[i]);
             }
           }
         };