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

Handling latest_by and earliest_by on numeric columns correctly (#15939) 

* Handling latest_by and earliest_by on numeric columns correctly

* Adding test
This commit is contained in:
Soumyava 2024-03-11 13:49:21 -07:00 committed by GitHub
parent 313da98879
commit 85ee775390
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
processing/src/main/java/org/apache/druid/query/aggregation/first/NumericFirstAggregator.java
View File

@ -62,10 +62,6 @@ public abstract class NumericFirstAggregator implements Aggregator
@Override
public void aggregate()
{
if (timeSelector.isNull()) {
return;
}
if (needsFoldCheck) {
final Object object = valueSelector.getObject();
if (object instanceof SerializablePair) {
@ -84,6 +80,10 @@ public abstract class NumericFirstAggregator implements Aggregator
}
}
if (timeSelector.isNull()) {
return;
}
long time = timeSelector.getLong();
if (time < firstTime) {
firstTime = time;

8
processing/src/main/java/org/apache/druid/query/aggregation/first/NumericFirstBufferAggregator.java
View File

@ -97,10 +97,6 @@ public abstract class NumericFirstBufferAggregator implements BufferAggregator
@Override
public void aggregate(ByteBuffer buf, int position)
{
if (timeSelector.isNull()) {
return;
}
long firstTime = buf.getLong(position);
if (needsFoldCheck) {
final Object object = valueSelector.getObject();
@ -117,6 +113,10 @@ public abstract class NumericFirstBufferAggregator implements BufferAggregator
}
}
if (timeSelector.isNull()) {
return;
}
long time = timeSelector.getLong();
if (time < firstTime) {

9
processing/src/main/java/org/apache/druid/query/aggregation/last/NumericLastAggregator.java
View File

@ -61,10 +61,6 @@ public abstract class NumericLastAggregator implements Aggregator
@Override
public void aggregate()
{
if (timeSelector.isNull()) {
return;
}
if (needsFoldCheck) {
final Object object = valueSelector.getObject();
if (object instanceof SerializablePair) {
@ -83,6 +79,11 @@ public abstract class NumericLastAggregator implements Aggregator
return;
}
}
if (timeSelector.isNull()) {
return;
}
long time = timeSelector.getLong();
if (time >= lastTime) {
lastTime = time;

8
processing/src/main/java/org/apache/druid/query/aggregation/last/NumericLastBufferAggregator.java
View File

@ -100,10 +100,6 @@ public abstract class NumericLastBufferAggregator implements BufferAggregator
@Override
public void aggregate(ByteBuffer buf, int position)
{
if (timeSelector.isNull()) {
return;
}
long lastTime = buf.getLong(position);
if (needsFoldCheck) {
final Object object = valueSelector.getObject();
@ -121,6 +117,10 @@ public abstract class NumericLastBufferAggregator implements BufferAggregator
}
}
if (timeSelector.isNull()) {
return;
}
long time = timeSelector.getLong();
if (time >= lastTime) {

30
sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
View File

@ -15404,4 +15404,34 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
ImmutableList.of(new Object[]{NullHandling.sqlCompatible() ? 4L : 0L})
);
}
@Test
public void testLatestByAggregatorOnSecondaryTimestampGroupBy()
{
msqIncompatible();
testQuery(
"SELECT __time, m1, LATEST_BY(m1, MILLIS_TO_TIMESTAMP(CAST(m2 AS NUMERIC))) from druid.numfoo GROUP BY 1,2",
ImmutableList.of(
new GroupByQuery.Builder()
.setDataSource(CalciteTests.DATASOURCE3)
.setInterval(querySegmentSpec(Filtration.eternity()))
.setGranularity(Granularities.ALL)
.setDimensions(
new DefaultDimensionSpec("__time", "_d0", ColumnType.LONG),
new DefaultDimensionSpec("m1", "_d1", ColumnType.FLOAT)
)
.setAggregatorSpecs(aggregators(new FloatLastAggregatorFactory("a0", "m1", "m2")))
.setContext(OUTER_LIMIT_CONTEXT)
.build()
),
ImmutableList.of(
new Object[]{946684800000L, 1.0F, 1.0F},
new Object[]{946771200000L, 2.0F, 2.0F},
new Object[]{946857600000L, 3.0F, 3.0F},
new Object[]{978307200000L, 4.0F, 4.0F},
new Object[]{978393600000L, 5.0F, 5.0F},
new Object[]{978480000000L, 6.0F, 6.0F}
)
);
}
}