diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/IndexUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/IndexUtil.java index a06e237db73..53f092f994e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/IndexUtil.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/IndexUtil.java @@ -139,7 +139,7 @@ public class IndexUtil { } else if (type.equalsIgnoreCase(Entity.DATABASE_SERVICE)) { return SearchIndexDefinition.ElasticSearchIndexType.DATABASE_SERVICE_SEARCH_INDEX; } else if (type.equalsIgnoreCase(Entity.SEARCH_INDEX)) { - return SearchIndexDefinition.ElasticSearchIndexType.SEARCH_INDEX_SEARCH; + return SearchIndexDefinition.ElasticSearchIndexType.SEARCH_ENTITY_INDEX_SEARCH; } else if (type.equalsIgnoreCase(Entity.SEARCH_SERVICE)) { return SearchIndexDefinition.ElasticSearchIndexType.SEARCH_SERVICE_SEARCH_INDEX; } else if (type.equalsIgnoreCase(Entity.DOMAIN)) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexDefinition.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexDefinition.java index 96b98eaea57..72ae3f03b7f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexDefinition.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexDefinition.java @@ -99,7 +99,8 @@ public class SearchIndexDefinition { SEARCH_SERVICE_SEARCH_INDEX( Entity.SEARCH_SERVICE, "search_service_search_index", "/elasticsearch/%s/search_service_index_mapping.json"), - SEARCH_INDEX_SEARCH(Entity.SEARCH_INDEX, "search_index", "/elasticsearch/%s/search_index_mapping.json"), + SEARCH_ENTITY_INDEX_SEARCH( + Entity.SEARCH_INDEX, "search_entity_index", "/elasticsearch/%s/search_entity_index_mapping.json"), DOMAIN_SEARCH_INDEX(Entity.DOMAIN, "domain_search_index", "/elasticsearch/%s/domain_index_mapping.json"), WEB_ANALYTIC_ENTITY_VIEW_REPORT_DATA_INDEX( Entity.WEB_ANALYTIC_EVENT, diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexFactory.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexFactory.java index 4aa72cb8bd7..c64c198b97f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexFactory.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/SearchIndexFactory.java @@ -48,7 +48,7 @@ import org.openmetadata.service.search.indexes.MlModelServiceIndex; import org.openmetadata.service.search.indexes.PipelineIndex; import org.openmetadata.service.search.indexes.PipelineServiceIndex; import org.openmetadata.service.search.indexes.QueryIndex; -import org.openmetadata.service.search.indexes.SearchIndex; +import org.openmetadata.service.search.indexes.SearchEntityIndex; import org.openmetadata.service.search.indexes.SearchServiceIndex; import org.openmetadata.service.search.indexes.StoredProcedureIndex; import org.openmetadata.service.search.indexes.TableIndex; @@ -112,7 +112,7 @@ public class SearchIndexFactory { case Entity.SEARCH_SERVICE: return new SearchServiceIndex((SearchService) entity); case Entity.SEARCH_INDEX: - return new SearchIndex((org.openmetadata.schema.entity.data.SearchIndex) entity); + return new SearchEntityIndex((org.openmetadata.schema.entity.data.SearchIndex) entity); case Entity.PIPELINE_SERVICE: return new PipelineServiceIndex((PipelineService) entity); case Entity.DOMAIN: diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticSearch/ElasticSearchClientImpl.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticSearch/ElasticSearchClientImpl.java index 9466ddf703e..346abdfc1e3 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticSearch/ElasticSearchClientImpl.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticSearch/ElasticSearchClientImpl.java @@ -342,7 +342,8 @@ public class ElasticSearchClientImpl implements SearchClient { } /* For backward-compatibility we continue supporting the deleted argument, this should be removed in future versions */ - if (request.getIndex().equalsIgnoreCase("domain_search_index")) { + if (request.getIndex().equalsIgnoreCase("domain_search_index") + || request.getIndex().equalsIgnoreCase("data_products_search_index")) { searchSourceBuilder.query(QueryBuilders.boolQuery().must(searchSourceBuilder.query())); } else { searchSourceBuilder.query( diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ChartIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ChartIndex.java index 47a5ca6abf9..3c51ec10eac 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ChartIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ChartIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.data.Chart; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class ChartIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class ChartIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (chart.getOwner() != null) { + EntityReference owner = chart.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + chart.setOwner(owner); + } Map doc = JsonUtils.getMap(chart); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(chart.getName()).weight(10).build()); + suggest.add(SearchSuggest.builder().input(chart.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.CHART); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ClassificationIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ClassificationIndex.java index c077c0dfa40..c11ee7f5889 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ClassificationIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ClassificationIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.classification.Classification; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class ClassificationIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class ClassificationIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (classification.getOwner() != null) { + EntityReference owner = classification.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + classification.setOwner(owner); + } Map doc = JsonUtils.getMap(classification); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(classification.getName()).weight(10).build()); + suggest.add(SearchSuggest.builder().input(classification.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.CLASSIFICATION); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardDataModelIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardDataModelIndex.java index 11a2066e836..5bc49eb48f1 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardDataModelIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardDataModelIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.data.DashboardDataModel; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class DashboardDataModelIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class DashboardDataModelIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (dashboardDataModel.getOwner() != null) { + EntityReference owner = dashboardDataModel.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + dashboardDataModel.setOwner(owner); + } Map doc = JsonUtils.getMap(dashboardDataModel); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(dashboardDataModel.getName()).weight(10).build()); + suggest.add(SearchSuggest.builder().input(dashboardDataModel.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.DASHBOARD_DATA_MODEL); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardServiceIndex.java index 88dec53bbef..4a90bfd2603 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardServiceIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.services.DashboardService; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class DashboardServiceIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class DashboardServiceIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (dashboardService.getOwner() != null) { + EntityReference owner = dashboardService.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + dashboardService.setOwner(owner); + } Map doc = JsonUtils.getMap(dashboardService); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(dashboardService.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(dashboardService.getDisplayName()).weight(10).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.DASHBOARD_SERVICE); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DataProductIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DataProductIndex.java index b5adda8785e..3c76cebbd07 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DataProductIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DataProductIndex.java @@ -2,7 +2,10 @@ package org.openmetadata.service.search.indexes; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.domains.DataProduct; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; import org.openmetadata.service.util.JsonUtils; @@ -17,8 +20,14 @@ public class DataProductIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (dataProduct.getOwner() != null) { + EntityReference owner = dataProduct.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + dataProduct.setOwner(owner); + } Map doc = JsonUtils.getMap(dataProduct); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + doc.put("entityType", Entity.DATA_PRODUCT); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseIndex.java index f4d3ba9613f..1d80024c2ea 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.data.Database; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class DatabaseIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class DatabaseIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (database.getOwner() != null) { + EntityReference owner = database.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + database.setOwner(owner); + } Map doc = JsonUtils.getMap(database); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(database.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(database.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.DATABASE); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseSchemaIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseSchemaIndex.java index 6ffde7f1dee..de616457465 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseSchemaIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseSchemaIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.data.DatabaseSchema; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class DatabaseSchemaIndex implements ElasticSearchIndex { @@ -16,8 +21,18 @@ public class DatabaseSchemaIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (databaseSchema.getOwner() != null) { + EntityReference owner = databaseSchema.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + databaseSchema.setOwner(owner); + } Map doc = JsonUtils.getMap(databaseSchema); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(databaseSchema.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(databaseSchema.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.DATABASE_SCHEMA); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseServiceIndex.java index 15942b1ab14..d539aebc596 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseServiceIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.services.DatabaseService; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class DatabaseServiceIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class DatabaseServiceIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (databaseService.getOwner() != null) { + EntityReference owner = databaseService.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + databaseService.setOwner(owner); + } Map doc = JsonUtils.getMap(databaseService); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(databaseService.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(databaseService.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.DASHBOARD_SERVICE); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DomainIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DomainIndex.java index 653e8b7e961..46937d0f802 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DomainIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DomainIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.domains.Domain; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class DomainIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class DomainIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (domain.getOwner() != null) { + EntityReference owner = domain.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + domain.setOwner(owner); + } Map doc = JsonUtils.getMap(domain); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(domain.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(domain.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.DOMAIN); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MessagingServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MessagingServiceIndex.java index 1928125cc9c..85ff41d3197 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MessagingServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MessagingServiceIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.services.MessagingService; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class MessagingServiceIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class MessagingServiceIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (messagingService.getOwner() != null) { + EntityReference owner = messagingService.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + messagingService.setOwner(owner); + } Map doc = JsonUtils.getMap(messagingService); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(messagingService.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(messagingService.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.MESSAGING_SERVICE); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MlModelServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MlModelServiceIndex.java index e8509a490a2..16f9a24b261 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MlModelServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MlModelServiceIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.services.MlModelService; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class MlModelServiceIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class MlModelServiceIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (mlModelService.getOwner() != null) { + EntityReference owner = mlModelService.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + mlModelService.setOwner(owner); + } Map doc = JsonUtils.getMap(mlModelService); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(mlModelService.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(mlModelService.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.MLMODEL_SERVICE); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/PipelineServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/PipelineServiceIndex.java index 3caa847e91a..e9e789452aa 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/PipelineServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/PipelineServiceIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.services.PipelineService; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class PipelineServiceIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class PipelineServiceIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (pipelineService.getOwner() != null) { + EntityReference owner = pipelineService.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + pipelineService.setOwner(owner); + } Map doc = JsonUtils.getMap(pipelineService); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(pipelineService.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(pipelineService.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.PIPELINE_SERVICE); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchEntityIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchEntityIndex.java new file mode 100644 index 00000000000..af9b3418f88 --- /dev/null +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchEntityIndex.java @@ -0,0 +1,38 @@ +package org.openmetadata.service.search.indexes; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; +import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; +import org.openmetadata.service.util.JsonUtils; + +public class SearchEntityIndex implements ElasticSearchIndex { + + final org.openmetadata.schema.entity.data.SearchIndex searchIndex; + + private static final List excludeFields = List.of("changeDescription"); + + public SearchEntityIndex(org.openmetadata.schema.entity.data.SearchIndex searchIndex) { + this.searchIndex = searchIndex; + } + + public Map buildESDoc() { + if (searchIndex.getOwner() != null) { + EntityReference owner = searchIndex.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + searchIndex.setOwner(owner); + } + Map doc = JsonUtils.getMap(searchIndex); + SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(searchIndex.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(searchIndex.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.SEARCH_INDEX); + return doc; + } +} diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java deleted file mode 100644 index 29b25034844..00000000000 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchIndex.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.openmetadata.service.search.indexes; - -import java.util.List; -import java.util.Map; -import org.openmetadata.service.search.SearchIndexUtils; -import org.openmetadata.service.util.JsonUtils; - -public class SearchIndex implements ElasticSearchIndex { - - final org.openmetadata.schema.entity.data.SearchIndex searchIndex; - - private static final List excludeFields = List.of("changeDescription"); - - public SearchIndex(org.openmetadata.schema.entity.data.SearchIndex searchIndex) { - this.searchIndex = searchIndex; - } - - public Map buildESDoc() { - Map doc = JsonUtils.getMap(searchIndex); - SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); - return doc; - } -} diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchServiceIndex.java index 187ea494148..4a791eb66f4 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchServiceIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.services.SearchService; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class SearchServiceIndex implements ElasticSearchIndex { @@ -17,8 +22,18 @@ public class SearchServiceIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (searchService.getOwner() != null) { + EntityReference owner = searchService.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + searchService.setOwner(owner); + } Map doc = JsonUtils.getMap(searchService); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(searchService.getName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(searchService.getFullyQualifiedName()).weight(5).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.SEARCH_SERVICE); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/StoredProcedureIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/StoredProcedureIndex.java index f535eceddac..054d38f638a 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/StoredProcedureIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/StoredProcedureIndex.java @@ -1,9 +1,24 @@ package org.openmetadata.service.search.indexes; +import static org.openmetadata.service.Entity.FIELD_DESCRIPTION; +import static org.openmetadata.service.Entity.FIELD_DISPLAY_NAME; +import static org.openmetadata.service.Entity.FIELD_NAME; +import static org.openmetadata.service.search.EntityBuilderConstant.DISPLAY_NAME_KEYWORD; +import static org.openmetadata.service.search.EntityBuilderConstant.FIELD_DESCRIPTION_NGRAM; +import static org.openmetadata.service.search.EntityBuilderConstant.FIELD_DISPLAY_NAME_NGRAM; +import static org.openmetadata.service.search.EntityBuilderConstant.FIELD_NAME_NGRAM; +import static org.openmetadata.service.search.EntityBuilderConstant.NAME_KEYWORD; + +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.entity.data.StoredProcedure; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class StoredProcedureIndex implements ElasticSearchIndex { @@ -17,8 +32,31 @@ public class StoredProcedureIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (storedProcedure.getOwner() != null) { + EntityReference owner = storedProcedure.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + storedProcedure.setOwner(owner); + } Map doc = JsonUtils.getMap(storedProcedure); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(storedProcedure.getFullyQualifiedName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(storedProcedure.getName()).weight(10).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.STORED_PROCEDURE); return doc; } + + public static Map getFields() { + Map fields = new HashMap<>(); + fields.put(FIELD_DISPLAY_NAME, 15.0f); + fields.put(FIELD_DISPLAY_NAME_NGRAM, 1.0f); + fields.put(FIELD_NAME, 15.0f); + fields.put(FIELD_NAME_NGRAM, 1.0f); + fields.put(DISPLAY_NAME_KEYWORD, 25.0f); + fields.put(NAME_KEYWORD, 25.0f); + fields.put(FIELD_DESCRIPTION, 1.0f); + fields.put(FIELD_DESCRIPTION_NGRAM, 1.0f); + return fields; + } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java index 389a64f1047..654976fbb9b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java @@ -9,12 +9,14 @@ import java.util.List; import java.util.Map; import java.util.UUID; import lombok.SneakyThrows; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.tests.TestCase; import org.openmetadata.schema.tests.TestSuite; import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.Include; import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class TestCaseIndex implements ElasticSearchIndex { @@ -28,6 +30,11 @@ public class TestCaseIndex implements ElasticSearchIndex { @SneakyThrows public Map buildESDoc() { + if (testCase.getOwner() != null) { + EntityReference owner = testCase.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + testCase.setOwner(owner); + } List testSuiteArray = new ArrayList<>(); if (testCase.getTestSuites() != null) { for (TestSuite suite : testCase.getTestSuites()) { @@ -38,6 +45,11 @@ public class TestCaseIndex implements ElasticSearchIndex { testCase.setTestSuites(testSuiteArray); Map doc = JsonUtils.getMap(testCase); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(testCase.getFullyQualifiedName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(testCase.getName()).weight(10).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.TEST_CASE); return doc; } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestSuiteIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestSuiteIndex.java index a2c5671132f..69a22d35a89 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestSuiteIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestSuiteIndex.java @@ -1,9 +1,14 @@ package org.openmetadata.service.search.indexes; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.openmetadata.common.utils.CommonUtil; import org.openmetadata.schema.tests.TestSuite; +import org.openmetadata.schema.type.EntityReference; +import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; +import org.openmetadata.service.search.models.SearchSuggest; import org.openmetadata.service.util.JsonUtils; public class TestSuiteIndex implements ElasticSearchIndex { @@ -16,8 +21,18 @@ public class TestSuiteIndex implements ElasticSearchIndex { } public Map buildESDoc() { + if (testSuite.getOwner() != null) { + EntityReference owner = testSuite.getOwner(); + owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName()); + testSuite.setOwner(owner); + } Map doc = JsonUtils.getMap(testSuite); SearchIndexUtils.removeNonIndexableFields(doc, excludeFields); + List suggest = new ArrayList<>(); + suggest.add(SearchSuggest.builder().input(testSuite.getFullyQualifiedName()).weight(5).build()); + suggest.add(SearchSuggest.builder().input(testSuite.getName()).weight(10).build()); + doc.put("suggest", suggest); + doc.put("entityType", Entity.TEST_SUITE); return doc; } } diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/chart_Index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/chart_Index_mapping.json index d9715e7894c..3867e579d96 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/chart_Index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/chart_Index_mapping.json @@ -101,6 +101,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json index bded5bce1f2..eb800162234 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json @@ -72,6 +72,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "description": { "type": "text", "analyzer": "om_analyzer", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json index 59da46d8b95..54942344c26 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json @@ -95,6 +95,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json index b495472db6b..82a183045f8 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json @@ -125,6 +125,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json index 4f2f819a053..59216e9f508 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json @@ -82,6 +82,9 @@ } } }, + "entityType": { + "type": "keyword" + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json index 56258b2fc78..884c5773efc 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json @@ -72,6 +72,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "description": { "type": "text", "analyzer": "om_analyzer", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json index 5a57b0e8dc9..2ec2ced473c 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json @@ -95,6 +95,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "domain" : { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json index af38a3462b3..5a6eea7b356 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json @@ -122,6 +122,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "tags": { "properties": { "tagFQN": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json index ba769dc38cb..3538800df1f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json @@ -85,6 +85,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json index f753f2088bd..2395912232f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json @@ -117,6 +117,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "tags": { "properties": { "tagFQN": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json index d9150c2680b..0d1d44496fb 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json @@ -85,6 +85,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json index f1e20101d1d..81179b8454f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json @@ -79,6 +79,19 @@ "updatedBy": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "tags": { "properties": { "tagFQN": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/search_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json similarity index 95% rename from openmetadata-service/src/main/resources/elasticsearch/en/search_index_mapping.json rename to openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json index ff3cd7ab423..6af554fd04e 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/search_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json @@ -92,6 +92,19 @@ "updatedBy": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "service": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json index 75f8d21c809..5064f017d73 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json @@ -85,6 +85,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "pipelines": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json index 54718f72ffb..00caac93080 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json @@ -295,6 +295,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "followers": { "type": "keyword" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json index 44070dfeadb..ddcd92a9ba3 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json @@ -171,6 +171,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json index acf63fef3b3..77324b48f62 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json @@ -78,6 +78,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "deleted": { "type": "text" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json index b1ea3c1a2b8..b30bfdba3a1 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json @@ -85,6 +85,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json index a86afa2aeb6..8a845bf1ae3 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json @@ -85,6 +85,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index.json b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index.json index ab5e69d96fd..2da5e169773 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index.json @@ -85,6 +85,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json index 9f824f9315a..cd6ab92ddde 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json @@ -72,6 +72,19 @@ "type": "text", "analyzer": "om_analyzer_jp" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "pipelines": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json index 5f3cc870a86..a94b5c2e601 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json @@ -92,6 +92,9 @@ } } }, + "entityType": { + "type": "keyword" + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json index 6425ed73260..3109d565e25 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json @@ -151,6 +151,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json index 3a5284c2a51..aaae1938073 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json @@ -105,6 +105,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "domain" : { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json index e7e12bf5956..abc4767169a 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json @@ -61,6 +61,19 @@ "type": "keyword", "normalizer": "lowercase_normalizer" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "displayName": { "type": "text", "analyzer": "om_analyzer_jp", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json index 7dce68136d5..5bfb596cfa0 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json @@ -101,6 +101,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json index 493c94533f8..52a3a43f071 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json @@ -120,6 +120,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "tags": { "properties": { "tagFQN": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json index b7125860b13..143683b17d7 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json @@ -88,6 +88,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json index 98d1dca523a..d9d03c6b363 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json @@ -175,6 +175,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "href": { "type": "text" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/search_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json similarity index 95% rename from openmetadata-service/src/main/resources/elasticsearch/jp/search_index_mapping.json rename to openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json index b2d47203d1e..a87f7c267f7 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/search_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json @@ -135,6 +135,19 @@ "serviceType": { "type": "keyword" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json index ee63473e3ff..1d01be1fc17 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json @@ -125,6 +125,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "tags": { "properties": { "tagFQN": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json index 933821663a9..cca4149f8ab 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json @@ -108,6 +108,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "databaseSchema": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json index 3f72d0d4ba1..94b98ff7d4c 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json @@ -181,6 +181,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json index eb73ffe8dd1..61dc7bc9871 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json @@ -81,6 +81,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "deleted": { "type": "text" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json index 857e13b0c1b..8aa857605c5 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json @@ -62,6 +62,19 @@ "analyzer": "ik_max_word", "search_analyzer": "ik_smart" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/classfication_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/classfication_index_mapping.json index e4957a720dc..2ad8194ed04 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/classfication_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/classfication_index_mapping.json @@ -58,6 +58,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "description": { "type": "text", "analyzer": "ik_max_word", diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json index ca46d6d756a..3447e86c23d 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json @@ -76,6 +76,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json index 5e93b074d1e..bd1a8e8039c 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json @@ -118,6 +118,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json index e09e1ae64bd..75455139142 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json @@ -76,6 +76,9 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json index d435f28b613..87c6a4eb94f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json @@ -57,6 +57,19 @@ "analyzer": "ik_max_word", "search_analyzer": "ik_smart" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "tags": { "properties": { "tagFQN": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json index 21bc6272f11..17ac472b3c4 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json @@ -75,6 +75,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "domain" : { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json index d236afc0271..91b4c9ba634 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json @@ -103,6 +103,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "tags": { "properties": { "tagFQN": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json index 853df375db0..c13a8431c75 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json @@ -79,6 +79,19 @@ "href": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json index 9b7656b6bcc..81532410046 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json @@ -64,6 +64,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "pipelines": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json index eb26af46353..37a0df91e3b 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json @@ -76,6 +76,19 @@ "updatedBy": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "pipelines": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json index 1f80d1adc77..0da2c44dc75 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json @@ -72,6 +72,19 @@ "updatedBy": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "tags": { "properties": { "tagFQN": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/search_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json similarity index 95% rename from openmetadata-service/src/main/resources/elasticsearch/zh/search_index_mapping.json rename to openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json index cf24c20355b..a4c7ce6b481 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/search_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json @@ -113,6 +113,19 @@ "serviceType": { "type": "keyword" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json index c9072096c7e..9149441aa99 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json @@ -122,6 +122,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "version": { "type": "float" }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json index 7b1223cf746..6280383ab1d 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json @@ -230,6 +230,19 @@ "deleted": { "type": "text" }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json index 0289bbf0964..8a362e2fd66 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json @@ -171,6 +171,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "owner": { "properties": { "id": { diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json index 510a961f764..f91ff81354f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json @@ -63,6 +63,19 @@ } } }, + "entityType": { + "type": "keyword" + }, + "suggest": { + "type": "completion", + "contexts": [ + { + "name": "deleted", + "type": "category", + "path": "deleted" + } + ] + }, "deleted": { "type": "text" },