Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix0

This commit is contained in:
Zoltan Haindrich 2023-08-25 10:01:21 +00:00
parent bd7a49bd49
commit 44992cb393
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastBufferAggregator.java
View File

@ -64,9 +64,6 @@ public class StringLastBufferAggregator implements BufferAggregator
@Override @Override
public void aggregate(ByteBuffer buf, int position) public void aggregate(ByteBuffer buf, int position)
{ {
if (timeSelector.isNull()) {
return;
}
if (needsFoldCheck) { if (needsFoldCheck) {
// Less efficient code path when folding is a possibility (we must read the value selector first just in case // Less efficient code path when folding is a possibility (we must read the value selector first just in case
// it's a foldable object). // it's a foldable object).
@ -87,6 +84,9 @@ public class StringLastBufferAggregator implements BufferAggregator
} }
} }
} else { } else {
if (timeSelector.isNull()) {
return;
}
final long time = timeSelector.getLong(); final long time = timeSelector.getLong();
final long lastTime = buf.getLong(position); final long lastTime = buf.getLong(position);

5
sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
View File

@ -260,7 +260,10 @@ public class CalciteRulesManager
boolean isDebug = plannerContext.queryContext().isDebug(); boolean isDebug = plannerContext.queryContext().isDebug();
return ImmutableList.of( return ImmutableList.of(
Programs.sequence(preProgram, Programs.ofRules(druidConventionRuleSet(plannerContext))), Programs.sequence(preProgram,
new LoggingProgram("Start", true),
Programs.ofRules(druidConventionRuleSet(plannerContext)),
new LoggingProgram("End", true)),
Programs.sequence(preProgram, Programs.ofRules(bindableConventionRuleSet(plannerContext))), Programs.sequence(preProgram, Programs.ofRules(bindableConventionRuleSet(plannerContext))),
Programs.sequence( Programs.sequence(
// currently, adding logging program after every stage for easier debugging // currently, adding logging program after every stage for easier debugging