Apache Solr open-source search software
SOLR-16588: set default knn algorithm (#1255)
Alessandro Benedettia662e349108a
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 844f71d613c..d9a8ff7768e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -226,6 +226,8 @@ Bug Fixes* SOLR-16165: Rare Deadlock in SlotAcc initialization (Justin Sweeney, noble)+* SOLR-16588: Fixed problem with default knn algorithm (Elia Porciani via Alessandro Benedetti)+================== 9.1.0 ==================New Featuresdiff --git a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.javaindex df533b20900..45e8332a0b5 100644--- a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java+++ b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java@@ -124,18 +124,18 @@ public class SchemaCodecFactory extends CodecFactory implements SolrCoreAware {if (fieldType instanceof DenseVectorField) {DenseVectorField vectorType = (DenseVectorField) fieldType;String knnAlgorithm = vectorType.getKnnAlgorithm();- if (knnAlgorithm != null) {- if (knnAlgorithm.equals(DenseVectorField.HNSW_ALGORITHM)) {- int maxConn = vectorType.getHnswMaxConn();- int beamWidth = vectorType.getHnswBeamWidth();- return new Lucene94HnswVectorsFormat(maxConn, beamWidth);- }+ if (DenseVectorField.HNSW_ALGORITHM.equals(knnAlgorithm)) {+ int maxConn = vectorType.getHnswMaxConn();+ int beamWidth = vectorType.getHnswBeamWidth();+ return new Lucene94HnswVectorsFormat(maxConn, beamWidth);} else {throw new SolrException(ErrorCode.SERVER_ERROR, knnAlgorithm + " KNN algorithm is not supported");}}- return super.getKnnVectorsFormatForField(field);++ throw new SolrException(+ ErrorCode.SERVER_ERROR, "wrong field type for KNN vectors: " + fieldType);}};}diff --git a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.javaindex 6a9e77c9c9b..e41bc161dda 100644--- a/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java+++ b/solr/core/src/java/org/apache/solr/schema/DenseVectorField.java@@ -47,6 +47,7 @@ import org.apache.solr.uninverting.UninvertingReader;public class DenseVectorField extends FloatPointField {public static final String HNSW_ALGORITHM = "hnsw";+ public static final String DEFAULT_KNN_ALGORITHM = HNSW_ALGORITHM;static final String KNN_VECTOR_DIMENSION = "vectorDimension";static final String KNN_SIMILARITY_FUNCTION = "similarityFunction";@@ -104,7 +105,7 @@ public class DenseVectorField extends FloatPointField {.orElse(DEFAULT_SIMILARITY);args.remove(KNN_SIMILARITY_FUNCTION);- this.knnAlgorithm = args.get(KNN_ALGORITHM);+ this.knnAlgorithm = args.getOrDefault(KNN_ALGORITHM, DEFAULT_KNN_ALGORITHM);args.remove(KNN_ALGORITHM);diff --git a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.javaindex 46f3541551f..ad9ab23f073 100644--- a/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java+++ b/solr/core/src/test/org/apache/solr/schema/DenseVectorFieldTest.java@@ -144,6 +144,7 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {DenseVectorField type3 = (DenseVectorField) vector3.getType();MatcherAssert.assertThat(type3.getSimilarityFunction(), is(VectorSimilarityFunction.COSINE));MatcherAssert.assertThat(type3.getDimension(), is(5));+MatcherAssert.assertThat(type3.getKnnAlgorithm(), is("hnsw"));MatcherAssert.assertThat(type3.getHnswMaxConn(), is(8));MatcherAssert.assertThat(type3.getHnswBeamWidth(), is(46));@@ -154,8 +155,8 @@ public class DenseVectorFieldTest extends AbstractBadConfigTestBase {DenseVectorField typeDefault = (DenseVectorField) vectorDefault.getType();MatcherAssert.assertThat(typeDefault.getSimilarityFunction(), is(VectorSimilarityFunction.COSINE));+ MatcherAssert.assertThat(typeDefault.getKnnAlgorithm(), is("hnsw"));MatcherAssert.assertThat(typeDefault.getDimension(), is(4));- assertNull(typeDefault.getKnnAlgorithm());MatcherAssert.assertThat(typeDefault.getHnswMaxConn(), is(16));MatcherAssert.assertThat(typeDefault.getHnswBeamWidth(), is(100));} finally {