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

[Transform] Always apply range query in continuous mode. #65928

Merged
merged 3 commits into from
Dec 9, 2020
Merged

[Transform] Always apply range query in continuous mode. #65928

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4410a04
Always apply range query in continuous mode.
przemekwitek Dec 7, 2020
5b43c4a
Apply review comment
przemekwitek Dec 8, 2020
ddcf476
Make sure filter query is not null before adding it to bool query
przemekwitek Dec 8, 2020
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
34 changes: 17 additions & 17 deletions ...ransform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,30 +871,30 @@ private SearchSourceBuilder buildUpdateQuery(SearchSourceBuilder sourceBuilder)
TransformIndexerPosition position = getPosition();

TransformConfig config = getConfig();
QueryBuilder queryBuilder = config.getSource().getQueryConfig().getQuery();

function.buildSearchQuery(sourceBuilder, position != null ? position.getIndexerPosition() : null, pageSize);

// if its either the 1st run or not continuous, do not apply extra filters
if (nextCheckpoint.getCheckpoint() == 1 || isContinuous() == false) {
sourceBuilder.query(queryBuilder);
logger.debug(() -> new ParameterizedMessage("[{}] Querying for data: {}", getJobId(), sourceBuilder));

return sourceBuilder;
}

BoolQueryBuilder filteredQuery = new BoolQueryBuilder().filter(queryBuilder)
.filter(config.getSyncConfig().getRangeQuery(nextCheckpoint));
QueryBuilder queryBuilder = config.getSource().getQueryConfig().getQuery();

QueryBuilder filter = changeCollector != null
? changeCollector.buildFilterQuery(lastCheckpoint.getTimeUpperBound(), nextCheckpoint.getTimeUpperBound())
: null;
if (isContinuous()) {
BoolQueryBuilder filteredQuery =
new BoolQueryBuilder()
.filter(queryBuilder)
.filter(config.getSyncConfig().getRangeQuery(nextCheckpoint));

// Only apply extra filter if it is the subsequent run of the continuous transform
if (nextCheckpoint.getCheckpoint() > 1 && changeCollector != null) {
QueryBuilder filter =
changeCollector.buildFilterQuery(lastCheckpoint.getTimeUpperBound(), nextCheckpoint.getTimeUpperBound());
if (filter != null) {
filteredQuery.filter(filter);
}
}

if (filter != null) {
filteredQuery.filter(filter);
queryBuilder = filteredQuery;
}

sourceBuilder.query(filteredQuery);
sourceBuilder.query(queryBuilder);
logger.debug(() -> new ParameterizedMessage("[{}] Querying for data: {}", getJobId(), sourceBuilder));

return sourceBuilder;
Expand Down