Skip to content

[pull] main from apache:main - #275

Merged
pull[bot] merged 4 commits into
buraksenn:mainfrom
apache:main
Jun 13, 2026
Merged

pull[bot] merged 4 commits into
buraksenn:mainfrom
apache:main

Conversation

@pull

@pull pull Bot commented Jun 13, 2026 •

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

pchintar and others added 4 commits June 13, 2026 01:34
…orr (#22764)

## Which issue does this PR close?

- Closes #22763 .

## Rationale for this change

Bounded sliding window queries using `covar_pop`, `covar_samp`, and
`corr` currently fail with a `retract_batch is not implemented` error,
preventing these aggregates from being used with sliding window frames.

## What changes are included in this PR?

* Included `supports_retract_batch()` for the covariance and correlation
accumulators.
* Added SQL logic tests covering bounded sliding window execution for
covariance and correlation aggregates.

## Are these changes tested?

Yes.

Added SQL logic tests covering:

* Single-row bounded sliding frames
* Multi-row bounded sliding frames

for `covar_pop`, `covar_samp`, and `corr`.

## Are there any user-facing changes?

Yes.

`covar_pop`, `covar_samp`, and `corr` can now be used with bounded
sliding window frames that previously failed. Also, no changes were made
to any public APIs.
## Which issue does this PR close?

<!--
We generally require a GitHub issue to be filed for all bug fixes and
enhancements and this helps us generate change logs for our releases.
You can link an issue to this PR using the GitHub syntax. For example
`Closes #123` indicates that this PR will close issue #123.
-->

- Closes #22528

## Rationale for this change

`date_bin` had a few edge cases that could return the wrong result,
return an error only on array inputs, or panic/wrap when scaling
timestamp and time values to nanoseconds.

<!--
Why are you proposing this change? If this is already explained clearly
in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand
your changes and offer better suggestions for fixes.
-->

## What changes are included in this PR?

  - Fix negative sub-second timestamp conversion before the epoch.
- Make scalar and array paths return `NULL` consistently for per-row
binning errors.
- Use checked scaling when converting timestamp and time values to
nanoseconds.
- Return an error for invalid shared origin values that overflow during
scaling.
  - Simplify duplicated stride and scale handling.

<!--
There is no need to duplicate the description in the issue here but it
is sometimes worth providing a summary of the individual changes in this
PR.
-->

## Are these changes tested?

Yes

<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code

If tests are not included in your PR, please explain why (for example,
are they covered by existing tests)?
-->

## Are there any user-facing changes?
No public API changes.
<!--
If there are user-facing changes then we may require documentation to be
updated before approving the PR.
-->

<!--
If there are any breaking changes to public APIs, please add the `api
change` label.
-->
## Which issue does this PR close?

- Part of #15914

## Rationale for this change

DataFusion core's `concat_ws` does not support array arguments. Spark's
`concat_ws(sep, ...)` accepts both scalar strings and arrays, expanding
array elements and skipping nulls. This is needed for Spark
compatibility in the `datafusion-spark` crate.


## What changes are included in this PR?

- New `SparkConcatWs` UDF in
`datafusion/spark/src/function/string/concat_ws.rs`
  - Supports `concat_ws(sep, str1, str2, ...)` with scalar strings
- Supports array arguments: `concat_ws(',', array('a', 'b'), 'c')` →
`"a,b,c"`
  - Null scalars and null array elements are skipped (Spark behavior)
  - Null separator returns NULL
  - Zero value arguments (`concat_ws(',')`) returns empty string
  - Supports Utf8, LargeUtf8, Utf8View, List, and LargeList types
- Registered the function in `mod.rs` (`make_udf_function!`,
`export_functions!`, `functions()`)
- Replaced commented-out SLT tests with 14 working test cases covering
basic usage, arrays, mixed arguments, nulls, column expressions, and
edge cases


## Are these changes tested?

Yes.
- 7 unit tests in `concat_ws.rs` (basic, null values skipped, null
separator, list arrays, list with nulls, mixed scalar+list, multiple
rows)
- 14 SLT tests in `spark/string/concat_ws.slt` covering scalars, arrays,
nulls, column expressions, and edge cases


## Are there any user-facing changes?

No. This is a new function in the `datafusion-spark` crate only.
## Which issue does this PR close?

- Closes #22717.

## Rationale for this change

Spark does not trim `dayOfWeek` before matching it in `next_day`, but
`datafusion-spark` currently does. That makes values like `' MO '`
succeed in DataFusion even though Spark treats them as invalid.

## What changes are included in this PR?

- remove the `.trim()` call from `spark_next_day`
- add a regression test proving whitespace-padded day names are rejected

## Are these changes tested?

- `cargo test -p datafusion-spark
next_day_rejects_whitespace_padded_day_names -- --nocapture`
- `cargo test -p datafusion-spark`
- `cargo fmt --all --check`
- `cargo clippy -p datafusion-spark --all-targets --all-features
--no-deps -- -D warnings`

Note: the broader package clippy invocation still reports an existing
unused import warning in untouched
`datafusion/core/src/execution/session_state.rs` on current main.

## Are there any user-facing changes?

Behavior now matches Spark for whitespace-padded `dayOfWeek` inputs in
`next_day`.

---------

Signed-off-by: xfocus3 <xfocus3@users.noreply.github.com>
Co-authored-by: xfocus3 <xfocus3@users.noreply.github.com>
Co-authored-by: Ahmed El amraouiyine <ahmed.elamraouiyine@vilavi.fr>
@pull pull Bot locked and limited conversation to collaborators Jun 13, 2026
@pull pull Bot added the ⤵️ pull label Jun 13, 2026
@pull
pull Bot merged commit 574a1e6 into buraksenn:main Jun 13, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants