gupta-sahil01 opened a new pull request, #8484:
URL: https://github.com/apache/texera/pull/8484
<!--
Thanks for sending a pull request (PR)! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines:
[Contributing to
Texera](https://github.com/apache/texera/blob/main/CONTRIBUTING.md)
2. Ensure you have added or run the appropriate tests for your PR
3. If the PR is work in progress, mark it a draft on GitHub.
4. Please write your PR title to summarize what this PR proposes, we
are following Conventional Commits style for PR titles as well:
- `fix` is for behavior that worked before and no longer does; adding
or
removing a functionality, or reworking one so that user-facing
behavior
intentionally changes, is a `feat`; a change that leaves the
user-facing
behavior unchanged is a `refactor`.
- A test-only PR is `test(<module>): ...`; repairing a broken test is
`fix(test, <module>): ...`.
- A dependency bump is `fix(deps, <module>): ...` when it patches a CVE
and `chore(deps, <module>): ...` otherwise; GitHub Actions bumps take
`ci` as their module, e.g. `chore(deps, ci): ...`.
- A PR targeting a release branch appends the version as the last scope
component, e.g. `fix(deps, frontend, v1.2): ...`.
See CONTRIBUTING.md for the full convention.
5. Be sure to keep the PR description updated to reflect all changes.
-->
### What changes were proposed in this PR?
The `Filter` operator hard-codes OR semantics — a tuple passes as soon as
any one
predicate matches. Users who need AND (e.g. `age > 30 AND country = "US"`)
have to
chain multiple `Filter` operators, which adds workflow clutter and an extra
hop per
condition.
This PR makes the combination configurable:
- **New `PredicateCombinator` enum** (`OR` → `"any (OR)"`, `AND` → `"all
(AND)"`),
following the `@JsonValue` / `@JsonCreator` pattern already used by
`ComparisonType` in the same package.
- **New `predicateCombinator` property** on `SpecializedFilterOpDesc`,
defaulting to
`OR`. The UI dropdown renders automatically from the JSON schema, so there
are no
frontend changes.
- **`SpecializedFilterOpExec`** now selects `forall` for AND and `exists`
for OR.
- **Docs and descriptions** updated to stop claiming OR-only behavior.
**Backward compatibility:** the default is `OR`, and a stored descriptor
without the
field deserializes to `OR`, so existing workflows behave exactly as before
and no
migration is needed.
**One behavioral note for reviewers:** an empty predicate list continues to
drop every
tuple in *both* modes. A bare `forall` returns `true` on an empty list,
which would
have silently flipped an empty Filter from "drop everything" to "pass
everything", so
the AND branch is guarded with `predicates.nonEmpty &&`. There is a test
covering this.
Nested predicate trees (e.g. `(A AND B) OR C`) are intentionally out of
scope — they
need more extensive UI work and are noted as a follow-up in the issue.
<!--
Please clarify what changes you are proposing. The purpose of this section
is to outline the changes. Here are some tips for you:
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
3. If it is a refactoring, clarify what has been changed.
3. It would be helpful to include a before-and-after comparison using
screenshots or GIFs.
4. Please consider writing useful notes for better and faster reviews.
-->
### Any related issues, documentation, discussions?
Closes #6939
Operator documentation updated in the same PR:
`docs/reference/operators/data-cleaning/filter.md`.
<!--
Please use this section to link other resources if not mentioned already.
1. If this PR fixes an issue, please include `Fixes #1234`, `Resolves
#1234`
or `Closes #1234`. If it is only related, simply mention the issue
number.
2. If there is design documentation, please add the link.
3. If there is a discussion in the mailing list, please add the link.
-->
### How was this PR tested?
New and updated unit tests, all run locally via
`sbt "WorkflowOperator/testOnly *filter*"` — 67 tests across 7 suites, all
passing.
- **`PredicateCombinatorSpec`** (new): wire names via `getName`,
case-insensitive
`fromString`, rejection of an unknown name, and the Jackson round-trip.
- **`SpecializedFilterOpDescSpec`**: the property defaults to `OR`; a
hand-written
descriptor JSON with **no** `predicateCombinator` field deserializes to
`OR`
(this is the backward-compatibility claim above); an explicit `AND`
survives the
round-trip through the polymorphic `LogicalOp` base; `operatorInfo`
advertises the
new behavior.
- **`SpecializedFilterOpExecSpec`**: with two predicates where only one
matches, OR
keeps the tuple and AND drops it; AND keeps it when both match; AND with
an empty
predicate list drops everything; AND and OR agree on a single predicate. A
`before` block resets the shared descriptor between tests so a mode set in
one
test cannot leak into the ones after it.
The empty-list guard was additionally verified by mutation: removing
`predicates.nonEmpty &&` from the executor makes exactly one test fail,
confirming
the case is genuinely covered rather than incidentally passing.
<!--
If tests were added, say they were added here. Or simply mention that if the
PR
is tested with existing test cases. Make sure to include/update test cases
that
check the changes thoroughly including negative and positive cases if
possible.
If it was tested in a way different from regular unit tests, please clarify
how
you tested step by step, ideally copy and paste-able, so that other
reviewers can
test and check, and descendants can verify in the future. If tests were not
added,
please describe why they were not added and/or why it was difficult to add.
-->
### Was this PR authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Claude Opus 5)
<!--
If generative AI tooling has been used in the process of authoring this PR,
please include the phrase: 'Generated-by: ' followed by the name of the tool
and its version. If no, write 'No'.
Please refer to the [ASF Generative Tooling
Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
