feat(small): Support <slt:ignore> marker in sqllogictest for non-deterministic expected parts#18857
Merged
2010YOUY01 merged 4 commits intoapache:mainfrom Nov 23, 2025
Merged
Conversation
3 tasks
Jefffrey
approved these changes
Nov 21, 2025
martin-g
reviewed
Nov 21, 2025
| if let Some(idx) = actual_snapshot[pos..].find(frag) { | ||
| pos += idx + frag.len(); | ||
| } else { | ||
| return false; |
Member
There was a problem hiding this comment.
This early return would make it hard to debug. It would be nice to log a warning with the reason, as done below (line 116+).
Contributor
Author
There was a problem hiding this comment.
Honestly, I don't know what those log are used for. I think the error message is generated elsewhere, and I want to make sure they're developer-friendly.
It looks okay now, but with false positives
2. query result mismatch:
[SQL] select * from generate_series(3);
[Diff] (-expected|+actual)
- <slt:ignore>
+ 0
1
- 3<slt:ignore>
+ 2
3
at /Users/yongting/Code/datafusion/datafusion/sqllogictest/test_files/slt_features.slt:84
I have filed #18878 for improvement.
martin-g
reviewed
Nov 21, 2025
| continue; | ||
| } | ||
| if let Some(idx) = actual_snapshot[pos..].find(frag) { | ||
| pos += idx + frag.len(); |
Member
There was a problem hiding this comment.
I think this logic won't detect a prefix in the actual_snapshot.
Let's say the first expected fragment is "Hello" but the actual_snapshot starts with "Anything here before Hello". The find() will set the position to the correct index but Anything here before will be ignored and assumed as matching.
Similar issue with a suffix in actual_snapshot.
Contributor
Author
There was a problem hiding this comment.
This is a good catch. I fixed it in a3154e7 and added more tests.
Co-authored-by: Martin Grigorov <martin-g@users.noreply.github.com>
xudong963
pushed a commit
to massive-com/arrow-datafusion
that referenced
this pull request
Jan 27, 2026
…deterministic expected parts (apache#18857) ## 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 apache#123` indicates that this PR will close issue apache#123. --> Part of apache#17612 ## Rationale for this change <!-- 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. --> `sqllogictest`s are in general easier to maintain than rust tests, however it's not able to test `EXPLAIN ANALYZE` results, because their results include changing part: (in datafusion-cli) The `elapsed_compute` measurement changes from run to run. ``` > EXPLAIN ANALYZE SELECT * FROM generate_series(100); +-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | plan_type | plan | +-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Plan with Metrics | LazyMemoryExec: partitions=1, batch_generators=[generate_series: start=0, end=100, batch_size=8192], metrics=[output_rows=101, elapsed_compute=74.042µs, output_bytes=64.0 KB, output_batches=1] | | | | +-------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ 1 row(s) fetched. Elapsed 0.006 seconds. ``` We can add a special marker to `sqllogictest` to skip those non-deterministic parts. ## What changes are included in this PR? <!-- 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. --> - Changed `sqllogictest` validator to recognize `<slt:ignore>` marker - doc - slt test ## Are these changes tested? <!-- 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? <!-- 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. --> --------- Co-authored-by: Martin Grigorov <martin-g@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Part of #17612
Rationale for this change
sqllogictests are in general easier to maintain than rust tests, however it's not able to testEXPLAIN ANALYZEresults, because their results include changing part:(in datafusion-cli) The
elapsed_computemeasurement changes from run to run.We can add a special marker to
sqllogictestto skip those non-deterministic parts.What changes are included in this PR?
sqllogictestvalidator to recognize<slt:ignore>markerAre these changes tested?
Are there any user-facing changes?