Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-10343: Remove MyRandom in favor of test framework random (#573)

This commit is contained in:
gf2121 2022-01-05 22:31:00 +08:00 committed by GitHub
parent 60b80017cb
commit 238119224a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectPacked.java
View File

@ -16,9 +16,9 @@
*/
package org.apache.lucene.backward_codecs.packed;
import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
import java.util.Random;
import org.apache.lucene.backward_codecs.store.EndiannessReverserUtil;
import org.apache.lucene.store.ByteArrayDataInput;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
@ -27,6 +27,7 @@ import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase.Nightly;
import org.apache.lucene.tests.util.TestUtil;
import org.apache.lucene.util.LongValues;
import org.apache.lucene.util.packed.PackedInts;
@Nightly // N-2 formats are only tested on nightly runs
public class TestLegacyDirectPacked extends LuceneTestCase {
@ -96,7 +97,7 @@ public class TestLegacyDirectPacked extends LuceneTestCase {
}
private void doTestBpv(Directory directory, int bpv, long offset) throws Exception {
MyRandom random = new MyRandom(random().nextLong());
Random random = random();
int numIters = TEST_NIGHTLY ? 100 : 10;
for (int i = 0; i < numIters; i++) {
long[] original = randomLongs(random, bpv);
@ -124,29 +125,13 @@ public class TestLegacyDirectPacked extends LuceneTestCase {
}
}
private long[] randomLongs(MyRandom random, int bpv) {
private long[] randomLongs(Random random, int bpv) {
int amount = random.nextInt(5000);
long[] longs = new long[amount];
long max = PackedInts.maxValue(bpv);
for (int i = 0; i < longs.length; i++) {
longs[i] = random.nextLong(bpv);
longs[i] = RandomNumbers.randomLongBetween(random, 0, max);
}
return longs;
}
// java.util.Random only returns 48bits of randomness in nextLong...
static class MyRandom extends Random {
byte[] buffer = new byte[8];
ByteArrayDataInput input = new ByteArrayDataInput();
MyRandom(long seed) {
super(seed);
}
public synchronized long nextLong(int bpv) {
nextBytes(buffer);
input.reset(buffer);
long bits = input.readLong();
return bits >>> (64 - bpv);
}
}
}

26
lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java
View File

@ -16,8 +16,8 @@
*/
package org.apache.lucene.util.packed;
import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
import java.util.Random;
import org.apache.lucene.store.ByteArrayDataInput;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
@ -111,7 +111,7 @@ public class TestDirectPacked extends LuceneTestCase {
private void doTestBpv(Directory directory, int bpv, long offset, boolean merge)
throws Exception {
MyRandom random = new MyRandom(random().nextLong());
Random random = random();
int numIters = TEST_NIGHTLY ? 100 : 10;
for (int i = 0; i < numIters; i++) {
long[] original = randomLongs(random, bpv);
@ -145,29 +145,13 @@ public class TestDirectPacked extends LuceneTestCase {
}
}
private long[] randomLongs(MyRandom random, int bpv) {
private long[] randomLongs(Random random, int bpv) {
int amount = random.nextInt(5000);
long[] longs = new long[amount];
long max = PackedInts.maxValue(bpv);
for (int i = 0; i < longs.length; i++) {
longs[i] = random.nextLong(bpv);
longs[i] = RandomNumbers.randomLongBetween(random, 0, max);
}
return longs;
}
// java.util.Random only returns 48bits of randomness in nextLong...
static class MyRandom extends Random {
byte[] buffer = new byte[8];
ByteArrayDataInput input = new ByteArrayDataInput();
MyRandom(long seed) {
super(seed);
}
public synchronized long nextLong(int bpv) {
nextBytes(buffer);
input.reset(buffer);
long bits = input.readLong();
return bits >>> (64 - bpv);
}
}
}