This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch jira/solr-17917-lucene-10.3-upgrade in repository https://gitbox.apache.org/repos/asf/solr.git
commit cc5669234909eb84417da22fa4edfbd9a4729419 Author: Chris Hostetter <[email protected]> AuthorDate: Wed Oct 1 17:23:35 2025 -0700 Attempted update of modules/cuvs for Lucene 10.3.0 NOTE: The code now compiles, but tests fail due to class loader errors in the upstream cuvs-lucene library when using Lucene 10.3 --- solr/modules/cuvs/gradle.lockfile | 62 +++++++++++----------- .../src/java/org/apache/solr/cuvs/CuVSCodec.java | 8 +-- .../org/apache/solr/cuvs/CuVSCodecFactory.java | 6 +-- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfile index 37d36a3d639..fb5b0bdc2cc 100644 --- a/solr/modules/cuvs/gradle.lockfile +++ b/solr/modules/cuvs/gradle.lockfile @@ -44,17 +44,17 @@ io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeL io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor -io.netty:netty-buffer:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-base:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-base:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.70.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.70.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-epoll:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.2.4.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-epoll:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.2.6.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-common:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.53.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -85,28 +85,28 @@ org.apache.logging.log4j:log4j-core:2.21.0=jarValidation,runtimeClasspath,runtim org.apache.logging.log4j:log4j-layout-template-json:2.21.0=solrPlatformLibs org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.apache.logging.log4j:log4j-web:2.21.0=solrPlatformLibs -org.apache.lucene:lucene-analysis-common:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-analysis-kuromoji:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-analysis-nori:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-analysis-phonetic:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-backward-codecs:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-classification:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-codecs:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-core:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-expressions:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-facet:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-grouping:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-highlighter:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-join:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-memory:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-misc:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-queries:10.2.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -org.apache.lucene:lucene-queryparser:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-sandbox:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-spatial-extras:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-spatial3d:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-suggest:10.2.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.apache.lucene:lucene-test-framework:10.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-analysis-common:10.3.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-analysis-kuromoji:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-analysis-nori:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-analysis-phonetic:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-backward-codecs:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-classification:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-codecs:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-core:10.3.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-expressions:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-facet:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-grouping:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-highlighter:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-join:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-memory:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-misc:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-queries:10.3.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-queryparser:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-sandbox:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-spatial-extras:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-spatial3d:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-suggest:10.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath +org.apache.lucene:lucene-test-framework:10.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath diff --git a/solr/modules/cuvs/src/java/org/apache/solr/cuvs/CuVSCodec.java b/solr/modules/cuvs/src/java/org/apache/solr/cuvs/CuVSCodec.java index 0c451bc863d..a1423f8c954 100644 --- a/solr/modules/cuvs/src/java/org/apache/solr/cuvs/CuVSCodec.java +++ b/solr/modules/cuvs/src/java/org/apache/solr/cuvs/CuVSCodec.java @@ -20,7 +20,7 @@ import com.nvidia.cuvs.lucene.Lucene99AcceleratedHNSWVectorsFormat; import java.lang.invoke.MethodHandles; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.KnnVectorsFormat; -import org.apache.lucene.codecs.lucene101.Lucene101Codec; +import org.apache.lucene.codecs.lucene103.Lucene103Codec; import org.apache.lucene.codecs.perfield.PerFieldKnnVectorsFormat; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.NamedList; @@ -48,13 +48,13 @@ public class CuVSCodec extends FilterCodec { private static final int DEFAULT_BEAM_WIDTH = 100; private static final String CAGRA_HNSW = "cagra_hnsw"; - private static final String FALLBACK_CODEC = "Lucene101"; + private static final String FALLBACK_CODEC = "Lucene103"; private final SolrCore core; - private final Lucene101Codec fallbackCodec; + private final Lucene103Codec fallbackCodec; private final Lucene99AcceleratedHNSWVectorsFormat cuvsHNSWVectorsFormat; - public CuVSCodec(SolrCore core, Lucene101Codec fallback, NamedList<?> args) { + public CuVSCodec(SolrCore core, Lucene103Codec fallback, NamedList<?> args) { super(FALLBACK_CODEC, fallback); this.core = core; this.fallbackCodec = fallback; diff --git a/solr/modules/cuvs/src/java/org/apache/solr/cuvs/CuVSCodecFactory.java b/solr/modules/cuvs/src/java/org/apache/solr/cuvs/CuVSCodecFactory.java index 8356d4784de..90f2eb402bc 100644 --- a/solr/modules/cuvs/src/java/org/apache/solr/cuvs/CuVSCodecFactory.java +++ b/solr/modules/cuvs/src/java/org/apache/solr/cuvs/CuVSCodecFactory.java @@ -17,7 +17,7 @@ package org.apache.solr.cuvs; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene101.Lucene101Codec; +import org.apache.lucene.codecs.lucene103.Lucene103Codec; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.CodecFactory; import org.apache.solr.core.SchemaCodecFactory; @@ -29,7 +29,7 @@ public class CuVSCodecFactory extends CodecFactory implements SolrCoreAware { private final SchemaCodecFactory fallback; private SolrCore core; NamedList<?> args; - Lucene101Codec fallbackCodec; + Lucene103Codec fallbackCodec; CuVSCodec codec; public CuVSCodecFactory() { @@ -39,7 +39,7 @@ public class CuVSCodecFactory extends CodecFactory implements SolrCoreAware { @Override public Codec getCodec() { if (codec == null) { - fallbackCodec = (Lucene101Codec) fallback.getCodec(); + fallbackCodec = (Lucene103Codec) fallback.getCodec(); codec = new CuVSCodec(core, fallbackCodec, args); } return codec;
