yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-06-27 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #21653 - Remove recently added delete param field in searchByField api (#21723)

Browse Source
This commit is contained in:
sonika-shah 2025-06-13 03:17:54 +05:30 committed by GitHub
parent 269d967b2d
commit 66d2ef2c8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java
View File

@ -409,14 +409,10 @@ public class SearchResource {
@Parameter(description = "Search Index name, defaults to table_search_index") @Parameter(description = "Search Index name, defaults to table_search_index")
@DefaultValue("table_search_index") @DefaultValue("table_search_index")
@QueryParam("index") @QueryParam("index")
String index, String index)
@Parameter(description = "Filter documents by deleted param. By default deleted is false")
@DefaultValue("false")
@QueryParam("deleted")
boolean deleted)
throws IOException { throws IOException {
return searchRepository.searchByField(fieldName, fieldValue, index, deleted); return searchRepository.searchByField(fieldName, fieldValue, index);
} }
@GET @GET

3
openmetadata-service/src/main/java/org/openmetadata/service/search/SearchClient.java
View File

@ -257,8 +257,7 @@ public interface SearchClient {
Response.Status.NOT_IMPLEMENTED, NOT_IMPLEMENTED_ERROR_TYPE, NOT_IMPLEMENTED_METHOD); Response.Status.NOT_IMPLEMENTED, NOT_IMPLEMENTED_ERROR_TYPE, NOT_IMPLEMENTED_METHOD);
} }
Response searchByField(String fieldName, String fieldValue, String index, Boolean deleted) Response searchByField(String fieldName, String fieldValue, String index) throws IOException;
throws IOException;
Response aggregate(AggregationRequest request) throws IOException; Response aggregate(AggregationRequest request) throws IOException;

4
openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java
View File

@ -1160,9 +1160,9 @@ public class SearchRepository {
.withIsConnectedVia(isConnectedVia(entityType))); .withIsConnectedVia(isConnectedVia(entityType)));
} }
public Response searchByField(String fieldName, String fieldValue, String index, Boolean deleted) public Response searchByField(String fieldName, String fieldValue, String index)
throws IOException { throws IOException {
return searchClient.searchByField(fieldName, fieldValue, index, deleted); return searchClient.searchByField(fieldName, fieldValue, index);
} }
public Response aggregate(AggregationRequest request) throws IOException { public Response aggregate(AggregationRequest request) throws IOException {

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

@ -1308,17 +1308,13 @@ public class ElasticSearchClient implements SearchClient {
} }
@Override @Override
public Response searchByField(String fieldName, String fieldValue, String index, Boolean deleted) public Response searchByField(String fieldName, String fieldValue, String index)
throws IOException { throws IOException {
es.org.elasticsearch.action.search.SearchRequest searchRequest = es.org.elasticsearch.action.search.SearchRequest searchRequest =
new es.org.elasticsearch.action.search.SearchRequest( new es.org.elasticsearch.action.search.SearchRequest(
Entity.getSearchRepository().getIndexOrAliasName(index)); Entity.getSearchRepository().getIndexOrAliasName(index));
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
BoolQueryBuilder query = searchSourceBuilder.query(QueryBuilders.wildcardQuery(fieldName, fieldValue));
QueryBuilders.boolQuery()
.must(QueryBuilders.wildcardQuery(fieldName, fieldValue))
.filter(QueryBuilders.termQuery("deleted", deleted));
searchSourceBuilder.query(query);
searchRequest.source(searchSourceBuilder); searchRequest.source(searchSourceBuilder);
String response = client.search(searchRequest, RequestOptions.DEFAULT).toString(); String response = client.search(searchRequest, RequestOptions.DEFAULT).toString();
return Response.status(OK).entity(response).build(); return Response.status(OK).entity(response).build();

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

@ -1382,17 +1382,13 @@ public class OpenSearchClient implements SearchClient {
} }
@Override @Override
public Response searchByField(String fieldName, String fieldValue, String index, Boolean deleted) public Response searchByField(String fieldName, String fieldValue, String index)
throws IOException { throws IOException {
os.org.opensearch.action.search.SearchRequest searchRequest = os.org.opensearch.action.search.SearchRequest searchRequest =
new os.org.opensearch.action.search.SearchRequest( new os.org.opensearch.action.search.SearchRequest(
Entity.getSearchRepository().getIndexOrAliasName(index)); Entity.getSearchRepository().getIndexOrAliasName(index));
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
BoolQueryBuilder query = searchSourceBuilder.query(QueryBuilders.wildcardQuery(fieldName, fieldValue));
QueryBuilders.boolQuery()
.must(QueryBuilders.wildcardQuery(fieldName, fieldValue))
.filter(QueryBuilders.termQuery("deleted", deleted));
searchSourceBuilder.query(query);
searchRequest.source(searchSourceBuilder); searchRequest.source(searchSourceBuilder);
String response = client.search(searchRequest, RequestOptions.DEFAULT).toString(); String response = client.search(searchRequest, RequestOptions.DEFAULT).toString();
return Response.status(OK).entity(response).build(); return Response.status(OK).entity(response).build();