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

Fix aggregation with persistence store AGG_TIMESTAMP not applying for group by #1593

Merged
merged 1 commit into from
Dec 19, 2019
Merged

Fix aggregation with persistence store AGG_TIMESTAMP not applying for group by #1593

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
14 changes: 9 additions & 5 deletions modules/siddhi-core/src/main/java/io/siddhi/core/aggregation/AggregationRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,14 +520,18 @@ public CompiledCondition compileExpression(Expression expression, Within within,
withinExpressionTable = withinExpression;
}

List<Variable> queryGroupByListCopy = new ArrayList<>(queryGroupByList);

Variable timestampVariable = new Variable(AGG_START_TIMESTAMP_COL);
List<String> queryGroupByNamesList = queryGroupByList.stream()
List<String> queryGroupByNamesList = queryGroupByListCopy.stream()
.map(Variable::getAttributeName)
.collect(Collectors.toList());
boolean queryGroupByContainsTimestamp = queryGroupByNamesList.remove(AGG_START_TIMESTAMP_COL);

boolean isQueryGroupBySameAsAggGroupBy = queryGroupByList.isEmpty() ||
(queryGroupByList.contains(timestampVariable) && queryGroupByNamesList.equals(groupByVariablesList));
boolean isQueryGroupBySameAsAggGroupBy =
queryGroupByListCopy.isEmpty() ||
(queryGroupByListCopy.contains(timestampVariable) &&
queryGroupByNamesList.equals(groupByVariablesList));

List<VariableExpressionExecutor> variableExpExecutorsForTableLookups = new ArrayList<>();

Expand All @@ -544,9 +548,9 @@ public CompiledCondition compileExpression(Expression expression, Within within,
groupByList.add(new Variable(AGG_START_TIMESTAMP_COL));
}
//Remove timestamp to process the rest
queryGroupByList.remove(timestampVariable);
queryGroupByListCopy.remove(timestampVariable);
}
for (Variable queryGroupBy : queryGroupByList) {
for (Variable queryGroupBy : queryGroupByListCopy) {
String referenceId = queryGroupBy.getStreamId();
if (referenceId == null) {
if (tableAttributesNameList.contains(queryGroupBy.getAttributeName())) {
Expand Down