yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-07-26 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inconsistency in search entity and remove chart from all alias (#13602)

Browse Source
This commit is contained in:
07Himank 2023-10-17 18:35:19 +05:30 committed by GitHub
parent 75902ac8d8
commit e70d95b875
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
View File

@ -296,7 +296,7 @@ public class ElasticSearchClient implements SearchClient {
case "dashboard_data_model_search_index": case "dashboard_data_model_search_index":
searchSourceBuilder = buildDashboardDataModelsSearch(request.getQuery(), request.getFrom(), request.getSize()); searchSourceBuilder = buildDashboardDataModelsSearch(request.getQuery(), request.getFrom(), request.getSize());
break; break;
case "search_entity_index": case "search_entity_search_index":
searchSourceBuilder = buildSearchEntitySearch(request.getQuery(), request.getFrom(), request.getSize()); searchSourceBuilder = buildSearchEntitySearch(request.getQuery(), request.getFrom(), request.getSize());
break; break;
case "domain_search_index": case "domain_search_index":
@ -846,9 +846,12 @@ public class ElasticSearchClient implements SearchClient {
highlightDescription.highlighterType(UNIFIED); highlightDescription.highlighterType(UNIFIED);
HighlightBuilder.Field highlightName = new HighlightBuilder.Field(FIELD_NAME); HighlightBuilder.Field highlightName = new HighlightBuilder.Field(FIELD_NAME);
highlightName.highlighterType(UNIFIED); highlightName.highlighterType(UNIFIED);
HighlightBuilder.Field highlightDisplayName = new HighlightBuilder.Field(FIELD_DISPLAY_NAME);
highlightDisplayName.highlighterType(UNIFIED);
HighlightBuilder hb = new HighlightBuilder(); HighlightBuilder hb = new HighlightBuilder();
hb.field(highlightDescription); hb.field(highlightDescription);
hb.field(highlightName); hb.field(highlightName);
hb.field(highlightDisplayName);
hb.preTags(PRE_TAG); hb.preTags(PRE_TAG);
hb.postTags(POST_TAG); hb.postTags(POST_TAG);

5
openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
View File

@ -291,7 +291,7 @@ public class OpenSearchClient implements SearchClient {
case "domain_search_index": case "domain_search_index":
searchSourceBuilder = buildDomainsSearch(request.getQuery(), request.getFrom(), request.getSize()); searchSourceBuilder = buildDomainsSearch(request.getQuery(), request.getFrom(), request.getSize());
break; break;
case "search_entity_index": case "search_entity_search_index":
searchSourceBuilder = buildSearchEntitySearch(request.getQuery(), request.getFrom(), request.getSize()); searchSourceBuilder = buildSearchEntitySearch(request.getQuery(), request.getFrom(), request.getSize());
break; break;
case "raw_cost_analysis_report_data_index": case "raw_cost_analysis_report_data_index":
@ -858,9 +858,12 @@ public class OpenSearchClient implements SearchClient {
highlightDescription.highlighterType(UNIFIED); highlightDescription.highlighterType(UNIFIED);
HighlightBuilder.Field highlightName = new HighlightBuilder.Field(FIELD_NAME); HighlightBuilder.Field highlightName = new HighlightBuilder.Field(FIELD_NAME);
highlightName.highlighterType(UNIFIED); highlightName.highlighterType(UNIFIED);
HighlightBuilder.Field highlightDisplayName = new HighlightBuilder.Field(FIELD_NAME);
highlightDisplayName.highlighterType(UNIFIED);
HighlightBuilder hb = new HighlightBuilder(); HighlightBuilder hb = new HighlightBuilder();
hb.field(highlightDescription); hb.field(highlightDescription);
hb.field(highlightName); hb.field(highlightName);
hb.field(highlightDisplayName);
hb.preTags(PRE_TAG); hb.preTags(PRE_TAG);
hb.postTags(POST_TAG); hb.postTags(POST_TAG);

2
openmetadata-service/src/main/resources/elasticsearch/indexMapping.json
View File

@ -27,7 +27,7 @@
"indexName": "chart_search_index", "indexName": "chart_search_index",
"alias": "chart", "alias": "chart",
"indexMappingFile": "/elasticsearch/%s/chart_index_mapping.json", "indexMappingFile": "/elasticsearch/%s/chart_index_mapping.json",
"parentAliases": ["dashboard", "dashboardService", "all"] "parentAliases": ["dashboard", "dashboardService"]
}, },
"dashboard": { "dashboard": {
"indexName": "dashboard_search_index", "indexName": "dashboard_search_index",