This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch ishan/upgrade-to-lucene-10
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/ishan/upgrade-to-lucene-10 by
this push:
new 7f2a77bc653 Fixed deprecated methods
7f2a77bc653 is described below
commit 7f2a77bc653dc0a7f74895b445d655a483ae468e
Author: noblepaul <[email protected]>
AuthorDate: Thu Jan 16 15:04:50 2025 +0530
Fixed deprecated methods
---
.../java/org/apache/solr/index/SlowCompositeReaderWrapper.java | 7 +++++++
solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java | 7 +++++--
.../test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java | 5 +++--
solr/core/src/test/org/apache/solr/core/TestCodecSupport.java | 6 ++++--
.../org/apache/solr/uninverting/TestFieldCacheVsDocValues.java | 2 +-
.../src/test/org/apache/solr/update/DocumentBuilderTest.java | 9 ++++-----
.../solr/update/DocumentBuilderVectorCatchAllCopyTest.java | 6 +++---
.../update/processor/TimeRoutedAliasUpdateProcessorTest.java | 3 ++-
.../src/java/org/apache/solr/SolrIgnoredThreadsFilter.java | 4 ----
.../cloud/api/collections/AbstractBackupRepositoryTest.java | 3 ++-
.../src/java/org/apache/solr/embedded/JettySolrRunner.java | 2 +-
.../src/java/org/apache/solr/util/QueryMatchers.java | 10 +++++-----
12 files changed, 37 insertions(+), 27 deletions(-)
diff --git
a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
index 05f8273050c..85a6304e198 100644
--- a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
+++ b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
@@ -26,6 +26,7 @@ import org.apache.lucene.index.ByteVectorValues;
import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValues;
+import org.apache.lucene.index.DocValuesSkipper;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
@@ -120,6 +121,12 @@ public final class SlowCompositeReaderWrapper extends
LeafReader {
fieldInfos = FieldInfos.getMergedFieldInfos(in);
}
+ @Override
+ public DocValuesSkipper getDocValuesSkipper(String field) throws IOException
{
+ //TODO implement skipping
+ return null;
+ }
+
@Override
public String toString() {
return "SlowCompositeReaderWrapper(" + in + ")";
diff --git a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
index 2f69565fb82..3c8f33b97a4 100644
--- a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
+++ b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
@@ -505,6 +505,7 @@ public final class SolrRangeQuery extends ExtendedQueryBase
implements DocSetPro
return segStates[context.ord] = new SegState(segSet);
}
+
private ScorerSupplier scorerSupplier(DocIdSet set) throws IOException {
if (set == null) {
return null;
@@ -516,7 +517,9 @@ public final class SolrRangeQuery extends ExtendedQueryBase
implements DocSetPro
return new DefaultScorerSupplier(new ConstantScoreScorer(score(),
scoreMode, disi));
}
- @Override
+ //TBD already implements a scorerSupplier() . So this need not be
overridden
+
+ /* @Override
public BulkScorer bulkScorer(LeafReaderContext context) throws IOException
{
final SegState weightOrBitSet = getSegState(context);
if (weightOrBitSet.weight != null) {
@@ -528,7 +531,7 @@ public final class SolrRangeQuery extends ExtendedQueryBase
implements DocSetPro
}
return new DefaultBulkScorer(scorer);
}
- }
+ }*/
@Override
public ScorerSupplier scorerSupplier(LeafReaderContext context) throws
IOException {
diff --git
a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
index 2c8520ddc22..073c8de7343 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
@@ -20,7 +20,8 @@ import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.lucene.tests.util.LuceneTestCase.BadApple;
+
+import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.util.ExecutorUtil;
@@ -34,7 +35,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-16122";)
[email protected](bugUrl =
"https://issues.apache.org/jira/browse/SOLR-16122";)
public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 {
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
index f5f084da8ab..811efc3a791 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java
@@ -21,8 +21,10 @@ import static
org.apache.lucene.codecs.lucene90.Lucene90StoredFieldsFormat.MODE_
import java.io.IOException;
import java.util.Map;
import java.util.Set;
+
+//TBD which codec to fall back to
+import org.apache.lucene.backward_codecs.lucene90.Lucene90Codec;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.lucene912.Lucene912Codec.Mode;
import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
import org.apache.lucene.index.SegmentInfo;
@@ -225,7 +227,7 @@ public class TestCodecSupport extends SolrTestCaseJ4 {
assertEquals(
"Default Solr compression mode changed. Is this expected?",
SchemaCodecFactory.SOLR_DEFAULT_COMPRESSION_MODE,
- Mode.valueOf("BEST_SPEED"));
+ Lucene90Codec.Mode.valueOf("BEST_SPEED"));
String previousCoreName = h.coreName;
String newCoreName = "core_with_default_compression";
diff --git
a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
index ec1525cef7d..76a5992ea11 100644
---
a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
+++
b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheVsDocValues.java
@@ -16,7 +16,7 @@
*/
package org.apache.solr.uninverting;
-import static org.apache.lucene.index.SortedSetDocValues.NO_MORE_ORDS;
+import static
org.apache.lucene.sandbox.facet.iterators.OrdinalIterator.NO_MORE_ORDS;
import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS;
import java.util.ArrayList;
diff --git a/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
index 3dd77cc1155..80ecd512e1c 100644
--- a/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
@@ -26,7 +26,6 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.KnnFloatVectorField;
-import org.apache.lucene.document.KnnVectorField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.tests.util.TestUtil;
@@ -352,8 +351,8 @@ public class DocumentBuilderTest extends SolrTestCaseJ4 {
Document out = DocumentBuilder.toDocument(doc, core.getLatestSchema());
// from /solr/core/src/test-files/solr/collection1/conf/schema.xml
- KnnVectorField expectedIndexableField =
- new KnnVectorField(
+ KnnFloatVectorField expectedIndexableField =
+ new KnnFloatVectorField(
"vector", new float[] {1.1f, 2.1f, 3.1f, 4.1f},
VectorSimilarityFunction.COSINE);
assertThat(
@@ -383,8 +382,8 @@ public class DocumentBuilderTest extends SolrTestCaseJ4 {
Document out = DocumentBuilder.toDocument(doc, core.getLatestSchema());
// from /solr/core/src/test-files/solr/collection1/conf/schema.xml
- KnnVectorField expectedDestination =
- new KnnVectorField(
+ KnnFloatVectorField expectedDestination =
+ new KnnFloatVectorField(
"vector2", new float[] {1.1f, 2.1f, 3.1f, 4.1f},
VectorSimilarityFunction.DOT_PRODUCT);
assertThat(
diff --git
a/solr/core/src/test/org/apache/solr/update/DocumentBuilderVectorCatchAllCopyTest.java
b/solr/core/src/test/org/apache/solr/update/DocumentBuilderVectorCatchAllCopyTest.java
index cda41e76e0b..6fee97d1fe4 100644
---
a/solr/core/src/test/org/apache/solr/update/DocumentBuilderVectorCatchAllCopyTest.java
+++
b/solr/core/src/test/org/apache/solr/update/DocumentBuilderVectorCatchAllCopyTest.java
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.lucene.document.Document;
+//TBD
import org.apache.lucene.document.KnnFloatVectorField;
-import org.apache.lucene.document.KnnVectorField;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.solr.SolrTestCaseJ4;
@@ -54,8 +54,8 @@ public class DocumentBuilderVectorCatchAllCopyTest extends
SolrTestCaseJ4 {
Document out = DocumentBuilder.toDocument(doc, core.getLatestSchema());
// from /solr/core/src/test-files/solr/collection1/conf/schema.xml
- KnnVectorField expectedDestination =
- new KnnVectorField(
+ KnnFloatVectorField expectedDestination =
+ new KnnFloatVectorField(
"vector2", new float[] {1.1f, 2.1f, 3.1f, 4.1f},
VectorSimilarityFunction.DOT_PRODUCT);
assertThat(
diff --git
a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
index 422feca1fa9..f210f534699 100644
---
a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
+++
b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
@@ -68,11 +68,12 @@ import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.data.Stat;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
[email protected](bugUrl =
"https://issues.apache.org/jira/browse/SOLR-13059";)
[email protected](bugUrl =
"https://issues.apache.org/jira/browse/SOLR-13059";) //TBD
public class TimeRoutedAliasUpdateProcessorTest extends
RoutedAliasUpdateProcessorTest {
private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git
a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
index dc0e22dc6a3..b9d31b8b604 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
@@ -18,7 +18,6 @@ package org.apache.solr;
import com.carrotsearch.randomizedtesting.ThreadFilter;
import java.lang.Thread.State;
-import org.apache.lucene.search.TimeLimitingCollector.TimerThread;
/** This ignores those threads in Solr for which there is no way to clean up
after a suite. */
public class SolrIgnoredThreadsFilter implements ThreadFilter {
@@ -33,9 +32,6 @@ public class SolrIgnoredThreadsFilter implements ThreadFilter
{
*/
String threadName = t.getName();
- if (threadName.equals(TimerThread.THREAD_NAME)) {
- return true;
- }
// due to netty - will stop on it's own
if (threadName.startsWith("globalEventExecutor")) {
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
index 56db52cc9cb..0da0583cccf 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractBackupRepositoryTest.java
@@ -151,7 +151,8 @@ public abstract class AbstractBackupRepositoryTest extends
SolrTestCaseJ4 {
final int expectedNumBytes = storedBytes.length;
final byte[] retrievedBytes = new byte[expectedNumBytes];
try (final IndexInput is =
- repo.openInput(getBaseUri(), "file.txt", new
IOContext(IOContext.Context.READ))) {
+ //TBD
+ repo.openInput(getBaseUri(), "file.txt", IOContext.DEFAULT)) {
assertEquals(expectedNumBytes, is.length());
is.readBytes(retrievedBytes, 0, expectedNumBytes);
}
diff --git
a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
index 9c033827241..7c5f61b7462 100644
--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
@@ -307,7 +307,7 @@ public class JettySolrRunner {
configuration.addCustomizer(customizer);
HttpConnectionFactory http1ConnectionFactory = new
HttpConnectionFactory(configuration);
- if (config.onlyHttp1 || !Constants.JRE_IS_MINIMUM_JAVA9) {
+ if (config.onlyHttp1) {
connector =
new ServerConnector(
server,
diff --git
a/solr/test-framework/src/java/org/apache/solr/util/QueryMatchers.java
b/solr/test-framework/src/java/org/apache/solr/util/QueryMatchers.java
index e2f6c8c49f5..bbe78b2027c 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/QueryMatchers.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/QueryMatchers.java
@@ -138,14 +138,14 @@ public class QueryMatchers {
protected boolean matchesSafely(BooleanClause item, Description
mismatchDescription) {
boolean match = true;
mismatchDescription.appendText("was a BooleanClause ");
- if (occur != item.getOccur()) {
+ if (occur != item.occur()) {
match = false;
- mismatchDescription.appendText("that " + item.getOccur().name() + "
occur ");
+ mismatchDescription.appendText("that " + item.occur().name() + "
occur ");
}
- if (!query.matches(item.getQuery())) {
+ if (!query.matches(item.query())) {
match = false;
- mismatchDescription.appendText("with " + item.getQuery());
- query.describeMismatch(item.getQuery(), mismatchDescription);
+ mismatchDescription.appendText("with " + item.query());
+ query.describeMismatch(item.query(), mismatchDescription);
}
return match;
}
