Create legacy mapping only up to V_2_17_2

Signed-off-by: Vijayan Balasubramanian <[email protected]>
opensearch-project · Oct 23, 2024 · 750ba91 · 750ba91
1 parent aa3eb33
commit 750ba91
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/org/opensearch/knn/index/engine/EngineResolver.java b/src/main/java/org/opensearch/knn/index/engine/EngineResolver.java
@@ -49,7 +49,7 @@ public KNNEngine resolveEngine(
 
         // For 1x, we need to default to faiss if mode is provided and use nmslib otherwise
         if (CompressionLevel.isConfigured(compressionLevel) == false || compressionLevel == CompressionLevel.x1) {
-            return mode == Mode.ON_DISK ? KNNEngine.FAISS : KNNEngine.DEFAULT;
+            return mode == Mode.ON_DISK ? KNNEngine.FAISS : KNNEngine.NMSLIB;
         }
 
         // Lucene is only engine that supports 4x - so we have to default to it here.

diff --git a/src/main/java/org/opensearch/knn/index/mapper/KNNVectorFieldMapper.java b/src/main/java/org/opensearch/knn/index/mapper/KNNVectorFieldMapper.java
@@ -500,8 +500,9 @@ private void resolveKNNMethodComponents(
                     .build()
             );
 
-            // If the original parameters are from legacy
-            if (builder.originalParameters.isLegacyMapping()) {
+            // If the original parameters are from legacy, and it is created on or before 2_17_2 since default is changed to
+            // FAISS starting 2_18, which doesn't support accepting algo params from index settings
+            if (parserContext.indexVersionCreated().onOrBefore(Version.V_2_17_2) && builder.originalParameters.isLegacyMapping()) {
                 // Then create KNNMethodContext to be used from the legacy index settings
                 builder.originalParameters.setResolvedKnnMethodContext(
                     createKNNMethodContextFromLegacy(parserContext.getSettings(), parserContext.indexVersionCreated(), resolvedSpaceType)

diff --git a/src/main/java/org/opensearch/knn/index/mapper/KNNVectorFieldMapperUtil.java b/src/main/java/org/opensearch/knn/index/mapper/KNNVectorFieldMapperUtil.java
@@ -203,7 +203,7 @@ static KNNMethodContext createKNNMethodContextFromLegacy(
             ? topLevelSpaceType
             : KNNVectorFieldMapperUtil.getSpaceType(indexSettings);
         return new KNNMethodContext(
-            KNNEngine.DEFAULT,
+            KNNEngine.NMSLIB,
             finalSpaceToSet,
             new MethodComponentContext(
                 METHOD_HNSW,