feat(zql): Implement OR #56
Merged
Conversation
This file contains 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
Extending OperatorBase is more code than implementing the interface directly.
It is no longer used
|
I have builder changes but that can be reviewed in isolation. |
aboodman
reviewed
Apr 2, 2024
aboodman
reviewed
Apr 2, 2024
|
Will review this tonight. Very cool :) |
tantaman
reviewed
Apr 3, 2024
This commit adds the ability to use `and` and `or` in the query API.
Typical usage would be:
```ts
q.where(
or(
and(
expression('owner', '=', 'arv'),
expression('priority', '=', 'high'),
),
expression('status', '=', 'open'),
),
)
```
I think we want to design the surface API further but this unblocks us.
This commit also contains a few fixes:
- MutableTreeView was incorrectly telling the AbstractView not to call
the listeners when it got an update that didn't change the view. But,
with branches in the graph we can have multiple calls to `_newData`.
- With branches in the graph we the Source can get
the same `PullMsg` more than once. Switch to a set to avoid this.
aboodman
reviewed
Apr 3, 2024
| import * as agg from './query/agg.js'; | ||
| import {EntityQuery, expression, or} from './query/entity-query.js'; |
There was a problem hiding this comment.
wooo.
Nit: I think your earlier idea of exp was a better starting point.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This supersedes #52
OR is implemented by branching the graph when an OR expression is encountered. Each OR branch is executed "in parallel" and then merged together. The merging is done using
concatand thendistinct.For example if we have:
We get something like:
graph TD; Root-->id1; Root-->id2; id1(a=1) --> c1; id2(b=1) --> c1; c1(Concat) --> d1; d1(Distinct) --> id3; d1 --> id4; id3(a=2) --> c2; id4(b=2) --> c2; c2(Concat) --> d2; d2(Distinct)