Fix model field mapper

Signed-off-by: John Mazanec <[email protected]>
opensearch-project · Aug 14, 2024 · dcf67d9 · dcf67d9
1 parent 8ca67a0
commit dcf67d9
Showing 1 changed file with 40 additions and 1 deletion.
diff --git a/src/main/java/org/opensearch/knn/index/mapper/ModelFieldMapper.java b/src/main/java/org/opensearch/knn/index/mapper/ModelFieldMapper.java
@@ -16,6 +16,7 @@
 import org.opensearch.knn.index.engine.KNNLibraryIndexingContext;
 import org.opensearch.knn.index.engine.KNNMethodConfigContext;
 import org.opensearch.knn.index.engine.KNNMethodContext;
+import org.opensearch.knn.index.engine.MethodComponentContext;
 import org.opensearch.knn.indices.ModelDao;
 import org.opensearch.knn.indices.ModelMetadata;
 import org.opensearch.knn.indices.ModelUtil;
@@ -130,8 +131,15 @@ private void initVectorValidator() {
             return;
         }
         ModelMetadata modelMetadata = getModelMetadata(modelDao, modelId);
+
         KNNMethodContext knnMethodContext = getKNNMethodContextFromModelMetadata(modelMetadata);
         KNNMethodConfigContext knnMethodConfigContext = getKNNMethodConfigContextFromModelMetadata(modelMetadata);
+        // Need to handle BWC case
+        if (knnMethodContext == null || knnMethodConfigContext == null) {
+            vectorValidator = new SpaceVectorValidator(modelMetadata.getSpaceType());
+            return;
+        }
+
         KNNLibraryIndexingContext knnLibraryIndexingContext = knnMethodContext.getKnnEngine()
             .getKNNLibraryIndexingContext(knnMethodContext, knnMethodConfigContext);
         vectorValidator = knnLibraryIndexingContext.getVectorValidator();
@@ -142,8 +150,22 @@ private void initPerDimensionValidator() {
             return;
         }
         ModelMetadata modelMetadata = getModelMetadata(modelDao, modelId);
+
         KNNMethodContext knnMethodContext = getKNNMethodContextFromModelMetadata(modelMetadata);
         KNNMethodConfigContext knnMethodConfigContext = getKNNMethodConfigContextFromModelMetadata(modelMetadata);
+        // Need to handle BWC case
+        if (knnMethodContext == null || knnMethodConfigContext == null) {
+            if (modelMetadata.getVectorDataType() == VectorDataType.BINARY) {
+                perDimensionValidator = PerDimensionValidator.DEFAULT_BIT_VALIDATOR;
+            } else if (modelMetadata.getVectorDataType() == VectorDataType.BYTE) {
+                perDimensionValidator = PerDimensionValidator.DEFAULT_BYTE_VALIDATOR;
+            } else {
+                perDimensionValidator = PerDimensionValidator.DEFAULT_FLOAT_VALIDATOR;
+            }
+
+            return;
+        }
+
         KNNLibraryIndexingContext knnLibraryIndexingContext = knnMethodContext.getKnnEngine()
             .getKNNLibraryIndexingContext(knnMethodContext, knnMethodConfigContext);
         perDimensionValidator = knnLibraryIndexingContext.getPerDimensionValidator();
@@ -154,8 +176,15 @@ private void initPerDimensionProcessor() {
             return;
         }
         ModelMetadata modelMetadata = getModelMetadata(modelDao, modelId);
+
         KNNMethodContext knnMethodContext = getKNNMethodContextFromModelMetadata(modelMetadata);
         KNNMethodConfigContext knnMethodConfigContext = getKNNMethodConfigContextFromModelMetadata(modelMetadata);
+        // Need to handle BWC case
+        if (knnMethodContext == null || knnMethodConfigContext == null) {
+            perDimensionProcessor = PerDimensionProcessor.NOOP_PROCESSOR;
+            return;
+        }
+
         KNNLibraryIndexingContext knnLibraryIndexingContext = knnMethodContext.getKnnEngine()
             .getKNNLibraryIndexingContext(knnMethodContext, knnMethodConfigContext);
         perDimensionProcessor = knnLibraryIndexingContext.getPerDimensionProcessor();
@@ -184,13 +213,23 @@ protected void parseCreateField(ParseContext context) throws IOException {
     }
 
     private static KNNMethodContext getKNNMethodContextFromModelMetadata(ModelMetadata modelMetadata) {
-        return new KNNMethodContext(modelMetadata.getKnnEngine(), modelMetadata.getSpaceType(), modelMetadata.getMethodComponentContext());
+        MethodComponentContext methodComponentContext = modelMetadata.getMethodComponentContext();
+        if (methodComponentContext == MethodComponentContext.EMPTY) {
+            return null;
+        }
+        return new KNNMethodContext(modelMetadata.getKnnEngine(), modelMetadata.getSpaceType(), methodComponentContext);
     }
 
     private static KNNMethodConfigContext getKNNMethodConfigContextFromModelMetadata(ModelMetadata modelMetadata) {
+        MethodComponentContext methodComponentContext = modelMetadata.getMethodComponentContext();
+        if (methodComponentContext == MethodComponentContext.EMPTY) {
+            return null;
+        }
+        // TODO: Need to fix this version check by serializing the model
         return KNNMethodConfigContext.builder()
             .vectorDataType(modelMetadata.getVectorDataType())
             .dimension(modelMetadata.getDimension())
+            .versionCreated(Version.V_2_14_0)
             .build();
     }