Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merges v1 into main #1672

Merged
merged 394 commits into from
Dec 9, 2024
Merged

Merges v1 into main #1672

merged 394 commits into from
Dec 9, 2024

Conversation

johnedquinn
Copy link
Member

@johnedquinn johnedquinn commented Dec 9, 2024

Description

  • Merges v1 into main
  • Ran command: git merge --strategy-option theirs v1
    • For all conflicts where the file was deleted in v1, I deleted the file.
  • There is NO difference between this branch and v1. To verify, add my fork and run:
    • git diff <my fork>/main-merge-v1..<target remote>/v1 --name-only.
    • For me, this is: git diff origin/main-merge-v1..upstream/v1 --name-only

Follow-Up

License Information

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

johnedquinn and others added 30 commits April 24, 2024 09:48
Adds compilation/evaluation support for UNION/INTERSECT/EXCEPT ALL/DISTINCT
* Parsing for attribute and tuple constraint

Co-authored-by: Alan Cai <[email protected]>
* struct subfield and list element type

---------

Co-authored-by: Alan Cai <[email protected]>
Co-authored-by: Arash Maymandi <[email protected]>
Co-authored-by: Alan Cai <[email protected]>
Updates planning tests

Removes exhaustive attribute from dynamic call
johnedquinn and others added 19 commits November 18, 2024 15:51
Rewrites PLUS and BITWISE_AND implementations using new modeling
Removes InsertColumnList AST node

Fixes the passing of some AST children

Updates Javadocs

Adds tests for explicit use of ROW
Adds SqlDialect for the DML statements

Fixes the getChildren for multiple DML AST nodes

Updates Javadocs to reference unimplemented, future features
Adds the conversion for ExprValues to a plan node
Adds DML (INSERT, DELETE, UPDATE, UPSERT, REPLACE)
@johnedquinn johnedquinn marked this pull request as ready for review December 9, 2024 18:34
@johnedquinn johnedquinn mentioned this pull request Dec 9, 2024
3 tasks
Copy link
Member

@alancai98 alancai98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub UI freezes when I try to open the PR file diff. Added a couple comments on the last commit.

.github/workflows/conformance-report.yml Outdated Show resolved Hide resolved
docs/wiki/_Sidebar.md Outdated Show resolved Hide resolved
@alancai98
Copy link
Member

alancai98 commented Dec 9, 2024

Perhaps those last changes were missing since the last merge of main -> v1. In the future, I think we should follow a two step process:

  1. cherry-pick/merge changes from main -> v1 and then
  2. merge v1 back into main using the command you provided in the PR description

Updates wiki markdown file and reference
@johnedquinn johnedquinn requested a review from alancai98 December 9, 2024 19:42
Copy link
Member

@alancai98 alancai98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conformance report results line up w/ the most recent v1 report with 5561 tests passing:

@johnedquinn johnedquinn merged commit 7b818d6 into partiql:main Dec 9, 2024
7 checks passed
@johnedquinn johnedquinn deleted the main-merge-v1 branch December 9, 2024 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants