yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-31 02:29:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor : Fix exception in search due to exception in database.displayName and databaseSchema.aggregation (#18270)

Browse Source 
* Minor : Update database.displayName in search indexes from text to keyword

* Update for databaseSchema.displayName and serviceType in search indexes from text to keyword

* Revert "Update for databaseSchema.displayName and serviceType in search indexes from text to keyword"

This reverts commit 16408d81a234b505cfe794dd983f282612c10c9f.

Revert commit changes - 1

* Revert "Minor : Update database.displayName in search indexes from text to keyword"

This reverts commit 2264563f726df07db85ddfea09826e5cfe1fd076.

* print rows in the order of columns defined in config
This commit is contained in:
sonika-shah 2024-10-16 08:23:41 +05:30 committed by GitHub
parent c6586d338d
commit 831cccf71e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1363,6 +1363,23 @@ public class ElasticSearchClient implements SearchClient {
buildSearchQueryBuilder(query, SearchIndex.getAllFields());
FunctionScoreQueryBuilder queryBuilder = boostScore(queryStringBuilder);
SearchSourceBuilder searchSourceBuilder = searchBuilder(queryBuilder, null, from, size);
searchSourceBuilder.aggregation(
AggregationBuilders.terms("database.name.keyword")
.field("database.name.keyword")
.size(MAX_AGGREGATE_SIZE));
searchSourceBuilder.aggregation(
AggregationBuilders.terms("databaseSchema.name.keyword")
.field("databaseSchema.name.keyword")
.size(MAX_AGGREGATE_SIZE));
return addAggregation(searchSourceBuilder);
}
private static SearchSourceBuilder buildDataAssetsSearchBuilder(
String query, int from, int size) {
QueryStringQueryBuilder queryStringBuilder =
buildSearchQueryBuilder(query, SearchIndex.getAllFields());
FunctionScoreQueryBuilder queryBuilder = boostScore(queryStringBuilder);
SearchSourceBuilder searchSourceBuilder = searchBuilder(queryBuilder, null, from, size);
searchSourceBuilder.aggregation(
AggregationBuilders.terms("database.name.keyword")
.field("database.name.keyword")
@ -2362,7 +2379,8 @@ public class ElasticSearchClient implements SearchClient {
"storage_service_index",
"search_service_index",
"metadata_service_index" -> buildServiceSearchBuilder(q, from, size);
case "all", "dataAsset" -> buildSearchAcrossIndexesBuilder(q, from, size);
case "dataAsset" -> buildDataAssetsSearchBuilder(q, from, size);
case "all" -> buildSearchAcrossIndexesBuilder(q, from, size);
default -> buildAggregateSearchBuilder(q, from, size);
};
}

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

@ -1339,6 +1339,24 @@ public class OpenSearchClient implements SearchClient {
FunctionScoreQueryBuilder queryBuilder = boostScore(queryStringBuilder);
queryBuilder.boostMode(CombineFunction.SUM);
SearchSourceBuilder searchSourceBuilder = searchBuilder(queryBuilder, null, from, size);
searchSourceBuilder.aggregation(
AggregationBuilders.terms("database.name.keyword")
.field("database.name.keyword")
.size(MAX_AGGREGATE_SIZE));
searchSourceBuilder.aggregation(
AggregationBuilders.terms("databaseSchema.name.keyword")
.field("databaseSchema.name.keyword")
.size(MAX_AGGREGATE_SIZE));
return addAggregation(searchSourceBuilder);
}
private static SearchSourceBuilder buildDataAssetsSearchBuilder(
String query, int from, int size) {
QueryStringQueryBuilder queryStringBuilder =
buildSearchQueryBuilder(query, SearchIndex.getAllFields());
FunctionScoreQueryBuilder queryBuilder = boostScore(queryStringBuilder);
queryBuilder.boostMode(CombineFunction.SUM);
SearchSourceBuilder searchSourceBuilder = searchBuilder(queryBuilder, null, from, size);
searchSourceBuilder.aggregation(
AggregationBuilders.terms("database.name.keyword")
.field("database.name.keyword")
@ -2323,7 +2341,8 @@ public class OpenSearchClient implements SearchClient {
"storage_service_index",
"search_service_index",
"metadata_service_index" -> buildServiceSearchBuilder(q, from, size);
case "all", "dataAsset" -> buildSearchAcrossIndexesBuilder(q, from, size);
case "dataAsset" -> buildDataAssetsSearchBuilder(q, from, size);
case "all" -> buildSearchAcrossIndexesBuilder(q, from, size);
default -> buildAggregateSearchBuilder(q, from, size);
};
}

4
openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json
View File

@ -439,6 +439,10 @@
"type": "text"
}
}
},
"serviceType": {
"type": "keyword",
"normalizer": "lowercase_normalizer"
}
}
}

4
openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json
View File

@ -419,6 +419,10 @@
}
}
},
"serviceType": {
"type": "keyword",
"normalizer": "lowercase_normalizer"
},
"totalVotes": {
"type": "long",
"null_value": 0

4
openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json
View File

@ -408,6 +408,10 @@
}
}
},
"serviceType": {
"type": "keyword",
"normalizer": "lowercase_normalizer"
},
"totalVotes": {
"type": "long",
"null_value": 0