Apache Solr open-source search software
SOLR-15379: Fix API incompatibility after LUCENE-9905.
Andrzej Bialecki421f6932440d
diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaField.java b/solr/core/src/java/org/apache/solr/schema/SchemaField.javaindex 8dd8c869872..3d7740ecf4b 100644--- a/solr/core/src/java/org/apache/solr/schema/SchemaField.java+++ b/solr/core/src/java/org/apache/solr/schema/SchemaField.java@@ -454,8 +454,8 @@ public final class SchemaField extends FieldProperties implements IndexableField}@Override- public VectorValues.SearchStrategy vectorSearchStrategy() {- return VectorValues.SearchStrategy.NONE;+ public VectorValues.SimilarityFunction vectorSimilarityFunction() {+ return VectorValues.SimilarityFunction.NONE;}@Overridediff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.javaindex a95f5659b4a..9709f686693 100644--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java@@ -521,7 +521,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {fieldInfo.getPointIndexDimensionCount(),fieldInfo.getPointNumBytes(),fieldInfo.getVectorDimension(),- fieldInfo.getVectorSearchStrategy(),+ fieldInfo.getVectorSimilarityFunction(),fieldInfo.isSoftDeletesField());newInfos.add(f);} else {diff --git a/solr/core/src/java/org/apache/solr/search/Insanity.java b/solr/core/src/java/org/apache/solr/search/Insanity.javaindex 273a2235633..076a025d96c 100644--- a/solr/core/src/java/org/apache/solr/search/Insanity.java+++ b/solr/core/src/java/org/apache/solr/search/Insanity.java@@ -68,7 +68,7 @@ public class Insanity {filteredInfos.add(new FieldInfo(fi.name, fi.number, fi.hasVectors(), fi.omitsNorms(),fi.hasPayloads(), fi.getIndexOptions(), DocValuesType.NONE, -1, Collections.emptyMap(),fi.getPointDimensionCount(), fi.getPointIndexDimensionCount(), fi.getPointNumBytes(),- fi.getVectorDimension(), fi.getVectorSearchStrategy(), fi.isSoftDeletesField()));+ fi.getVectorDimension(), fi.getVectorSimilarityFunction(), fi.isSoftDeletesField()));} else {filteredInfos.add(fi);}diff --git a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.javaindex 8ed09fe2329..c2ad670a5bd 100644--- a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java+++ b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java@@ -285,7 +285,7 @@ public class UninvertingReader extends FilterLeafReader {newFieldInfos.add(new FieldInfo(fi.name, fi.number, fi.hasVectors(), fi.omitsNorms(),fi.hasPayloads(), fi.getIndexOptions(), type, fi.getDocValuesGen(), fi.attributes(),fi.getPointDimensionCount(), fi.getPointIndexDimensionCount(), fi.getPointNumBytes(),- fi.getVectorDimension(), fi.getVectorSearchStrategy(), fi.isSoftDeletesField()));+ fi.getVectorDimension(), fi.getVectorSimilarityFunction(), fi.isSoftDeletesField()));} else {newFieldInfos.add(fi);}