yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-02 05:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add null check (#20518)

Browse Source
This commit is contained in:
Mohit Yadav 2025-03-31 23:44:20 +05:30 committed by GitHub
parent c550ca0112
commit 7a49a94235
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2366,8 +2366,12 @@ public class ElasticSearchClient implements SearchClient {
.createParser( .createParser(
EsUtils.esXContentRegistry, LoggingDeprecationHandler.INSTANCE, queryFilter); EsUtils.esXContentRegistry, LoggingDeprecationHandler.INSTANCE, queryFilter);
QueryBuilder filter = SearchSourceBuilder.fromXContent(filterParser).query(); QueryBuilder filter = SearchSourceBuilder.fromXContent(filterParser).query();
BoolQueryBuilder newQuery = BoolQueryBuilder newQuery;
QueryBuilders.boolQuery().must(searchSourceBuilder.query()).filter(filter); if (!nullOrEmpty(searchSourceBuilder.query())) {
newQuery = QueryBuilders.boolQuery().must(searchSourceBuilder.query()).filter(filter);
} else {
newQuery = QueryBuilders.boolQuery().filter(filter);
}
searchSourceBuilder.query(newQuery); searchSourceBuilder.query(newQuery);
} catch (Exception ex) { } catch (Exception ex) {
LOG.warn("Error parsing query_filter from query parameters, ignoring filter", ex); LOG.warn("Error parsing query_filter from query parameters, ignoring filter", ex);

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

@ -2457,8 +2457,12 @@ public class OpenSearchClient implements SearchClient {
.createParser( .createParser(
OsUtils.osXContentRegistry, LoggingDeprecationHandler.INSTANCE, queryFilter); OsUtils.osXContentRegistry, LoggingDeprecationHandler.INSTANCE, queryFilter);
QueryBuilder filter = SearchSourceBuilder.fromXContent(filterParser).query(); QueryBuilder filter = SearchSourceBuilder.fromXContent(filterParser).query();
BoolQueryBuilder newQuery = BoolQueryBuilder newQuery;
QueryBuilders.boolQuery().must(searchSourceBuilder.query()).filter(filter); if (!nullOrEmpty(searchSourceBuilder.query())) {
newQuery = QueryBuilders.boolQuery().must(searchSourceBuilder.query()).filter(filter);
} else {
newQuery = QueryBuilders.boolQuery().filter(filter);
}
searchSourceBuilder.query(newQuery); searchSourceBuilder.query(newQuery);
} catch (Exception ex) { } catch (Exception ex) {
LOG.warn("Error parsing query_filter from query parameters, ignoring filter", ex); LOG.warn("Error parsing query_filter from query parameters, ignoring filter", ex);