Skip to content

[GLUTEN-11862][VL] Work around GMT session timezone validation failure on macOS #11869

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
zhouyuan merged 8 commits into from
Apr 17, 2026
Merged

[GLUTEN-11862][VL] Work around GMT session timezone validation failure on macOS #11869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b78e35
[VL] Normalize Spark GMT session timezone before native validation
Apr 1, 2026
2275b3f
Merge branch 'apache:main' into fix/vl-session-timezone-gmt
malinjawi Apr 2, 2026
d9af892
[VL] Apply clang-format to timezone workaround changes
Apr 2, 2026
7b07767
[VL] Address review feedback on timezone workaround
Apr 9, 2026
cbb8085
Merge branch 'main' into fix/vl-session-timezone-gmt
malinjawi Apr 9, 2026
fea81aa
[VL] Fix code format in timezone validator
Apr 9, 2026
1f03304
Merge branch 'main' into fix/vl-session-timezone-gmt
malinjawi Apr 12, 2026
7fe431c
Merge branch 'main' into fix/vl-session-timezone-gmt
malinjawi Apr 13, 2026
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
8 changes: 8 additions & 0 deletions backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,6 +1910,14 @@ class MiscOperatorSuite extends VeloxWholeStageTransformerSuite with AdaptiveSpa
assert(plan2.find(_.isInstanceOf[ProjectExecTransformer]).isDefined)
}

test("cast date to timestamp with GMT session timezone") {
withSQLConf(SQLConf.SESSION_LOCAL_TIMEZONE.key -> "GMT") {
runQueryAndCompare("SELECT cast(date'2023-01-02 01:01:01' as timestamp) as ts") {
checkGlutenPlan[ProjectExecTransformer]
}
}
}

test("cast timestamp to date") {
val query = "select cast(ts as date) from values (timestamp'2024-01-01 00:00:00') as tab(ts)"
runQueryAndCompare(query) {
Expand Down
11 changes: 11 additions & 0 deletions cpp/core/config/GlutenConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@ parseConfMap(JNIEnv* env, const uint8_t* planData, const int32_t planDataLength)
return sparkConfs;
}

std::string normalizeSessionTimezone(std::string_view sessionTimezone) {
Copy link
Copy Markdown
Contributor

@rui-mo rui-mo Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it more appropriate to move the normalization step to Scala before sending data to native, so that the timezone received by C++ is always correct and we don’t need to apply normalization in every caller of the session timezone?

if (sessionTimezone == "GMT") {
return "UTC";
}
if (sessionTimezone.size() > 3 && sessionTimezone.substr(0, 3) == "GMT" &&
(sessionTimezone[3] == '+' || sessionTimezone[3] == '-')) {
return std::string("UTC").append(sessionTimezone.substr(3));
}
return std::string(sessionTimezone);
}

std::string printConfig(const std::unordered_map<std::string, std::string>& conf) {
std::ostringstream oss;
oss << std::endl;
Expand Down
3 changes: 3 additions & 0 deletions cpp/core/config/GlutenConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <jni.h>
#include <cstdint>
#include <string>
#include <string_view>
#include <unordered_map>

namespace gluten {
Expand Down Expand Up @@ -102,5 +103,7 @@ const std::string kDebugCudfDefault = "false";
std::unordered_map<std::string, std::string>
parseConfMap(JNIEnv* env, const uint8_t* planData, const int32_t planDataLength);

std::string normalizeSessionTimezone(std::string_view sessionTimezone);

std::string printConfig(const std::unordered_map<std::string, std::string>& conf);
} // namespace gluten
3 changes: 2 additions & 1 deletion cpp/velox/compute/WholeStageResultIterator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,8 @@ std::unordered_map<std::string, std::string> WholeStageResultIterator::getQueryC
std::to_string(veloxCfg_->get<uint64_t>(kVeloxPreferredBatchBytes, 10L << 20));
try {
configs[velox::core::QueryConfig::kSparkAnsiEnabled] = veloxCfg_->get<std::string>(kAnsiEnabled, "false");
configs[velox::core::QueryConfig::kSessionTimezone] = veloxCfg_->get<std::string>(kSessionTimezone, "");
configs[velox::core::QueryConfig::kSessionTimezone] =
normalizeSessionTimezone(veloxCfg_->get<std::string>(kSessionTimezone, ""));
// Adjust timestamp according to the above configured session timezone.
configs[velox::core::QueryConfig::kAdjustTimestampToTimezone] = "true";

Expand Down
2 changes: 1 addition & 1 deletion cpp/velox/substrait/SubstraitToVeloxPlanValidator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SubstraitToVeloxPlanValidator {
public:
SubstraitToVeloxPlanValidator(memory::MemoryPool* pool) {
std::unordered_map<std::string, std::string> configs{
{velox::core::QueryConfig::kSparkPartitionId, "0"}, {velox::core::QueryConfig::kSessionTimezone, "GMT"}};
Copy link
Copy Markdown
Contributor

@jinchengchenghh jinchengchenghh Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update the GMT to other value is enough

Copy link
Copy Markdown
Contributor Author

@malinjawi malinjawi Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, addressed. I updated kSessionTimezone in to UTC.

{velox::core::QueryConfig::kSparkPartitionId, "0"}, {velox::core::QueryConfig::kSessionTimezone, "UTC"}};
veloxCfg_ = std::make_shared<facebook::velox::config::ConfigBase>(std::move(configs));
planConverter_ = std::make_unique<SubstraitToVeloxPlanConverter>(
pool, veloxCfg_.get(), std::vector<std::shared_ptr<ResultIterator>>{}, std::nullopt, std::nullopt, true);
Expand Down
4 changes: 3 additions & 1 deletion cpp/velox/utils/VeloxWriterUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ std::unique_ptr<WriterOptions> makeParquetWriteOption(const std::unordered_map<s
writeOption->flushPolicyFactory = [maxRowGroupRows, maxRowGroupBytes]() {
return std::make_unique<LambdaFlushPolicy>(maxRowGroupRows, maxRowGroupBytes, [&]() { return false; });
};
writeOption->parquetWriteTimestampTimeZone = getConfigValue(sparkConfs, kSessionTimezone, std::nullopt);
if (auto it = sparkConfs.find(kSessionTimezone); it != sparkConfs.end()) {
writeOption->parquetWriteTimestampTimeZone = normalizeSessionTimezone(it->second);
}
writeOption->arrowMemoryPool =
getDefaultMemoryManager()->getOrCreateArrowMemoryPool("VeloxParquetWrite.ArrowMemoryPool");
if (auto it = sparkConfs.find(kParquetDataPageSize); it != sparkConfs.end()) {
Expand Down
Loading