Skip to content

[CORE] Use Substrait timestamp_tz for Spark TimestampType to preserve timezone-aware semantics #11074

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

Merged
FelixYBW merged 1 commit into from
Nov 15, 2025
Merged

[CORE] Use Substrait timestamp_tz for Spark TimestampType to preserve timezone-aware semantics #11074

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: 3 additions & 3 deletions cpp-ch/local-engine/Builder/SerializedPlanBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ SchemaPtr SerializedSchemaBuilder::build()
else if (type == "Timestamp")
{
auto * t = type_struct->mutable_types()->Add();
t->mutable_timestamp()->set_nullability(
t->mutable_timestamp_tz()->set_nullability(
this->nullability_map[name] ? substrait::Type_Nullability_NULLABILITY_NULLABLE
: substrait::Type_Nullability_NULLABILITY_REQUIRED);
}
Expand Down Expand Up @@ -256,7 +256,7 @@ std::shared_ptr<substrait::Type> SerializedPlanBuilder::buildType(const DB::Data
const auto * ch_type_datetime64 = checkAndGetDataType<DataTypeDateTime64>(ch_type_without_nullable.get());
if (ch_type_datetime64->getScale() != 6)
throw Exception(ErrorCodes::UNKNOWN_TYPE, "Spark doesn't support converting from {}", ch_type->getName());
res->mutable_timestamp()->set_nullability(type_nullability);
res->mutable_timestamp_tz()->set_nullability(type_nullability);
}
else if (which.isDate32())
res->mutable_date()->set_nullability(type_nullability);
Expand Down Expand Up @@ -365,7 +365,7 @@ substrait::Expression * literalTimestamp(int64_t value)
{
substrait::Expression * rel = new substrait::Expression();
auto * literal = rel->mutable_literal();
literal->set_timestamp(value);
literal->set_timestamp_tz(value);
return rel;
}

Expand Down
4 changes: 2 additions & 2 deletions cpp-ch/local-engine/Parser/ExpressionParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ std::pair<DB::DataTypePtr, DB::Field> LiteralParser::parse(const substrait::Expr
field = literal.date();
break;
}
case substrait::Expression_Literal::kTimestamp: {
case substrait::Expression_Literal::kTimestampTz: {
type = std::make_shared<DB::DataTypeDateTime64>(6);
field = DecimalField<DB::DateTime64>(literal.timestamp(), 6);
field = DecimalField<DB::DateTime64>(literal.timestamp_tz(), 6);
break;
}
case substrait::Expression_Literal::kDecimal: {
Expand Down
4 changes: 2 additions & 2 deletions cpp-ch/local-engine/Parser/TypeParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@ DB::DataTypePtr TypeParser::parseType(const substrait::Type & substrait_type, st
ch_type = std::make_shared<DB::DataTypeFloat64>();
ch_type = tryWrapNullable(substrait_type.fp64().nullability(), ch_type);
}
else if (substrait_type.has_timestamp())
else if (substrait_type.has_timestamp_tz())
{
ch_type = std::make_shared<DB::DataTypeDateTime64>(6);
ch_type = tryWrapNullable(substrait_type.timestamp().nullability(), ch_type);
ch_type = tryWrapNullable(substrait_type.timestamp_tz().nullability(), ch_type);
}
else if (substrait_type.has_date())
{
Expand Down
4 changes: 2 additions & 2 deletions cpp/velox/substrait/SubstraitParser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ TypePtr SubstraitParser::parseType(const ::substrait::Type& substraitType, bool
return UNKNOWN();
case ::substrait::Type::KindCase::kDate:
return DATE();
case ::substrait::Type::KindCase::kTimestamp:
case ::substrait::Type::KindCase::kTimestampTz:
return TIMESTAMP();
case ::substrait::Type::KindCase::kDecimal: {
auto precision = substraitType.decimal().precision();
Expand Down Expand Up @@ -368,7 +368,7 @@ bool SubstraitParser::getLiteralValue(const ::substrait::Expression::Literal& li

template <>
Timestamp SubstraitParser::getLiteralValue(const ::substrait::Expression::Literal& literal) {
return Timestamp::fromMicros(literal.timestamp());
return Timestamp::fromMicros(literal.timestamp_tz());
}

template <>
Expand Down
2 changes: 1 addition & 1 deletion cpp/velox/substrait/SubstraitToVeloxExpr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ TypePtr getScalarType(const ::substrait::Expression::Literal& literal) {
}
case ::substrait::Expression_Literal::LiteralTypeCase::kDate:
return DATE();
case ::substrait::Expression_Literal::LiteralTypeCase::kTimestamp:
case ::substrait::Expression_Literal::LiteralTypeCase::kTimestampTz:
return TIMESTAMP();
case ::substrait::Expression_Literal::LiteralTypeCase::kString:
return VARCHAR();
Expand Down
4 changes: 2 additions & 2 deletions cpp/velox/substrait/VeloxToSubstraitExpr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ const ::substrait::Expression_Literal& toSubstraitNotNullLiteral(
case velox::TypeKind::TIMESTAMP: {
auto vTimeStamp = variantValue.value<TypeKind::TIMESTAMP>();
auto micros = vTimeStamp.getSeconds() * 1000000 + vTimeStamp.getNanos() / 1000;
literalExpr->set_timestamp(micros);
literalExpr->set_timestamp_tz(micros);
break;
}
case velox::TypeKind::VARCHAR: {
Expand Down Expand Up @@ -250,7 +250,7 @@ const ::substrait::Expression_Literal& toSubstraitNotNullLiteral<TypeKind::TIMES
::substrait::Expression_Literal* literalExpr =
google::protobuf::Arena::CreateMessage<::substrait::Expression_Literal>(&arena);
auto micros = value.getSeconds() * 1000000 + value.getNanos() / 1000;
literalExpr->set_timestamp(micros);
literalExpr->set_timestamp_tz(micros);
literalExpr->set_nullable(false);
return *literalExpr;
}
Expand Down
6 changes: 3 additions & 3 deletions cpp/velox/substrait/VeloxToSubstraitType.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ const ::substrait::Type& VeloxToSubstraitTypeConvertor::toSubstraitType(
break;
}
case velox::TypeKind::TIMESTAMP: {
auto substraitTimestamp = google::protobuf::Arena::CreateMessage<::substrait::Type_Timestamp>(&arena);
substraitTimestamp->set_nullability(::substrait::Type_Nullability_NULLABILITY_NULLABLE);
substraitType->set_allocated_timestamp(substraitTimestamp);
auto substraitTimestampTZ = google::protobuf::Arena::CreateMessage<::substrait::Type_TimestampTZ>(&arena);
substraitTimestampTZ->set_nullability(::substrait::Type_Nullability_NULLABILITY_NULLABLE);
substraitType->set_allocated_timestamp_tz(substraitTimestampTZ);
break;
}
case velox::TypeKind::ARRAY: {
Expand Down
2 changes: 1 addition & 1 deletion ...-substrait/src/main/java/org/apache/gluten/substrait/expression/TimestampLiteralNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ public TimestampLiteralNode(Long value, TypeNode typeNode) {

@Override
protected void updateLiteralBuilder(Builder literalBuilder, Long value) {
literalBuilder.setTimestamp(value);
literalBuilder.setTimestampTz(value);
}
}
4 changes: 2 additions & 2 deletions gluten-substrait/src/main/java/org/apache/gluten/substrait/type/TimestampTypeNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public TimestampTypeNode(Boolean nullable) {

@Override
public Type toProtobuf() {
Type.Timestamp.Builder timestampBuilder = Type.Timestamp.newBuilder();
Type.TimestampTZ.Builder timestampBuilder = Type.TimestampTZ.newBuilder();
if (nullable) {
timestampBuilder.setNullability(Type.Nullability.NULLABILITY_NULLABLE);
} else {
timestampBuilder.setNullability(Type.Nullability.NULLABILITY_REQUIRED);
}

Type.Builder builder = Type.newBuilder();
builder.setTimestamp(timestampBuilder.build());
builder.setTimestampTz(timestampBuilder.build());
return builder.build();
}
}
4 changes: 2 additions & 2 deletions gluten-substrait/src/main/scala/org/apache/gluten/expression/ConverterUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ object ConverterUtils extends Logging {
(StringType, isNullable(substraitType.getString.getNullability))
case Type.KindCase.BINARY =>
(BinaryType, isNullable(substraitType.getBinary.getNullability))
case Type.KindCase.TIMESTAMP =>
(TimestampType, isNullable(substraitType.getTimestamp.getNullability))
case Type.KindCase.TIMESTAMP_TZ =>
(TimestampType, isNullable(substraitType.getTimestampTz.getNullability))
case Type.KindCase.DATE =>
(DateType, isNullable(substraitType.getDate.getNullability))
case Type.KindCase.DECIMAL =>
Expand Down