[Git][java-team/lucene4.10][master] 6 commits: Import Debian changes 4.10.4+dfsg-5
Sudip Mukherjee
gitlab at salsa.debian.org
Fri Nov 6 18:02:48 GMT 2020
Sudip Mukherjee pushed to branch master at Debian Java Maintainers / lucene4.10
Commits:
5701db1e by Markus Koschany at 2020-09-18T16:21:35+01:00
Import Debian changes 4.10.4+dfsg-5
lucene4.10 (4.10.4+dfsg-5) unstable; urgency=medium
* Team upload.
* Add carrotsearch-juni4-ant.patch and do not require
libcarrotsearch-randomizedtesting-java as a test dependency anymore.
This allows us to remove libsimple-xml-java from Buster.
- - - - -
8c9d81d9 by Sudip Mukherjee at 2020-11-06T17:22:10+00:00
Add upstream patch to fix FTBFS
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
1895c928 by Sudip Mukherjee at 2020-11-06T17:35:16+00:00
Update Standards-Version to 4.5.0
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
f041a5d7 by Sudip Mukherjee at 2020-11-06T17:49:51+00:00
Use debhelper-compat and update compat level to 13
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
22d81744 by Sudip Mukherjee at 2020-11-06T17:51:05+00:00
Use https with copyright-format-uri
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
b5b3a5de by Sudip Mukherjee at 2020-11-06T17:52:29+00:00
Add changelog for 4.10.4+dfsg-6 release
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
7 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/carrotsearch-juni4-ant.patch
- + debian/patches/carrotsearch_random.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,23 @@
+lucene4.10 (4.10.4+dfsg-6) unstable; urgency=medium
+
+ * Team upload.
+ * Add upstream patch to fix FTBFS with updated carrotsearch-randomizedtesting.
+ * Update Standards-Version to 4.5.0
+ * Use debhelper-compat.
+ - Update compat level to 13.
+ * Use https with copyright-format-uri.
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com> Fri, 06 Nov 2020 17:52:13 +0000
+
+lucene4.10 (4.10.4+dfsg-5) unstable; urgency=medium
+
+ * Team upload.
+ * Add carrotsearch-juni4-ant.patch and do not require
+ libcarrotsearch-randomizedtesting-java as a test dependency anymore.
+ This allows us to remove libsimple-xml-java from Buster.
+
+ -- Markus Koschany <apo at debian.org> Wed, 17 Apr 2019 00:24:30 +0200
+
lucene4.10 (4.10.4+dfsg-4) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Hilko Bengen <bengen at debian.org>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
ivy-debian-helper,
javacc,
@@ -30,7 +30,7 @@ Build-Depends-Indep:
libuima-addons-java,
libuima-core-java,
libxerces2-java
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/java-team/lucene4.10.git
Vcs-Browser: https://salsa.debian.org/java-team/lucene4.10
Homepage: http://lucene.apache.org
=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: lucene4
Source: <http://lucene.apache.org>
=====================================
debian/patches/carrotsearch-juni4-ant.patch
=====================================
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 14 Apr 2019 23:09:21 +0200
+Subject: carrotsearch juni4-ant
+
+Do not use com.carrotsearch.randomizedtesting, so that libsimple-xml-java can
+be removed from Buster.
+---
+ test-framework/ivy.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/test-framework/ivy.xml b/test-framework/ivy.xml
+index 7390a0a..ace6359 100644
+--- a/test-framework/ivy.xml
++++ b/test-framework/ivy.xml
+@@ -33,7 +33,6 @@
+
+ <dependency org="junit" name="junit" rev="${/junit/junit}" conf="compile,junit4-stdalone"/>
+ <dependency org="org.hamcrest" name="hamcrest-core" rev="debian" conf="compile,junit4-stdalone"/>
+- <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" conf="compile,junit4-stdalone"/>
+ <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" conf="compile,junit4-stdalone"/>
+
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
=====================================
debian/patches/carrotsearch_random.patch
=====================================
@@ -0,0 +1,377 @@
+Description: Fix FTBFS caused by update of carrotsearch-randomizedtesting
+
+upstream link: https://github.com/apache/lucene-solr/commit/a19ec194d25692f13e03d92450c1f261670e938a
+
+---
+
+--- lucene4.10-4.10.4+dfsg.orig/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java
++++ lucene4.10-4.10.4+dfsg/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java
+@@ -26,7 +26,7 @@ import org.apache.lucene.util.BytesRef;
+ import org.apache.lucene.util.LuceneTestCase;
+ import org.apache.lucene.util.TestUtil;
+
+-import com.carrotsearch.randomizedtesting.generators.RandomInts;
++import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
+
+ public abstract class AbstractTestCompressionMode extends LuceneTestCase {
+
+@@ -45,7 +45,7 @@ public abstract class AbstractTestCompre
+ static byte[] randomArray(int length, int max) {
+ final byte[] arr = new byte[length];
+ 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;
+ }
+@@ -130,7 +130,7 @@ public abstract class AbstractTestCompre
+ }
+
+ 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) {
+ decompressed[i] = (byte) i;
+ }
+--- lucene4.10-4.10.4+dfsg.orig/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java
++++ lucene4.10-4.10.4+dfsg/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java
+@@ -20,7 +20,7 @@ package org.apache.lucene.codecs.compres
+ import java.io.IOException;
+ import java.nio.charset.StandardCharsets;
+
+-import com.carrotsearch.randomizedtesting.generators.RandomInts;
++import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
+
+ public abstract class AbstractTestLZ4CompressionMode extends AbstractTestCompressionMode {
+
+@@ -88,7 +88,7 @@ public abstract class AbstractTestLZ4Com
+
+ public void testLongMatchs() throws IOException {
+ // 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) {
+ decompressed[i] = (byte) i;
+ }
+@@ -97,10 +97,10 @@ public abstract class AbstractTestLZ4Com
+
+ public void testLongLiterals() throws IOException {
+ // 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 matchOff = RandomInts.randomIntBetween(random(), decompressed.length - 40, decompressed.length - 20);
+- final int matchLength = RandomInts.randomIntBetween(random(), 4, 10);
++ final int matchOff = RandomNumbers.randomIntBetween(random(), decompressed.length - 40, decompressed.length - 20);
++ final int matchLength = RandomNumbers.randomIntBetween(random(), 4, 10);
+ System.arraycopy(decompressed, matchRef, decompressed, matchOff, matchLength);
+ test(decompressed);
+ }
+--- lucene4.10-4.10.4+dfsg.orig/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
++++ lucene4.10-4.10.4+dfsg/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
+@@ -34,7 +34,7 @@ import org.apache.lucene.store.MockDirec
+ import org.junit.Test;
+
+ import com.carrotsearch.randomizedtesting.annotations.Repeat;
+-import com.carrotsearch.randomizedtesting.generators.RandomInts;
++import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
+
+ @Repeat(iterations=5) // give it a chance to test various compression modes with different chunk sizes
+ public class TestCompressingStoredFieldsFormat extends BaseStoredFieldsFormatTestCase {
+@@ -52,7 +52,7 @@ public class TestCompressingStoredFields
+ ((MockDirectoryWrapper)dir).setEnableVirusScanner(false);
+ }
+ 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()));
+ // disable CFS because this test checks file names
+ iwConf.setMergePolicy(newLogMergePolicy(false));
+--- lucene4.10-4.10.4+dfsg.orig/core/src/test/org/apache/lucene/codecs/lucene41/TestForUtil.java
++++ lucene4.10-4.10.4+dfsg/core/src/test/org/apache/lucene/codecs/lucene41/TestForUtil.java
+@@ -32,24 +32,24 @@ import org.apache.lucene.store.RAMDirect
+ import org.apache.lucene.util.LuceneTestCase;
+ 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 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 int[] values = new int[(iterations - 1) * BLOCK_SIZE + ForUtil.MAX_DATA_SIZE];
+ for (int i = 0; i < iterations; ++i) {
+ final int bpv = random().nextInt(32);
+ 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) {
+ values[i * BLOCK_SIZE + j] = value;
+ }
+ } else {
+ 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));
+ }
+ }
+--- lucene4.10-4.10.4+dfsg.orig/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java
++++ lucene4.10-4.10.4+dfsg/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java
+@@ -31,7 +31,7 @@ import org.apache.lucene.util.TestUtil;
+ import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
+
+ 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.
+@@ -64,7 +64,7 @@ public class Test4GBStoredFields extends
+ ft.setIndexed(false);
+ ft.setStored(true);
+ 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];
+ for (int i = 0; i < valueLength; ++i) {
+ // random so that even compressing codecs can't compress it
+--- lucene4.10-4.10.4+dfsg.orig/core/src/test/org/apache/lucene/util/automaton/TestOperations.java
++++ lucene4.10-4.10.4+dfsg/core/src/test/org/apache/lucene/util/automaton/TestOperations.java
+@@ -22,7 +22,7 @@ import java.util.*;
+ import org.apache.lucene.util.*;
+ import org.apache.lucene.util.fst.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;
+
+@@ -30,7 +30,7 @@ public class TestOperations extends Luce
+ /** Test string union. */
+ public void testStringUnion() {
+ 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())));
+ }
+
+--- lucene4.10-4.10.4+dfsg.orig/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
++++ lucene4.10-4.10.4+dfsg/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
+@@ -43,7 +43,7 @@ import org.apache.lucene.util.TestUtil;
+ import org.apache.lucene.util.packed.PackedInts.Reader;
+ import org.junit.Ignore;
+
+-import com.carrotsearch.randomizedtesting.generators.RandomInts;
++import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
+
+ @Slow
+ public class TestPackedInts extends LuceneTestCase {
+@@ -51,7 +51,7 @@ public class TestPackedInts extends Luce
+ public void testByteCount() {
+ final int iters = atLeast(3);
+ 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 (int bpv = 1; bpv <= 64; ++bpv) {
+ final long byteCount = format.byteCount(PackedInts.VERSION_CURRENT, valueCount, bpv);
+@@ -208,7 +208,7 @@ public class TestPackedInts extends Luce
+
+ public void testEndPointer() throws IOException {
+ 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()));
+ for (int i = 0; i < valueCount; ++i) {
+ out.writeLong(0);
+@@ -226,7 +226,7 @@ public class TestPackedInts extends Luce
+
+ // test iterator
+ 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) {
+ it.next();
+ }
+@@ -983,9 +983,9 @@ public class TestPackedInts extends Luce
+ }
+
+ public void testPackedLongValues() {
+- final long[] arr = new long[RandomInts.randomIntBetween(random(), 1, 1000000)];
++ final long[] arr = new long[RandomNumbers.randomIntBetween(random(), 1, 1000000)];
+ 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)) {
+ final int pageSize = 1 << TestUtil.nextInt(random(), 6, 20);
+ float acceptableOverheadRatio = ratioOptions[TestUtil.nextInt(random(), 0, ratioOptions.length - 1)];
+@@ -1068,7 +1068,7 @@ public class TestPackedInts extends Luce
+ final int[] bitsPerValues = new int[longs.length];
+ final boolean[] skip = new boolean[longs.length];
+ 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);
+ if (bpv == 64) {
+ longs[i] = random().nextLong();
+--- lucene4.10-4.10.4+dfsg.orig/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
++++ lucene4.10-4.10.4+dfsg/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
+@@ -39,7 +39,7 @@ import org.apache.lucene.util.LuceneTest
+ import org.apache.lucene.util.TestUtil;
+ import org.apache.lucene.util.packed.PackedInts;
+
+-import com.carrotsearch.randomizedtesting.generators.RandomInts;
++import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
+
+ @SuppressCodecs("Lucene3x")
+ public class TestDocValuesFieldSources extends LuceneTestCase {
+@@ -81,7 +81,7 @@ public class TestDocValuesFieldSources e
+ f.setBytesValue(new BytesRef((String) vals[i]));
+ break;
+ 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));
+ f.setLongValue((Long) vals[i]);
+ break;
+--- lucene4.10-4.10.4+dfsg.orig/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java
++++ lucene4.10-4.10.4+dfsg/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java
+@@ -25,7 +25,7 @@ import org.apache.lucene.codecs.TermVect
+ import org.apache.lucene.codecs.compressing.dummy.DummyCompressingCodec;
+ import org.apache.lucene.codecs.lucene410.Lucene410Codec;
+
+-import com.carrotsearch.randomizedtesting.generators.RandomInts;
++import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
+
+ /**
+ * A codec that uses {@link CompressingStoredFieldsFormat} for its stored
+@@ -56,14 +56,14 @@ public abstract class CompressingCodec e
+ * suffix
+ */
+ public static CompressingCodec randomInstance(Random random) {
+- return randomInstance(random, RandomInts.randomIntBetween(random, 1, 500), false);
++ return randomInstance(random, RandomNumbers.randomIntBetween(random, 1, 500), false);
+ }
+
+ /**
+ * Creates a random {@link CompressingCodec} that is using a segment suffix
+ */
+ public static CompressingCodec randomInstance(Random random, boolean withSegmentSuffix) {
+- return randomInstance(random, RandomInts.randomIntBetween(random, 1, 500), withSegmentSuffix);
++ return randomInstance(random, RandomNumbers.randomIntBetween(random, 1, 500), withSegmentSuffix);
+ }
+
+ private final CompressingStoredFieldsFormat storedFieldsFormat;
+--- lucene4.10-4.10.4+dfsg.orig/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
++++ lucene4.10-4.10.4+dfsg/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
+@@ -59,7 +59,7 @@ import org.apache.lucene.store.MockDirec
+ import org.apache.lucene.util.BytesRef;
+ import org.apache.lucene.util.TestUtil;
+
+-import com.carrotsearch.randomizedtesting.generators.RandomInts;
++import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
+ import com.carrotsearch.randomizedtesting.generators.RandomPicks;
+
+ /**
+@@ -330,7 +330,7 @@ public abstract class BaseStoredFieldsFo
+ public void testReadSkip() throws IOException {
+ Directory dir = newDirectory();
+ 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);
+
+ FieldType ft = new FieldType();
+@@ -383,7 +383,7 @@ public abstract class BaseStoredFieldsFo
+ public void testEmptyDocs() throws IOException {
+ Directory dir = newDirectory();
+ 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);
+
+ // make sure that the fact that documents might be empty is not a problem
+@@ -408,7 +408,7 @@ public abstract class BaseStoredFieldsFo
+ public void testConcurrentReads() throws Exception {
+ Directory dir = newDirectory();
+ 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);
+
+ // make sure the readers are properly cloned
+@@ -496,15 +496,15 @@ public abstract class BaseStoredFieldsFo
+ }
+ Directory dir = newDirectory();
+ 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);
+
+ final int docCount = atLeast(200);
+ final byte[][][] data = new byte [docCount][][];
+ for (int i = 0; i < docCount; ++i) {
+ final int fieldCount = rarely()
+- ? RandomInts.randomIntBetween(random(), 1, 500)
+- : RandomInts.randomIntBetween(random(), 1, 5);
++ ? RandomNumbers.randomIntBetween(random(), 1, 500)
++ : RandomNumbers.randomIntBetween(random(), 1, 5);
+ data[i] = new byte[fieldCount][];
+ for (int j = 0; j < fieldCount; ++j) {
+ final int length = rarely()
+@@ -589,7 +589,7 @@ public abstract class BaseStoredFieldsFo
+ // so if we get NRTCachingDir+SimpleText, we make massive stored fields and OOM (LUCENE-4484)
+ Directory dir = new MockDirectoryWrapper(random(), new MMapDirectory(createTempDir("testBigDocuments")));
+ 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);
+
+ if (dir instanceof MockDirectoryWrapper) {
+@@ -609,12 +609,12 @@ public abstract class BaseStoredFieldsFo
+ onlyStored.setIndexed(false);
+
+ 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) {
+ 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);
+
+ final int numDocs = atLeast(5);
+--- lucene4.10-4.10.4+dfsg.orig/test-framework/src/java/org/apache/lucene/util/TestUtil.java
++++ lucene4.10-4.10.4+dfsg/test-framework/src/java/org/apache/lucene/util/TestUtil.java
+@@ -88,7 +88,7 @@ import org.apache.lucene.search.TopDocs;
+ import org.apache.lucene.store.Directory;
+ import org.junit.Assert;
+
+-import com.carrotsearch.randomizedtesting.generators.RandomInts;
++import com.carrotsearch.randomizedtesting.generators.RandomNumbers;
+ import com.carrotsearch.randomizedtesting.generators.RandomPicks;
+
+ /**
+@@ -243,7 +243,7 @@ public final class TestUtil {
+
+ /** start and end are BOTH inclusive */
+ 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 */
+@@ -384,7 +384,7 @@ public final class TestUtil {
+ final StringBuilder regexp = new StringBuilder(maxLength);
+ for (int i = nextInt(r, 0, maxLength); i > 0; i--) {
+ if (r.nextBoolean()) {
+- regexp.append((char) RandomInts.randomIntBetween(r, 'a', 'z'));
++ regexp.append((char) RandomNumbers.randomIntBetween(r, 'a', 'z'));
+ } else {
+ regexp.append(RandomPicks.randomFrom(r, ops));
+ }
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,5 @@
0005-Revert-upstream-removal-of-deprecated-QueryParser-co.patch
0006-use-local-artifacts.patch
0007-missing-hamcrest-dependency.patch
+carrotsearch-juni4-ant.patch
+carrotsearch_random.patch
View it on GitLab: https://salsa.debian.org/java-team/lucene4.10/-/compare/5ad13a0bec9a4f2a64247caccf121de25df9cfe6...b5b3a5ded8c6125972f558df4264cadca31bd1fb
--
View it on GitLab: https://salsa.debian.org/java-team/lucene4.10/-/compare/5ad13a0bec9a4f2a64247caccf121de25df9cfe6...b5b3a5ded8c6125972f558df4264cadca31bd1fb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201106/3cfaf598/attachment.html>
More information about the pkg-java-commits
mailing list