Skip to content

ORION-284400: Honoring the timestamp resolution sent by Vast #16

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ORION-284400: Honoring the timestamp resolution sent by Vast #16

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion plugin/trino-vast/src/main/java/com/vastdata/trino/TrinoExpressionSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,14 @@ protected int buildLiteral(Type type, Object value)
if (type instanceof TimestampWithTimeZoneType) {
TimeUnit unit = ((ArrowType.Timestamp) arrowType).getUnit();
long result;
if (unit == TimeUnit.NANOSECOND || unit == TimeUnit.MICROSECOND) {
if (unit == TimeUnit.NANOSECOND) {
LongTimestampWithTimeZone ts = (LongTimestampWithTimeZone) value;
result = TypeUtils.convertTwoValuesNanoToLongMilli(ts.getEpochMillis(), ts.getPicosOfMilli()); // in nanos
}
else if (unit == TimeUnit.MICROSECOND) {
LongTimestampWithTimeZone ts = (LongTimestampWithTimeZone) value;
result = TypeUtils.convertTwoValuesMicroToLong(ts.getEpochMillis(), ts.getPicosOfMilli()); // in micros
}
else {
// ShortTimestampWithTimeZoneType is represented in millis since Epoch (in Trino)
long millisInUnit = TypeUtils.timeUnitToPicos(unit) / 1_000_000_000;
Expand Down
12 changes: 12 additions & 0 deletions plugin/trino-vast/src/main/java/com/vastdata/trino/TypeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,18 @@ public static long convertTwoValuesNanoToLongMilli(long millis, int picos)
throw new TrinoException(NOT_SUPPORTED, format("Unsupported timestamp value in Arrow: micros=%s<>%s, picos=%s<>%s", millis, millis2, picos, picos2));
}

public static long convertTwoValuesMicroToLong(long millis, int picos)
{
long result = (millis * 1000) + (picos / 1000_000);
long millis2 = Math.floorDiv(result, 1000);
int picos2 = Math.floorMod(result, 1000) * 1000_000;
LOG.debug("micros %s <- millis %s, picos %s", result, millis, picos);
if (millis == millis2 && picos == picos2) {
return result;
}
throw new TrinoException(NOT_SUPPORTED, format("Unsupported timestamp value in Arrow: micros=%s<>%s, picos=%s<>%s", millis, millis2, picos, picos2));
}

public static Pair<Long, Integer> convertLongNanoToTwoValues(long nano)
{
long micros = Math.floorDiv(nano, 1000);
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-vast/src/main/java/com/vastdata/trino/VastConnectorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public String getName()
public Connector create(String catalogName, Map<String, String> requiredConfig, ConnectorContext context)
{
requireNonNull(requiredConfig, "requiredConfig is null");
LOG.debug("catalogName=%s, requiredConfig=%s, context=%s", catalogName, requiredConfig, context);
LOG.info("catalogName=%s, requiredConfig=%s, context=%s", catalogName, requiredConfig, context);

// A plugin is not required to use Guice; it is just very convenient
Bootstrap app = new Bootstrap(
Expand Down
3 changes: 2 additions & 1 deletion plugin/trino-vast/src/main/java/com/vastdata/trino/VastModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.google.inject.Scopes;
import com.vastdata.client.ForVast;
import com.vastdata.client.VastClient;
import com.vastdata.client.VastVersion;
import com.vastdata.client.VastConfig;
import com.vastdata.client.VastDependenciesFactory;
import com.vastdata.mockserver.VastMockS3ServerStarter;
Expand All @@ -31,7 +32,7 @@ public class VastModule
public void configure(Binder binder)
{
VastMockS3ServerStarter.fromEnv();
LOG.info("Configuring VastModule");
LOG.info("Configuring VastModule sys_version={} version_hash={}", VastVersion.SYS_VERSION, VastVersion.HASH);
httpClientBinder(binder).bindHttpClient("vast", ForVast.class)
.withConfigDefaults(VastTrinoDependenciesFactory.HTTP_CLIENT_CONFIG_CONFIG_DEFAULTS);

Expand Down
20 changes: 14 additions & 6 deletions plugin/trino-vast/src/main/java/com/vastdata/trino/VastPageBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,11 +406,17 @@ else if (type instanceof TimestampWithTimeZoneType timestampType) {
// Trino represents ShortTimestampType as a long (milliseconds from epoch)
long millisInUnit = TypeUtils.timeUnitToPicos(unit) / TypeUtils.timeUnitToPicos(TimeUnit.MILLISECOND);
verify(millisInUnit > 0, "%s is not supported for %s", unit, timestampType);
vectors.forEach(vector -> copyShortTimestampWithTimezone(vector.getValueCount(), vector.getReader(), builder, millisInUnit == 1? m -> m : m -> millisInUnit * m, parentVectorIsNull, zoneId));
vectors.forEach(vector -> copyShortTimestampWithTimezone(vector.getValueCount(), vector.getReader(), builder,
millisInUnit == 1? m -> m : m -> millisInUnit * m,
parentVectorIsNull, zoneId));
}
else {
// Trino represents LongTimestampType as a long (milliseconds from epoch) + an int (millisecond fraction, in picoseconds)
vectors.forEach(vector -> copyTimestampNanosTimeZone(vector.getValueCount(), vector.getReader(), builder, parentVectorIsNull, zoneId));
long nanosInUnit = TypeUtils.timeUnitToPicos(unit) / TypeUtils.timeUnitToPicos(TimeUnit.NANOSECOND);
verify(nanosInUnit > 0, "%s is not supported for %s", unit, timestampType);
vectors.forEach(vector -> copyTimestampNanosTimeZone(vector.getValueCount(), vector.getReader(), builder,
nanosInUnit == 1? m -> m : m -> nanosInUnit * m,
parentVectorIsNull, zoneId));
}
return builder.build();
}
Expand Down Expand Up @@ -784,7 +790,8 @@ private static void copyShortTimestamp(int count, FieldReader reader, BlockBuild
}
}

private static void copyShortTimestampWithTimezone(int count, FieldReader reader, BlockBuilder builder, LongFunction<Long> unitConversion, Optional<boolean[]> optionalParentVectorIsNull, String zoneId)
private static void copyShortTimestampWithTimezone(int count, FieldReader reader, BlockBuilder builder,
LongFunction<Long> unitConversion, Optional<boolean[]> optionalParentVectorIsNull, String zoneId)
{
final TimeZoneKey zoneKey = getTimeZoneKey(zoneId);
if (optionalParentVectorIsNull.isEmpty()) {
Expand Down Expand Up @@ -857,14 +864,15 @@ private static void copyTimestampNanos(int count, FieldReader reader, BlockBuild
}
}

private static void copyTimestampNanosTimeZone(int count, FieldReader reader, BlockBuilder builder, Optional<boolean[]> optionalParentVectorIsNull, String zoneId)
private static void copyTimestampNanosTimeZone(int count, FieldReader reader, BlockBuilder builder,
LongFunction<Long> unitConversion, Optional<boolean[]> optionalParentVectorIsNull, String zoneId)
{
final TimeZoneKey zoneKey = getTimeZoneKey(zoneId);
if (optionalParentVectorIsNull.isEmpty()) {
for (int i = 0; i < count; ++i) {
reader.setPosition(i);
if (reader.isSet()) {
long nanos = reader.readLong();
long nanos = unitConversion.apply(reader.readLong());
TypeUtils.Pair<Long, Integer> objects = TypeUtils.convertLongNanoToTwoValuesZone(nanos, zoneKey);
((Fixed12BlockBuilder) builder).writeFixed12(objects.first(), objects.second());
}
Expand All @@ -880,7 +888,7 @@ private static void copyTimestampNanosTimeZone(int count, FieldReader reader, Bl
reader.setPosition(i);
if (!parentNullsBitmap[i + builderPosition]) {
if (reader.isSet()) {
long nanos = reader.readLong();
long nanos = unitConversion.apply(reader.readLong());
TypeUtils.Pair<Long, Integer> objects = TypeUtils.convertLongNanoToTwoValuesZone(nanos, zoneKey);
((Fixed12BlockBuilder) builder).writeFixed12(objects.first(), objects.second());
}
Expand Down
22 changes: 16 additions & 6 deletions plugin/trino-vast/src/main/java/com/vastdata/trino/VastRecordBatchBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,22 @@ private void copyData(Optional<Block> optionalParent, Block block, FieldVector v
else if (zoneId != null && (unit == TimeUnit.MICROSECOND || unit == TimeUnit.NANOSECOND)) {
final TimeZoneKey zoneKey = getTimeZoneKey(zoneId);
Fixed12BlockApi fixed12Api = BlockApiFactory.getFixed12ApiInstance(block);
longSupplier = x -> {
// See LongTimestampType docs
long millis = fixed12Api.getFixed12First(x);
int picos = fixed12Api.getFixed12Second(x);
return TypeUtils.convertTwoValuesNanoToLongMilli(unpackMillisUtc(millis), picos);
};
if (unit == TimeUnit.MICROSECOND) {
longSupplier = x -> {
// See LongTimestampType docs
long millis = fixed12Api.getFixed12First(x);
int picos = fixed12Api.getFixed12Second(x);
return TypeUtils.convertTwoValuesMicroToLong(unpackMillisUtc(millis), picos);
};
}
else {
longSupplier = x -> {
// See LongTimestampType docs
long millis = fixed12Api.getFixed12First(x);
int picos = fixed12Api.getFixed12Second(x);
return TypeUtils.convertTwoValuesNanoToLongMilli(unpackMillisUtc(millis), picos);
};
}
}
else if (zoneId == null) {
LongBlockApi longApi = BlockApiFactory.getLongApiInstance(block);
Expand Down