adding tenantId field in model group index (#2862)

Signed-off-by: Dhrubo Saha <[email protected]>
opensearch-project · Aug 29, 2024 · b1be05e · b1be05e
1 parent 69a495a
commit b1be05e
Showing 1 changed file with 51 additions and 50 deletions.
diff --git a/common/src/main/java/org/opensearch/ml/common/CommonValue.java b/common/src/main/java/org/opensearch/ml/common/CommonValue.java
@@ -58,7 +58,7 @@ public class CommonValue {
         public static final String ML_MODEL_GROUP_INDEX = ".plugins-ml-model-group";
         public static final String ML_MODEL_INDEX = ".plugins-ml-model";
         public static final String ML_TASK_INDEX = ".plugins-ml-task";
-        public static final Integer ML_MODEL_GROUP_INDEX_SCHEMA_VERSION = 2;
+        public static final Integer ML_MODEL_GROUP_INDEX_SCHEMA_VERSION = 3;
         public static final Integer ML_MODEL_INDEX_SCHEMA_VERSION = 11;
         public static final String ML_CONNECTOR_INDEX = ".plugins-ml-connector";
         public static final Integer ML_TASK_INDEX_SCHEMA_VERSION = 2;
@@ -86,55 +86,56 @@ public class CommonValue {
                         + "        }\n"
                         + "      }\n";
         public static final String ML_MODEL_GROUP_INDEX_MAPPING = "{\n"
-                        + "  \"_meta\": {\n"
-                        + "    \"schema_version\": " + ML_MODEL_GROUP_INDEX_SCHEMA_VERSION + "\n"
-                        + "  },\n"
-                        + "  \"properties\": {\n"
-                        + "    \"" + MLModelGroup.MODEL_GROUP_NAME_FIELD + "\": {\n"
-                        + "      \"type\": \"text\",\n"
-                        + "      \"fields\": {\n"
-                        + "        \"keyword\": {\n"
-                        + "          \"type\": \"keyword\",\n"
-                        + "          \"ignore_above\": 256\n"
-                        + "        }\n"
-                        + "      }\n"
-                        + "    },\n"
-                        + "    \"" + MLModelGroup.DESCRIPTION_FIELD + "\": {\n"
-                        + "      \"type\": \"text\"\n"
-                        + "    },\n"
-                        + "    \"" + MLModelGroup.LATEST_VERSION_FIELD + "\": {\n"
-                        + "      \"type\": \"integer\"\n"
-                        + "    },\n"
-                        + "   \"" + MLModelGroup.MODEL_GROUP_ID_FIELD + "\": {\n"
-                        + "      \"type\": \"keyword\"\n"
-                        + "    },\n"
-                        + "    \"" + MLModelGroup.BACKEND_ROLES_FIELD + "\": {\n"
-                        + "      \"type\": \"text\",\n"
-                        + "      \"fields\": {\n"
-                        + "        \"keyword\": {\n"
-                        + "          \"type\": \"keyword\",\n"
-                        + "          \"ignore_above\": 256\n"
-                        + "        }\n"
-                        + "      }\n"
-                        + "    },\n"
-                        + "   \"" + MLModelGroup.ACCESS + "\": {\n"
-                        + "      \"type\": \"keyword\"\n"
-                        + "    },\n"
-                        + "    \"" + MLModelGroup.OWNER + "\": {\n"
-                        + "      \"type\": \"nested\",\n"
-                        + "        \"properties\": {\n"
-                        + "          \"name\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\", \"ignore_above\":256}}},\n"
-                        + "          \"backend_roles\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\"}}},\n"
-                        + "          \"roles\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\"}}},\n"
-                        + "          \"custom_attribute_names\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\"}}}\n"
-                        + "        }\n"
-                        + "    },\n"
-                        + "     \"" + MLModelGroup.CREATED_TIME_FIELD + "\": {\n"
-                        + "      \"type\": \"date\", \"format\": \"strict_date_time||epoch_millis\"},\n"
-                        + "    \"" + MLModelGroup.LAST_UPDATED_TIME_FIELD + "\": {\n"
-                        + "      \"type\": \"date\", \"format\": \"strict_date_time||epoch_millis\"}\n"
-                        + "  }\n"
-                        + "}";
+                + "  \"_meta\": {\n"
+                + "    \"schema_version\": " + ML_MODEL_GROUP_INDEX_SCHEMA_VERSION + "\n"
+                + "  },\n"
+                + "  \"properties\": {\n"
+                + "    \"" + MLModelGroup.MODEL_GROUP_NAME_FIELD + "\": {\n"
+                + "      \"type\": \"text\",\n"
+                + "      \"fields\": {\n"
+                + "        \"keyword\": {\n"
+                + "          \"type\": \"keyword\",\n"
+                + "          \"ignore_above\": 256\n"
+                + "        }\n"
+                + "      }\n"
+                + "    },\n"
+                + "    \"" + MLModelGroup.DESCRIPTION_FIELD + "\": {\n"
+                + "      \"type\": \"text\"\n"
+                + "    },\n"
+                + "    \"" + MLModelGroup.LATEST_VERSION_FIELD + "\": {\n"
+                + "      \"type\": \"integer\"\n"
+                + "    },\n"
+                + "    \"" + MLModelGroup.MODEL_GROUP_ID_FIELD + "\": {\n"
+                + "      \"type\": \"keyword\"\n"
+                + "    },\n"
+                + "    \"" + MLModelGroup.BACKEND_ROLES_FIELD + "\": {\n"
+                + "      \"type\": \"text\",\n"
+                + "      \"fields\": {\n"
+                + "        \"keyword\": {\n"
+                + "          \"type\": \"keyword\",\n"
+                + "          \"ignore_above\": 256\n"
+                + "        }\n"
+                + "      }\n"
+                + "    },\n"
+                + "    \"" + TENANT_ID + "\" : {\"type\": \"keyword\"},\n"
+                + "    \"" + MLModelGroup.ACCESS + "\": {\n"
+                + "      \"type\": \"keyword\"\n"
+                + "    },\n"
+                + "    \"" + MLModelGroup.OWNER + "\": {\n"
+                + "      \"type\": \"nested\",\n"
+                + "      \"properties\": {\n"
+                + "        \"name\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\", \"ignore_above\":256}}},\n"
+                + "        \"backend_roles\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\"}}},\n"
+                + "        \"roles\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\"}}},\n"
+                + "        \"custom_attribute_names\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\"}}}\n"
+                + "      }\n"
+                + "    },\n"
+                + "    \"" + MLModelGroup.CREATED_TIME_FIELD + "\": {\n"
+                + "      \"type\": \"date\", \"format\": \"strict_date_time||epoch_millis\"},\n"
+                + "    \"" + MLModelGroup.LAST_UPDATED_TIME_FIELD + "\": {\n"
+                + "      \"type\": \"date\", \"format\": \"strict_date_time||epoch_millis\"}\n"
+                + "  }\n"
+                + "}";
 
         public static final String ML_CONNECTOR_INDEX_FIELDS = "    \"properties\": {\n"
                         + "      \""