Skip to content

fixes #238 elasticsearch scroll #239

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

Merged
HuiJun merged 1 commit into from
Mar 31, 2023
Merged

fixes #238 elasticsearch scroll #239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions elastic/src/main/java/org/openmbee/mms/elastic/services/ElasticSearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,20 +209,20 @@ private List<ElementJson> performElasticQuery(Set<String> allNodeDocIds, SearchR
sourceBuilder.query(query);
sourceBuilder.size(resultLimit);
searchRequest.source(sourceBuilder);
searchRequest.scroll(TimeValue.timeValueMillis(scrollTimeout));
searchRequest.scroll(TimeValue.timeValueSeconds(scrollTimeout));
SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
String scrollId = null;

do {
for(SearchHit hit : searchResponse.getHits()) {
for (SearchHit hit : searchResponse.getHits()) {
ElementJson ob = parseResult(hit);
if(allNodeDocIds.contains(ob.getDocId())) {
if (allNodeDocIds.contains(ob.getDocId())) {
result.add(ob);
}
}
scrollId = searchResponse.getScrollId();
if (scrollId != null) {
SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId);
scrollRequest.scroll(TimeValue.timeValueSeconds(scrollTimeout));
searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT);
}

Expand Down Expand Up @@ -255,8 +255,6 @@ private Collection<OrderedResult<ElementJson>> filterIndexedElementsUsingDatabas
} else if(showDeletedAsRejected) {
deletedElements.add(new OrderedResult<>(new Rejection(currentJson.getWrapped(), 410, SearchConstants.ELEMENT_DELETED_INFO), currentJson.getOrder()));
}
} else { // node found in DB not found in the index
logger.warn(SearchConstants.POSSIBLE_ELASTIC_DISCREPANCY, n.getNodeId());
}
}

Expand Down