[GLUTEN-12538][VL] Unblock TIMESTAMP_NTZ min/max in Delta statistics - #12967
[GLUTEN-12538][VL] Unblock TIMESTAMP_NTZ min/max in Delta statistics#12967felipepessoto wants to merge 8 commits into
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Run Gluten Clickhouse CI on x86 |
|
🔄 Delta Spark UT started by @felipepessoto (~2.5 h). View run |
|
Run Gluten Clickhouse CI on x86 |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Run Gluten Clickhouse CI on x86 |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Run Gluten Clickhouse CI on x86 |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Run Gluten Clickhouse CI on x86 |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Run Gluten Clickhouse CI on x86 |
There was a problem hiding this comment.
🟡 Changes recommended
A newly added Velox round-trip test uses millisecond-precision timestamps despite declaring microsecond precision, weakening coverage for the intended NTZ precision behavior.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Enables native handling of TIMESTAMP_NTZ (Spark) / TIMESTAMP_UTC (Velox) in aggregation and related Delta statistics collection paths for the Velox backend, reducing Spark fallbacks and unblocking Delta stats plans previously rejected due to NTZ types.
Changes:
- Extend the
TimestampNTZfallback validator to allow aggregates, shuffles, and direct NTZ projections needed by Delta stats plans. - Accept
TimestampNTZTypein aggregation buffer type checks and preserve a distinct native signature token (tsntz) plus SubstraitPrecisionTimestampencoding. - Add native regression coverage (Spark UT + Velox C++ tests) and remove now-fixed Delta data-skipping cases from the known-failure baseline.
File summaries
| File | Description |
|---|---|
| gluten-ut/spark41/src/test/scala/org/apache/spark/sql/GlutenTimestampNtzAggregateSuite.scala | Adds Spark 4.1 regression coverage for NTZ min/max aggregation and a projection fallback case. |
| gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | Enables the new Spark 4.1 UT suite in Velox test settings. |
| gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/validator/Validators.scala | Broadens NTZ fallback validation to permit additional plan nodes/expressions used by native stats aggregation. |
| gluten-substrait/src/main/scala/org/apache/gluten/expression/ConverterUtils.scala | Maps Spark TimestampNTZType to Substrait timestamp NTZ type node and uses tsntz in signature naming. |
| gluten-substrait/src/main/scala/org/apache/gluten/execution/HashAggregateExecBaseTransformer.scala | Allows TimestampNTZType in supported aggregation buffer type checks. |
| cpp/velox/tests/VeloxToSubstraitTypeTest.cc | Adds a type-conversion test for TIMESTAMP_UTC -> Substrait PrecisionTimestamp. |
| cpp/velox/tests/VeloxSubstraitSignatureTest.cc | Adds tsntz signature coverage for TIMESTAMP_UTC mapping in both directions. |
| cpp/velox/tests/VeloxSubstraitRoundTripTest.cc | Adds a min/max aggregation round-trip test over TIMESTAMP_UTC. |
| cpp/velox/substrait/VeloxToSubstraitType.cc | Encodes TIMESTAMP_UTC as Substrait precision_timestamp(6). |
| cpp/velox/substrait/VeloxSubstraitSignature.cc | Maps TIMESTAMP_UTC to/from the tsntz signature token. |
| backends-velox/src-delta40/test/scala/org/apache/spark/sql/delta/GlutenDeltaStatsSuite.scala | Adds Delta 4.0 stats regression coverage including nested NTZ columns. |
| backends-velox/src-delta33/test/scala/org/apache/spark/sql/delta/GlutenDeltaStatsSuite.scala | Adds Delta 3.3 stats regression coverage including nested NTZ columns. |
| .github/workflows/util/delta-spark-ut/known-failures.txt | Removes Delta data-skipping known failures resolved by native NTZ stats aggregation support. |
Review details
- Files reviewed: 13/13 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
|
@Mariamalmesfer @rui-mo I think you two have worked on other timestamp_ntz PRs. Could you take a look, please? |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Warning
Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.
Pull request overview
Copilot reviewed 13 out of 13 changed files in this pull request and generated 6 comments.
|
Run Gluten Clickhouse CI on x86 |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Run Gluten Clickhouse CI on x86 |
There was a problem hiding this comment.
Warning
Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.
Pull request overview
Copilot reviewed 13 out of 13 changed files in this pull request and generated 2 comments.
Suppressed comments (1)
gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/validator/Validators.scala:1
- The previous implementation used
dataType.typeName == "timestamp_ntz", which is resilient across Spark versions/shims. Switching to a directTimestampNTZTypereference introduces a compile-time dependency that can break builds for Spark variants whereTimestampNTZTypeis absent or shaded differently. If this module is cross-built across multiple Spark versions, consider keeping a version-tolerant check (e.g., matchTimestampNTZTypewhen available and fall back totypeName), ideally via a shim utility.
/*
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Run Gluten Clickhouse CI on x86 |
There was a problem hiding this comment.
🟢 Approval recommended
The changes are cohesive and well-covered by targeted Spark + native regression tests, and the updated validator/signature/type mappings are consistent across JVM and C++ paths.
Review details
- Files reviewed: 13/13 changed files
- Comments generated: 0 new
- Review effort level: Lite
|
Run Gluten Clickhouse CI on x86 |
rui-mo
left a comment
There was a problem hiding this comment.
Thanks @felipepessoto. Could you please clarify whether this implementation is based on the aggregate implementation for the Timestamp type in Velox, and whether it can be fully reused for the TimestampNTZ type?
| "1969-12-31T23:59:59.999", | ||
| "2024-01-01T00:00:00.123", | ||
| "2024-01-01T00:00:00.123"), | ||
| stats) |
There was a problem hiding this comment.
Could you please assert that the plan contains HashAggregateExecTransformer to ensure aggregate has been offloaded into native?
There was a problem hiding this comment.
I agree that an explicit offload assertion would strengthen this regression. The statistics aggregate is constructed locally inside GlutenDeltaJobStatsTracker in each write task and submitted directly to NativePlanEvaluator, so it is not visible in the outer DataFrame's executed plan (code).
The approach I found would require changing production tracker code in both Delta variants to add a test observation hook. The test could then assert that the hook was invoked and that the captured plan contains HashAggregateExecTransformer. Would you be comfortable with that, or do you know a simpler approach, such as an existing way to observe this internal plan from tests without adding a new hook?
| return "date"; | ||
| } | ||
| if (type->equivalent(*TIMESTAMP_UTC())) { | ||
| return "tsntz"; |
There was a problem hiding this comment.
nit: use ts_ntz to be aligned with Spark.
There was a problem hiding this comment.
ts_ntz would align visually with Spark, but it cannot represent one type in Gluten's current function-signature grammar. The native parser uses _ as the delimiter between argument types
(parser), so min:ts_ntz is parsed as two argument types, ts and ntz, and aggregate validation fails when it tries to resolve ntz.
tsntz is deliberately an internal, separator-free signature token (mapping). The Spark-facing type remains timestamp_ntz, and the Substrait representation remains PrecisionTimestamp. Using ts_ntz would require first changing the signature grammar to support escaping or structured type tokens.
@rui-mo, yes, for Velox represents Spark This reuse is appropriate for |
What changes are proposed in this pull request?
Enable native
min/maxaggregation for SparkTIMESTAMP_NTZin the Velox backend, including the task-localSortAggregateExecused to collect Delta write statistics.The implementation reuses Velox's existing Spark timestamp min/max kernels rather than introducing new aggregate kernels.
TIMESTAMP_NTZremains represented by the distinct VeloxTIMESTAMP_UTClogical type, with microsecond precision (Velox implementation, Spark registration).TimestampNTZTypein aggregate buffer/result and grouping type checks, and allow aggregate, shuffle, and the projection expressions needed by Delta statistics through the coarse NTZ fallback validator. Existing native function validation remains in place.tsntzas the internal function-signature token. The previousts_ntztoken collides with_, which the native signature parser uses to separate argument types (parser).TIMESTAMP_UTCas SubstraitPrecisionTimestampwith precision6during type round-tripping.This addresses the NTZ aggregation failure encountered by the Delta statistics tracker in #12538. It does not implement a general fallback for arbitrary unsupported statistics plans or claim support for every NTZ expression. DATE/TIMESTAMP_NTZ cast support is handled separately in #12966.
How was this patch tested?
6, and preservation of microsecond values using Spark min/max.GlutenTimestampNtzAggregateSuiteon Spark 4.1 checks native SQL min/max execution and microsecond results, plus Spark fallback for NTZ JSON serialization in a non-UTC session timezone.GlutenDeltaStatsSuiteon Spark 3.5/Delta 3.3 and Spark 4.1/Delta 4.x checks writes and read-back of top-level and nested NTZ columns, with exact JSON-path assertions for their min/max statistics.DateFunctionsValidateSuitecoverage exercises NTZ scalar functions after the signature-token change.Was this patch authored or co-authored using generative AI tooling?
Generated-by: GitHub Copilot CLI 1.0.83