Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plt 1651 search after #3237

Merged
merged 2 commits into from
Jun 12, 2024
Merged

Plt 1651 search after #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e9b3eb
feature: Added support for "search_after" in elasticsearch queries
hitk6 Jun 12, 2024
8724ab2
fix names
hitk6 Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions intg/src/main/java/org/apache/atlas/model/discovery/AtlasSearchResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,12 @@ public void addSort(String guid, ArrayList sort) {
if(MapUtils.isEmpty(this.searchMetadata)) {
this.searchMetadata = new LinkedHashMap<>();
}
ElasticsearchMetadata v = this.searchMetadata.getOrDefault(guid, new ElasticsearchMetadata());
v.addSort(sort);
ElasticsearchMetadata sortMetadata = this.searchMetadata.getOrDefault(guid, new ElasticsearchMetadata());
sortMetadata.addSort(sort);
if (this.searchMetadata.containsKey(guid)) {
this.searchMetadata.replace(guid, v);
this.searchMetadata.replace(guid, sortMetadata);
} else {
this.searchMetadata.put(guid, v);
this.searchMetadata.put(guid, sortMetadata);
}
}

Expand Down
3 changes: 3 additions & 0 deletions intg/src/main/java/org/apache/atlas/model/discovery/ElasticsearchMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.apache.atlas.model.discovery;

import com.fasterxml.jackson.annotation.JsonInclude;
import org.apache.commons.collections.MapUtils;

import java.util.HashMap;
Expand All @@ -10,6 +11,8 @@
public class ElasticsearchMetadata {

private Map<String, List<String>> highlights;

@JsonInclude(JsonInclude.Include.NON_NULL)
private ArrayList<Object> sort;

public Map<String, List<String>> getHighlights() {
Expand Down
8 changes: 7 additions & 1 deletion intg/src/main/java/org/apache/atlas/model/discovery/SearchParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public class SearchParams {
Async async = new Async();
boolean showHighlights;

boolean showSearchMetadata;

public String getQuery() {
return getQuery();
}
Expand Down Expand Up @@ -154,10 +156,14 @@ public String getSearchInput() {
return this.requestMetadata.getSearchInput();
}

public boolean isShowHighlights() {
public boolean getShowHighlights() {
return showHighlights;
}

public boolean getShowSearchMetadata() {
return showSearchMetadata;
}


static class RequestMetadata {
private String searchInput;
Expand Down
5 changes: 3 additions & 2 deletions repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,10 +1098,11 @@ private void prepareSearchResult(AtlasSearchResult ret, DirectIndexQueryResult i
header.setCollapse(collapse);
}
}

if (searchParams.isShowHighlights()) {
if (searchParams.getShowSearchMetadata()) {
ret.addHighlights(header.getGuid(), result.getHighLights());
ret.addSort(header.getGuid(), result.getSort());
} else if (searchParams.getShowHighlights()) {
ret.addHighlights(header.getGuid(), result.getHighLights());
}

ret.addEntity(header);
Expand Down
Loading