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

LUCENE-7513: Update to randomizedtesting 2.4.0.

This commit is contained in:
Dawid Weiss 2016-10-21 11:14:37 +02:00
parent 36e997d45c
commit a19ec194d2
25 changed files with 78 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -118,6 +118,8 @@ Optimizations
Other Other
* LUCENE-7513: Upgrade randomizedtesting to 2.4.0. (Dawid Weiss)
* LUCENE-7452: Block join query exception suggests how to find a doc, which * LUCENE-7452: Block join query exception suggests how to find a doc, which
violates orthogonality requirement. (Mikhail Khludnev) violates orthogonality requirement. (Mikhail Khludnev)

8
lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java
View File

@ -26,7 +26,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.TestUtil;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
public abstract class AbstractTestCompressionMode extends LuceneTestCase { public abstract class AbstractTestCompressionMode extends LuceneTestCase {
@ -35,7 +35,7 @@ public abstract class AbstractTestCompressionMode extends LuceneTestCase {
static byte[] randomArray() { static byte[] randomArray() {
final int max = random().nextBoolean() final int max = random().nextBoolean()
? random().nextInt(4) ? random().nextInt(4)
: random().nextInt(256); : random().nextInt(255);
final int length = random().nextBoolean() final int length = random().nextBoolean()
? random().nextInt(20) ? random().nextInt(20)
: random().nextInt(192 * 1024); : random().nextInt(192 * 1024);
@ -45,7 +45,7 @@ public abstract class AbstractTestCompressionMode extends LuceneTestCase {
static byte[] randomArray(int length, int max) { static byte[] randomArray(int length, int max) {
final byte[] arr = new byte[length]; final byte[] arr = new byte[length];
for (int i = 0; i < arr.length; ++i) { for (int i = 0; i < arr.length; ++i) {
arr[i] = (byte) RandomInts.randomIntBetween(random(), 0, max); arr[i] = (byte) RandomNumbers.randomIntBetween(random(), 0, max);
} }
return arr; return arr;
} }
@ -130,7 +130,7 @@ public abstract class AbstractTestCompressionMode extends LuceneTestCase {
} }
public void testIncompressible() throws IOException { public void testIncompressible() throws IOException {
final byte[] decompressed = new byte[RandomInts.randomIntBetween(random(), 20, 256)]; final byte[] decompressed = new byte[RandomNumbers.randomIntBetween(random(), 20, 256)];
for (int i = 0; i < decompressed.length; ++i) { for (int i = 0; i < decompressed.length; ++i) {
decompressed[i] = (byte) i; decompressed[i] = (byte) i;
} }

10
lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java
View File

@ -20,7 +20,7 @@ package org.apache.lucene.codecs.compressing;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
public abstract class AbstractTestLZ4CompressionMode extends AbstractTestCompressionMode { public abstract class AbstractTestLZ4CompressionMode extends AbstractTestCompressionMode {
@ -88,7 +88,7 @@ public abstract class AbstractTestLZ4CompressionMode extends AbstractTestCompres
public void testLongMatchs() throws IOException { public void testLongMatchs() throws IOException {
// match length >= 20 // match length >= 20
final byte[] decompressed = new byte[RandomInts.randomIntBetween(random(), 300, 1024)]; final byte[] decompressed = new byte[RandomNumbers.randomIntBetween(random(), 300, 1024)];
for (int i = 0; i < decompressed.length; ++i) { for (int i = 0; i < decompressed.length; ++i) {
decompressed[i] = (byte) i; decompressed[i] = (byte) i;
} }
@ -97,10 +97,10 @@ public abstract class AbstractTestLZ4CompressionMode extends AbstractTestCompres
public void testLongLiterals() throws IOException { public void testLongLiterals() throws IOException {
// long literals (length >= 16) which are not the last literals // long literals (length >= 16) which are not the last literals
final byte[] decompressed = randomArray(RandomInts.randomIntBetween(random(), 400, 1024), 256); final byte[] decompressed = randomArray(RandomNumbers.randomIntBetween(random(), 400, 1024), 256);
final int matchRef = random().nextInt(30); final int matchRef = random().nextInt(30);
final int matchOff = RandomInts.randomIntBetween(random(), decompressed.length - 40, decompressed.length - 20); final int matchOff = RandomNumbers.randomIntBetween(random(), decompressed.length - 40, decompressed.length - 20);
final int matchLength = RandomInts.randomIntBetween(random(), 4, 10); final int matchLength = RandomNumbers.randomIntBetween(random(), 4, 10);
System.arraycopy(decompressed, matchRef, decompressed, matchOff, matchLength); System.arraycopy(decompressed, matchRef, decompressed, matchOff, matchLength);
test(decompressed); test(decompressed);
} }

8
lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestForUtil.java
View File

@ -32,24 +32,24 @@ import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedInts;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
public class TestForUtil extends LuceneTestCase { public class TestForUtil extends LuceneTestCase {
public void testEncodeDecode() throws IOException { public void testEncodeDecode() throws IOException {
final int iterations = RandomInts.randomIntBetween(random(), 1, 1000); final int iterations = RandomNumbers.randomIntBetween(random(), 1, 1000);
final float acceptableOverheadRatio = random().nextFloat(); final float acceptableOverheadRatio = random().nextFloat();
final int[] values = new int[(iterations - 1) * BLOCK_SIZE + ForUtil.MAX_DATA_SIZE]; final int[] values = new int[(iterations - 1) * BLOCK_SIZE + ForUtil.MAX_DATA_SIZE];
for (int i = 0; i < iterations; ++i) { for (int i = 0; i < iterations; ++i) {
final int bpv = random().nextInt(32); final int bpv = random().nextInt(32);
if (bpv == 0) { if (bpv == 0) {
final int value = RandomInts.randomIntBetween(random(), 0, Integer.MAX_VALUE); final int value = RandomNumbers.randomIntBetween(random(), 0, Integer.MAX_VALUE);
for (int j = 0; j < BLOCK_SIZE; ++j) { for (int j = 0; j < BLOCK_SIZE; ++j) {
values[i * BLOCK_SIZE + j] = value; values[i * BLOCK_SIZE + j] = value;
} }
} else { } else {
for (int j = 0; j < BLOCK_SIZE; ++j) { for (int j = 0; j < BLOCK_SIZE; ++j) {
values[i * BLOCK_SIZE + j] = RandomInts.randomIntBetween(random(), values[i * BLOCK_SIZE + j] = RandomNumbers.randomIntBetween(random(),
0, (int) PackedInts.maxValue(bpv)); 0, (int) PackedInts.maxValue(bpv));
} }
} }

4
lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java
View File

@ -30,7 +30,7 @@ import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
/** /**
* This test creates an index with one segment that is a little larger than 4GB. * This test creates an index with one segment that is a little larger than 4GB.
@ -69,7 +69,7 @@ public class Test4GBStoredFields extends LuceneTestCase {
final FieldType ft = new FieldType(); final FieldType ft = new FieldType();
ft.setStored(true); ft.setStored(true);
ft.freeze(); ft.freeze();
final int valueLength = RandomInts.randomIntBetween(random(), 1 << 13, 1 << 20); final int valueLength = RandomNumbers.randomIntBetween(random(), 1 << 13, 1 << 20);
final byte[] value = new byte[valueLength]; final byte[] value = new byte[valueLength];
for (int i = 0; i < valueLength; ++i) { for (int i = 0; i < valueLength; ++i) {
// random so that even compressing codecs can't compress it // random so that even compressing codecs can't compress it

4
lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
View File

@ -34,7 +34,7 @@ import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.TestUtil;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
public class TestBooleanOr extends LuceneTestCase { public class TestBooleanOr extends LuceneTestCase {
@ -239,7 +239,7 @@ public class TestBooleanOr extends LuceneTestCase {
if (i == matches.length) { if (i == matches.length) {
return DocIdSetIterator.NO_MORE_DOCS; return DocIdSetIterator.NO_MORE_DOCS;
} }
return RandomInts.randomIntBetween(random(), max, matches[i]); return RandomNumbers.randomIntBetween(random(), max, matches[i]);
} }
@Override @Override
public long cost() { public long cost() {

6
lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java
View File

@ -23,7 +23,7 @@ import java.util.List;
import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedInts;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
@Slow @Slow
public class TestTimSorterWorstCase extends LuceneTestCase { public class TestTimSorterWorstCase extends LuceneTestCase {
@ -33,9 +33,9 @@ public class TestTimSorterWorstCase extends LuceneTestCase {
// but not so big we blow up available heap. // but not so big we blow up available heap.
final int length; final int length;
if (TEST_NIGHTLY) { if (TEST_NIGHTLY) {
length = RandomInts.randomIntBetween(random(), 140000000, 400000000); length = RandomNumbers.randomIntBetween(random(), 140000000, 400000000);
} else { } else {
length = RandomInts.randomIntBetween(random(), 140000000, 200000000); length = RandomNumbers.randomIntBetween(random(), 140000000, 200000000);
} }
final PackedInts.Mutable arr = generateWorstCaseArray(length); final PackedInts.Mutable arr = generateWorstCaseArray(length);
new TimSorter(0) { new TimSorter(0) {

4
lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java
View File

@ -21,7 +21,7 @@ import java.util.*;
import org.apache.lucene.util.*; import org.apache.lucene.util.*;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
import static org.apache.lucene.util.automaton.Operations.DEFAULT_MAX_DETERMINIZED_STATES; import static org.apache.lucene.util.automaton.Operations.DEFAULT_MAX_DETERMINIZED_STATES;
@ -29,7 +29,7 @@ public class TestOperations extends LuceneTestCase {
/** Test string union. */ /** Test string union. */
public void testStringUnion() { public void testStringUnion() {
List<BytesRef> strings = new ArrayList<>(); List<BytesRef> strings = new ArrayList<>();
for (int i = RandomInts.randomIntBetween(random(), 0, 1000); --i >= 0;) { for (int i = RandomNumbers.randomIntBetween(random(), 0, 1000); --i >= 0;) {
strings.add(new BytesRef(TestUtil.randomUnicodeString(random()))); strings.add(new BytesRef(TestUtil.randomUnicodeString(random())));
} }

14
lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
View File

@ -42,14 +42,14 @@ import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.packed.PackedInts.Reader; import org.apache.lucene.util.packed.PackedInts.Reader;
import org.junit.Ignore; import org.junit.Ignore;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
public class TestPackedInts extends LuceneTestCase { public class TestPackedInts extends LuceneTestCase {
public void testByteCount() { public void testByteCount() {
final int iters = atLeast(3); final int iters = atLeast(3);
for (int i = 0; i < iters; ++i) { for (int i = 0; i < iters; ++i) {
final int valueCount = RandomInts.randomIntBetween(random(), 1, Integer.MAX_VALUE); final int valueCount = RandomNumbers.randomIntBetween(random(), 1, Integer.MAX_VALUE);
for (PackedInts.Format format : PackedInts.Format.values()) { for (PackedInts.Format format : PackedInts.Format.values()) {
for (int bpv = 1; bpv <= 64; ++bpv) { for (int bpv = 1; bpv <= 64; ++bpv) {
final long byteCount = format.byteCount(PackedInts.VERSION_CURRENT, valueCount, bpv); final long byteCount = format.byteCount(PackedInts.VERSION_CURRENT, valueCount, bpv);
@ -206,7 +206,7 @@ public class TestPackedInts extends LuceneTestCase {
public void testEndPointer() throws IOException { public void testEndPointer() throws IOException {
final Directory dir = newDirectory(); final Directory dir = newDirectory();
final int valueCount = RandomInts.randomIntBetween(random(), 1, 1000); final int valueCount = RandomNumbers.randomIntBetween(random(), 1, 1000);
final IndexOutput out = dir.createOutput("tests.bin", newIOContext(random())); final IndexOutput out = dir.createOutput("tests.bin", newIOContext(random()));
for (int i = 0; i < valueCount; ++i) { for (int i = 0; i < valueCount; ++i) {
out.writeLong(0); out.writeLong(0);
@ -224,7 +224,7 @@ public class TestPackedInts extends LuceneTestCase {
// test iterator // test iterator
in.seek(0L); in.seek(0L);
final PackedInts.ReaderIterator it = PackedInts.getReaderIteratorNoHeader(in, format, version, valueCount, bpv, RandomInts.randomIntBetween(random(), 1, 1<<16)); final PackedInts.ReaderIterator it = PackedInts.getReaderIteratorNoHeader(in, format, version, valueCount, bpv, RandomNumbers.randomIntBetween(random(), 1, 1<<16));
for (int i = 0; i < valueCount; ++i) { for (int i = 0; i < valueCount; ++i) {
it.next(); it.next();
} }
@ -981,9 +981,9 @@ public class TestPackedInts extends LuceneTestCase {
} }
public void testPackedLongValues() { public void testPackedLongValues() {
final long[] arr = new long[RandomInts.randomIntBetween(random(), 1, TEST_NIGHTLY ? 1000000 : 100000)]; final long[] arr = new long[RandomNumbers.randomIntBetween(random(), 1, TEST_NIGHTLY ? 1000000 : 100000)];
float[] ratioOptions = new float[]{PackedInts.DEFAULT, PackedInts.COMPACT, PackedInts.FAST}; float[] ratioOptions = new float[]{PackedInts.DEFAULT, PackedInts.COMPACT, PackedInts.FAST};
for (int bpv : new int[]{0, 1, 63, 64, RandomInts.randomIntBetween(random(), 2, 62)}) { for (int bpv : new int[]{0, 1, 63, 64, RandomNumbers.randomIntBetween(random(), 2, 62)}) {
for (DataType dataType : Arrays.asList(DataType.DELTA_PACKED)) { for (DataType dataType : Arrays.asList(DataType.DELTA_PACKED)) {
final int pageSize = 1 << TestUtil.nextInt(random(), 6, 20); final int pageSize = 1 << TestUtil.nextInt(random(), 6, 20);
float acceptableOverheadRatio = ratioOptions[TestUtil.nextInt(random(), 0, ratioOptions.length - 1)]; float acceptableOverheadRatio = ratioOptions[TestUtil.nextInt(random(), 0, ratioOptions.length - 1)];
@ -1063,7 +1063,7 @@ public class TestPackedInts extends LuceneTestCase {
final int[] bitsPerValues = new int[longs.length]; final int[] bitsPerValues = new int[longs.length];
final boolean[] skip = new boolean[longs.length]; final boolean[] skip = new boolean[longs.length];
for (int i = 0; i < longs.length; ++i) { for (int i = 0; i < longs.length; ++i) {
final int bpv = RandomInts.randomIntBetween(random(), 1, 64); final int bpv = RandomNumbers.randomIntBetween(random(), 1, 64);
bitsPerValues[i] = random().nextBoolean() ? bpv : TestUtil.nextInt(random(), bpv, 64); bitsPerValues[i] = random().nextBoolean() ? bpv : TestUtil.nextInt(random(), bpv, 64);
if (bpv == 64) { if (bpv == 64) {
longs[i] = random().nextLong(); longs[i] = random().nextLong();

2
lucene/ivy-versions.properties
View File

@ -7,7 +7,7 @@
/cglib/cglib-nodep = 2.2 /cglib/cglib-nodep = 2.2
/com.adobe.xmp/xmpcore = 5.1.2 /com.adobe.xmp/xmpcore = 5.1.2
com.carrotsearch.randomizedtesting.version = 2.3.4 com.carrotsearch.randomizedtesting.version = 2.4.0
/com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
/com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}

18
lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
View File

@ -95,7 +95,7 @@ import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedInts;
import org.junit.Test; import org.junit.Test;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.generators.RandomPicks;
public class TestJoinUtil extends LuceneTestCase { public class TestJoinUtil extends LuceneTestCase {
@ -517,7 +517,7 @@ public class TestJoinUtil extends LuceneTestCase {
Map<String, Float> lowestScoresPerParent = new HashMap<>(); Map<String, Float> lowestScoresPerParent = new HashMap<>();
Map<String, Float> highestScoresPerParent = new HashMap<>(); Map<String, Float> highestScoresPerParent = new HashMap<>();
int numParents = RandomInts.randomIntBetween(random(), 16, 64); int numParents = RandomNumbers.randomIntBetween(random(), 16, 64);
for (int p = 0; p < numParents; p++) { for (int p = 0; p < numParents; p++) {
String parentId = Integer.toString(p); String parentId = Integer.toString(p);
Document parentDoc = new Document(); Document parentDoc = new Document();
@ -525,7 +525,7 @@ public class TestJoinUtil extends LuceneTestCase {
parentDoc.add(new StringField("type", "to", Field.Store.NO)); parentDoc.add(new StringField("type", "to", Field.Store.NO));
parentDoc.add(new SortedDocValuesField("join_field", new BytesRef(parentId))); parentDoc.add(new SortedDocValuesField("join_field", new BytesRef(parentId)));
iw.addDocument(parentDoc); iw.addDocument(parentDoc);
int numChildren = RandomInts.randomIntBetween(random(), 2, 16); int numChildren = RandomNumbers.randomIntBetween(random(), 2, 16);
int lowest = Integer.MAX_VALUE; int lowest = Integer.MAX_VALUE;
int highest = Integer.MIN_VALUE; int highest = Integer.MIN_VALUE;
for (int c = 0; c < numChildren; c++) { for (int c = 0; c < numChildren; c++) {
@ -589,7 +589,7 @@ public class TestJoinUtil extends LuceneTestCase {
int minChildDocsPerParent = 2; int minChildDocsPerParent = 2;
int maxChildDocsPerParent = 16; int maxChildDocsPerParent = 16;
int numParents = RandomInts.randomIntBetween(random(), 16, 64); int numParents = RandomNumbers.randomIntBetween(random(), 16, 64);
int[] childDocsPerParent = new int[numParents]; int[] childDocsPerParent = new int[numParents];
for (int p = 0; p < numParents; p++) { for (int p = 0; p < numParents; p++) {
String parentId = Integer.toString(p); String parentId = Integer.toString(p);
@ -598,7 +598,7 @@ public class TestJoinUtil extends LuceneTestCase {
parentDoc.add(new StringField("type", "to", Field.Store.NO)); parentDoc.add(new StringField("type", "to", Field.Store.NO));
parentDoc.add(new SortedDocValuesField("join_field", new BytesRef(parentId))); parentDoc.add(new SortedDocValuesField("join_field", new BytesRef(parentId)));
iw.addDocument(parentDoc); iw.addDocument(parentDoc);
int numChildren = RandomInts.randomIntBetween(random(), minChildDocsPerParent, maxChildDocsPerParent); int numChildren = RandomNumbers.randomIntBetween(random(), minChildDocsPerParent, maxChildDocsPerParent);
childDocsPerParent[p] = numChildren; childDocsPerParent[p] = numChildren;
for (int c = 0; c < numChildren; c++) { for (int c = 0; c < numChildren; c++) {
String childId = Integer.toString(p + c); String childId = Integer.toString(p + c);
@ -622,11 +622,11 @@ public class TestJoinUtil extends LuceneTestCase {
Query fromQuery = new TermQuery(new Term("type", "from")); Query fromQuery = new TermQuery(new Term("type", "from"));
Query toQuery = new TermQuery(new Term("type", "to")); Query toQuery = new TermQuery(new Term("type", "to"));
int iters = RandomInts.randomIntBetween(random(), 3, 9); int iters = RandomNumbers.randomIntBetween(random(), 3, 9);
for (int i = 1; i <= iters; i++) { for (int i = 1; i <= iters; i++) {
final ScoreMode scoreMode = ScoreMode.values()[random().nextInt(ScoreMode.values().length)]; final ScoreMode scoreMode = ScoreMode.values()[random().nextInt(ScoreMode.values().length)];
int min = RandomInts.randomIntBetween(random(), minChildDocsPerParent, maxChildDocsPerParent - 1); int min = RandomNumbers.randomIntBetween(random(), minChildDocsPerParent, maxChildDocsPerParent - 1);
int max = RandomInts.randomIntBetween(random(), min, maxChildDocsPerParent); int max = RandomNumbers.randomIntBetween(random(), min, maxChildDocsPerParent);
if (VERBOSE) { if (VERBOSE) {
System.out.println("iter=" + i); System.out.println("iter=" + i);
System.out.println("scoreMode=" + scoreMode); System.out.println("scoreMode=" + scoreMode);
@ -1067,7 +1067,7 @@ public class TestJoinUtil extends LuceneTestCase {
); );
IndexIterationContext context = new IndexIterationContext(); IndexIterationContext context = new IndexIterationContext();
int numRandomValues = nDocs / RandomInts.randomIntBetween(random, 1, 4); int numRandomValues = nDocs / RandomNumbers.randomIntBetween(random, 1, 4);
context.randomUniqueValues = new String[numRandomValues]; context.randomUniqueValues = new String[numRandomValues];
Set<String> trackSet = new HashSet<>(); Set<String> trackSet = new HashSet<>();
context.randomFrom = new boolean[numRandomValues]; context.randomFrom = new boolean[numRandomValues];

1
lucene/licenses/randomizedtesting-runner-2.3.4.jar.sha1
View File

@ -1 +0,0 @@
9f4c0e1de0837092115c89a38c12ae57db6983e7

1
lucene/licenses/randomizedtesting-runner-2.4.0.jar.sha1 Normal file
View File

@ -0,0 +1 @@
0222eb23dd6f45541acf6a5ac69cd9e9bdce25d2

4
lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
View File

@ -38,7 +38,7 @@ import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedInts;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
public class TestDocValuesFieldSources extends LuceneTestCase { public class TestDocValuesFieldSources extends LuceneTestCase {
@ -81,7 +81,7 @@ public class TestDocValuesFieldSources extends LuceneTestCase {
f.setBytesValue(new BytesRef((String) vals[i])); f.setBytesValue(new BytesRef((String) vals[i]));
break; break;
case NUMERIC: case NUMERIC:
final int bitsPerValue = RandomInts.randomIntBetween(random(), 1, 31); // keep it an int final int bitsPerValue = RandomNumbers.randomIntBetween(random(), 1, 31); // keep it an int
vals[i] = (long) random().nextInt((int) PackedInts.maxValue(bitsPerValue)); vals[i] = (long) random().nextInt((int) PackedInts.maxValue(bitsPerValue));
f.setLongValue((Long) vals[i]); f.setLongValue((Long) vals[i]);
break; break;

10
lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
View File

@ -80,7 +80,7 @@ import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util.StringHelper; import org.apache.lucene.util.StringHelper;
import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.TestUtil;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
public class TestGeo3DPoint extends LuceneTestCase { public class TestGeo3DPoint extends LuceneTestCase {
@ -206,7 +206,7 @@ public class TestGeo3DPoint extends LuceneTestCase {
int iters = atLeast(10); int iters = atLeast(10);
int recurseDepth = RandomInts.randomIntBetween(random(), 5, 15); int recurseDepth = RandomNumbers.randomIntBetween(random(), 5, 15);
iters = atLeast(50); iters = atLeast(50);
@ -358,7 +358,7 @@ public class TestGeo3DPoint extends LuceneTestCase {
case 0: case 0:
// Split on X: // Split on X:
{ {
int splitValue = RandomInts.randomIntBetween(random(), cell.xMinEnc, cell.xMaxEnc); int splitValue = RandomNumbers.randomIntBetween(random(), cell.xMinEnc, cell.xMaxEnc);
if (VERBOSE) { if (VERBOSE) {
log.println(" now split on x=" + splitValue); log.println(" now split on x=" + splitValue);
} }
@ -384,7 +384,7 @@ public class TestGeo3DPoint extends LuceneTestCase {
case 1: case 1:
// Split on Y: // Split on Y:
{ {
int splitValue = RandomInts.randomIntBetween(random(), cell.yMinEnc, cell.yMaxEnc); int splitValue = RandomNumbers.randomIntBetween(random(), cell.yMinEnc, cell.yMaxEnc);
if (VERBOSE) { if (VERBOSE) {
log.println(" now split on y=" + splitValue); log.println(" now split on y=" + splitValue);
} }
@ -410,7 +410,7 @@ public class TestGeo3DPoint extends LuceneTestCase {
case 2: case 2:
// Split on Z: // Split on Z:
{ {
int splitValue = RandomInts.randomIntBetween(random(), cell.zMinEnc, cell.zMaxEnc); int splitValue = RandomNumbers.randomIntBetween(random(), cell.zMinEnc, cell.zMaxEnc);
if (VERBOSE) { if (VERBOSE) {
log.println(" now split on z=" + splitValue); log.println(" now split on z=" + splitValue);
} }

14
lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java
View File

@ -24,7 +24,7 @@ import org.apache.lucene.codecs.TermVectorsFormat;
import org.apache.lucene.codecs.compressing.dummy.DummyCompressingCodec; import org.apache.lucene.codecs.compressing.dummy.DummyCompressingCodec;
import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.TestUtil;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
/** /**
* A codec that uses {@link CompressingStoredFieldsFormat} for its stored * A codec that uses {@link CompressingStoredFieldsFormat} for its stored
@ -55,9 +55,9 @@ public abstract class CompressingCodec extends FilterCodec {
* suffix * suffix
*/ */
public static CompressingCodec randomInstance(Random random) { public static CompressingCodec randomInstance(Random random) {
final int chunkSize = random.nextBoolean() ? RandomInts.randomIntBetween(random, 1, 10) : RandomInts.randomIntBetween(random, 1, 1 << 15); final int chunkSize = random.nextBoolean() ? RandomNumbers.randomIntBetween(random, 1, 10) : RandomNumbers.randomIntBetween(random, 1, 1 << 15);
final int chunkDocs = random.nextBoolean() ? RandomInts.randomIntBetween(random, 1, 10) : RandomInts.randomIntBetween(random, 64, 1024); final int chunkDocs = random.nextBoolean() ? RandomNumbers.randomIntBetween(random, 1, 10) : RandomNumbers.randomIntBetween(random, 64, 1024);
final int blockSize = random.nextBoolean() ? RandomInts.randomIntBetween(random, 1, 10) : RandomInts.randomIntBetween(random, 1, 1024); final int blockSize = random.nextBoolean() ? RandomNumbers.randomIntBetween(random, 1, 10) : RandomNumbers.randomIntBetween(random, 1, 1024);
return randomInstance(random, chunkSize, chunkDocs, false, blockSize); return randomInstance(random, chunkSize, chunkDocs, false, blockSize);
} }
@ -79,10 +79,10 @@ public abstract class CompressingCodec extends FilterCodec {
*/ */
public static CompressingCodec randomInstance(Random random, boolean withSegmentSuffix) { public static CompressingCodec randomInstance(Random random, boolean withSegmentSuffix) {
return randomInstance(random, return randomInstance(random,
RandomInts.randomIntBetween(random, 1, 1 << 15), RandomNumbers.randomIntBetween(random, 1, 1 << 15),
RandomInts.randomIntBetween(random, 64, 1024), RandomNumbers.randomIntBetween(random, 64, 1024),
withSegmentSuffix, withSegmentSuffix,
RandomInts.randomIntBetween(random, 1, 1024)); RandomNumbers.randomIntBetween(random, 1, 1024));
} }
private final CompressingStoredFieldsFormat storedFieldsFormat; private final CompressingStoredFieldsFormat storedFieldsFormat;

22
lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
View File

@ -53,7 +53,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.TestUtil;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.generators.RandomPicks;
import com.carrotsearch.randomizedtesting.generators.RandomStrings; import com.carrotsearch.randomizedtesting.generators.RandomStrings;
@ -320,7 +320,7 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
public void testReadSkip() throws IOException { public void testReadSkip() throws IOException {
Directory dir = newDirectory(); Directory dir = newDirectory();
IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random())); IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random()));
iwConf.setMaxBufferedDocs(RandomInts.randomIntBetween(random(), 2, 30)); iwConf.setMaxBufferedDocs(RandomNumbers.randomIntBetween(random(), 2, 30));
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf); RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf);
FieldType ft = new FieldType(); FieldType ft = new FieldType();
@ -373,7 +373,7 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
public void testEmptyDocs() throws IOException { public void testEmptyDocs() throws IOException {
Directory dir = newDirectory(); Directory dir = newDirectory();
IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random())); IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random()));
iwConf.setMaxBufferedDocs(RandomInts.randomIntBetween(random(), 2, 30)); iwConf.setMaxBufferedDocs(RandomNumbers.randomIntBetween(random(), 2, 30));
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf); RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf);
// make sure that the fact that documents might be empty is not a problem // make sure that the fact that documents might be empty is not a problem
@ -398,7 +398,7 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
public void testConcurrentReads() throws Exception { public void testConcurrentReads() throws Exception {
Directory dir = newDirectory(); Directory dir = newDirectory();
IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random())); IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random()));
iwConf.setMaxBufferedDocs(RandomInts.randomIntBetween(random(), 2, 30)); iwConf.setMaxBufferedDocs(RandomNumbers.randomIntBetween(random(), 2, 30));
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf); RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf);
// make sure the readers are properly cloned // make sure the readers are properly cloned
@ -486,15 +486,15 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
} }
Directory dir = newDirectory(); Directory dir = newDirectory();
IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random())); IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random()));
iwConf.setMaxBufferedDocs(RandomInts.randomIntBetween(random(), 2, 30)); iwConf.setMaxBufferedDocs(RandomNumbers.randomIntBetween(random(), 2, 30));
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf); RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf);
final int docCount = atLeast(200); final int docCount = atLeast(200);
final byte[][][] data = new byte [docCount][][]; final byte[][][] data = new byte [docCount][][];
for (int i = 0; i < docCount; ++i) { for (int i = 0; i < docCount; ++i) {
final int fieldCount = rarely() final int fieldCount = rarely()
? RandomInts.randomIntBetween(random(), 1, 500) ? RandomNumbers.randomIntBetween(random(), 1, 500)
: RandomInts.randomIntBetween(random(), 1, 5); : RandomNumbers.randomIntBetween(random(), 1, 5);
data[i] = new byte[fieldCount][]; data[i] = new byte[fieldCount][];
for (int j = 0; j < fieldCount; ++j) { for (int j = 0; j < fieldCount; ++j) {
final int length = rarely() final int length = rarely()
@ -669,7 +669,7 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
// so if we get NRTCachingDir+SimpleText, we make massive stored fields and OOM (LUCENE-4484) // so if we get NRTCachingDir+SimpleText, we make massive stored fields and OOM (LUCENE-4484)
Directory dir = new MockDirectoryWrapper(random(), new MMapDirectory(createTempDir("testBigDocuments"))); Directory dir = new MockDirectoryWrapper(random(), new MMapDirectory(createTempDir("testBigDocuments")));
IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random())); IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random()));
iwConf.setMaxBufferedDocs(RandomInts.randomIntBetween(random(), 2, 30)); iwConf.setMaxBufferedDocs(RandomNumbers.randomIntBetween(random(), 2, 30));
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf); RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf);
if (dir instanceof MockDirectoryWrapper) { if (dir instanceof MockDirectoryWrapper) {
@ -689,12 +689,12 @@ public abstract class BaseStoredFieldsFormatTestCase extends BaseIndexFileFormat
onlyStored.setIndexOptions(IndexOptions.NONE); onlyStored.setIndexOptions(IndexOptions.NONE);
final Field smallField = new Field("fld", randomByteArray(random().nextInt(10), 256), onlyStored); final Field smallField = new Field("fld", randomByteArray(random().nextInt(10), 256), onlyStored);
final int numFields = RandomInts.randomIntBetween(random(), 500000, 1000000); final int numFields = RandomNumbers.randomIntBetween(random(), 500000, 1000000);
for (int i = 0; i < numFields; ++i) { for (int i = 0; i < numFields; ++i) {
bigDoc1.add(smallField); bigDoc1.add(smallField);
} }
final Field bigField = new Field("fld", randomByteArray(RandomInts.randomIntBetween(random(), 1000000, 5000000), 2), onlyStored); final Field bigField = new Field("fld", randomByteArray(RandomNumbers.randomIntBetween(random(), 1000000, 5000000), 2), onlyStored);
bigDoc2.add(bigField); bigDoc2.add(bigField);
final int numDocs = atLeast(5); final int numDocs = atLeast(5);

4
lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java
View File

@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
/** Wraps a Scorer with additional checks */ /** Wraps a Scorer with additional checks */
final class AssertingBulkScorer extends BulkScorer { final class AssertingBulkScorer extends BulkScorer {
@ -82,7 +82,7 @@ final class AssertingBulkScorer extends BulkScorer {
assert next == DocIdSetIterator.NO_MORE_DOCS; assert next == DocIdSetIterator.NO_MORE_DOCS;
return DocIdSetIterator.NO_MORE_DOCS; return DocIdSetIterator.NO_MORE_DOCS;
} else { } else {
return RandomInts.randomIntBetween(random, max, next); return RandomNumbers.randomIntBetween(random, max, next);
} }
} }

4
lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java
View File

@ -18,7 +18,7 @@ package org.apache.lucene.search;
import java.io.IOException; import java.io.IOException;
import java.util.Random; import java.util.Random;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.LeafReaderContext;
@ -185,7 +185,7 @@ public class RandomApproximationQuery extends Query {
if (disi.docID() == NO_MORE_DOCS) { if (disi.docID() == NO_MORE_DOCS) {
return doc = NO_MORE_DOCS; return doc = NO_MORE_DOCS;
} }
return doc = RandomInts.randomIntBetween(random, target, disi.docID()); return doc = RandomNumbers.randomIntBetween(random, target, disi.docID());
} }
@Override @Override

6
lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
View File

@ -100,7 +100,7 @@ import org.apache.lucene.store.NoLockFactory;
import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.store.RAMDirectory;
import org.junit.Assert; import org.junit.Assert;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.generators.RandomPicks;
/** /**
@ -429,7 +429,7 @@ public final class TestUtil {
/** start and end are BOTH inclusive */ /** start and end are BOTH inclusive */
public static int nextInt(Random r, int start, int end) { public static int nextInt(Random r, int start, int end) {
return RandomInts.randomIntBetween(r, start, end); return RandomNumbers.randomIntBetween(r, start, end);
} }
/** start and end are BOTH inclusive */ /** start and end are BOTH inclusive */
@ -580,7 +580,7 @@ public final class TestUtil {
final StringBuilder regexp = new StringBuilder(maxLength); final StringBuilder regexp = new StringBuilder(maxLength);
for (int i = nextInt(r, 0, maxLength); i > 0; i--) { for (int i = nextInt(r, 0, maxLength); i > 0; i--) {
if (r.nextBoolean()) { if (r.nextBoolean()) {
regexp.append((char) RandomInts.randomIntBetween(r, 'a', 'z')); regexp.append((char) RandomNumbers.randomIntBetween(r, 'a', 'z'));
} else { } else {
regexp.append(RandomPicks.randomFrom(r, ops)); regexp.append(RandomPicks.randomFrom(r, ops));
} }

4
lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
View File

@ -36,7 +36,7 @@ import org.apache.lucene.index.NoMergePolicy;
import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteArrayDataInput;
import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.store.ByteArrayDataOutput;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
public class TestCompressingStoredFieldsFormat extends BaseStoredFieldsFormatTestCase { public class TestCompressingStoredFieldsFormat extends BaseStoredFieldsFormatTestCase {
@ -52,7 +52,7 @@ public class TestCompressingStoredFieldsFormat extends BaseStoredFieldsFormatTes
public void testDeletePartiallyWrittenFilesIfAbort() throws IOException { public void testDeletePartiallyWrittenFilesIfAbort() throws IOException {
Directory dir = newDirectory(); Directory dir = newDirectory();
IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random())); IndexWriterConfig iwConf = newIndexWriterConfig(new MockAnalyzer(random()));
iwConf.setMaxBufferedDocs(RandomInts.randomIntBetween(random(), 2, 30)); iwConf.setMaxBufferedDocs(RandomNumbers.randomIntBetween(random(), 2, 30));
iwConf.setCodec(CompressingCodec.randomInstance(random())); iwConf.setCodec(CompressingCodec.randomInstance(random()));
// disable CFS because this test checks file names // disable CFS because this test checks file names
iwConf.setMergePolicy(newLogMergePolicy(false)); iwConf.setMergePolicy(newLogMergePolicy(false));

1
solr/licenses/junit4-ant-2.3.4.jar.sha1
View File

@ -1 +0,0 @@
aafd329c4ddd57c539bdea9e4e5a4a688e142181

1
solr/licenses/junit4-ant-2.4.0.jar.sha1 Normal file
View File

@ -0,0 +1 @@
35ed49c7aafcceac5b0b1cb157a07dd94e09515c

1
solr/licenses/randomizedtesting-runner-2.3.4.jar.sha1
View File

@ -1 +0,0 @@
9f4c0e1de0837092115c89a38c12ae57db6983e7

1
solr/licenses/randomizedtesting-runner-2.4.0.jar.sha1 Normal file
View File

@ -0,0 +1 @@
0222eb23dd6f45541acf6a5ac69cd9e9bdce25d2