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

RowAdapter: Add a default implementation for timestampFunction. (#11885) 

Enables simpler implementations for adapters that want to treat the
timestamp as "just another column".
This commit is contained in:
Gian Merlino 2021-11-08 10:25:13 -08:00 committed by GitHub
parent 7237dc837c
commit a5bd0b8cc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
processing/src/main/java/org/apache/druid/query/InlineDataSource.java
View File

@ -27,7 +27,6 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import org.apache.druid.java.util.common.IAE;
import org.apache.druid.segment.RowAdapter;
import org.apache.druid.segment.column.ColumnHolder;
import org.apache.druid.segment.column.ColumnType;
import org.apache.druid.segment.column.RowSignature;
@ -37,8 +36,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.function.ToLongFunction;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@ -196,30 +193,13 @@ public class InlineDataSource implements DataSource
public RowAdapter<Object[]> rowAdapter()
{
return new RowAdapter<Object[]>()
{
@Override
public ToLongFunction<Object[]> timestampFunction()
{
final int columnNumber = signature.indexOf(ColumnHolder.TIME_COLUMN_NAME);
return columnName -> {
final int columnNumber = signature.indexOf(columnName);
if (columnNumber >= 0) {
return row -> (long) row[columnNumber];
} else {
return row -> 0L;
}
}
@Override
public Function<Object[], Object> columnFunction(String columnName)
{
final int columnNumber = signature.indexOf(columnName);
if (columnNumber >= 0) {
return row -> row[columnNumber];
} else {
return row -> null;
}
if (columnNumber >= 0) {
return row -> row[columnNumber];
} else {
return row -> null;
}
};
}

19
processing/src/main/java/org/apache/druid/segment/RowAdapter.java
View File

@ -19,6 +19,8 @@
package org.apache.druid.segment;
import org.apache.druid.segment.column.ColumnHolder;
import java.util.function.Function;
import java.util.function.ToLongFunction;
@ -30,8 +32,23 @@ public interface RowAdapter<RowType>
{
/**
* Returns a function that retrieves timestamps from rows.
*
* The default implementation delegates to {@link #columnFunction} and expects it to already contain long-typed
* values or nulls. Nulls, if present, will be converted to zeroes.
*/
ToLongFunction<RowType> timestampFunction();
default ToLongFunction<RowType> timestampFunction()
{
final Function<RowType, Object> timeColumnFunction = columnFunction(ColumnHolder.TIME_COLUMN_NAME);
return row -> {
final Object obj = timeColumnFunction.apply(row);
if (obj == null) {
return 0L;
} else {
return (long) obj;
}
};
}
/**
* Returns a function that retrieves the value for column "columnName" from rows.

25
processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java
View File

@ -56,8 +56,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.function.Function;
import java.util.function.ToLongFunction;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@ -72,24 +70,13 @@ public class ScanQueryResultOrderingTest
private static final String DATASOURCE = "datasource";
private static final String ID_COLUMN = "id";
private static final RowAdapter<Object[]> ROW_ADAPTER = new RowAdapter<Object[]>()
{
@Override
public ToLongFunction<Object[]> timestampFunction()
{
private static final RowAdapter<Object[]> ROW_ADAPTER = columnName -> {
if (ID_COLUMN.equals(columnName)) {
return row -> row[1];
} else if (ColumnHolder.TIME_COLUMN_NAME.equals(columnName)) {
return row -> ((DateTime) row[0]).getMillis();
}
@Override
public Function<Object[], Object> columnFunction(String columnName)
{
if (ID_COLUMN.equals(columnName)) {
return row -> row[1];
} else if (ColumnHolder.TIME_COLUMN_NAME.equals(columnName)) {
return timestampFunction()::applyAsLong;
} else {
return row -> null;
}
} else {
return row -> null;
}
};