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

WIP: df patched upgrade 2024-03-12 #2

Closed
wants to merge 4 commits into from

Conversation

wiedld
Copy link
Collaborator

@wiedld wiedld commented Apr 1, 2024

⚠️ WIP: will not be merged. ⚠️

What's in this branch:

  1. up to DF end of day 2024-03-12.

    commit 9b6da0a89570973310be1a508e5417c8a0cf318a (influx_origin/df-20240312, df-20240312)
    Author: Andrew Lamb <[email protected]>
    Date:   Tue Mar 12 20:15:44 2024 -0400
    
        Export datafusion-functions UDFs publically (#9585)
    
  2. three patches needed

    commit 0219e8951864054515417f995db1d2409d7a59d2
    Author: Andrew Lamb <[email protected]>
    Date:   Tue Mar 19 11:38:25 2024 -0400
    
        Fix incorrect results with multiple `COUNT(DISTINCT..)` aggregates on dictionaries (#9679)
    
    
    commit f354cd639b6d95ed0ab8470f51a27d501cc45996
    Author: wiedld <[email protected]>
    Date:   Thu Mar 21 12:40:51 2024 -0700
    
        fix(9678): short circuiting prevented population of visited stack, for common subexpr elimination optimization (#9685)
    
    
    commit 4848aa207356327141d9f28afe16efc5809c8f54
    Author: wiedld <[email protected]>
    Date:   Sun Mar 31 05:09:06 2024 -0700
    
        fix(9870): common expression elimination optimization, should always re-find the correct expression during re-write. (#9871)
    
  3. clippy fix (from DF main)

    commit c2c43e1b2f74cfe1a22ea9d73c173215ccb9c3e7 (HEAD -> iox-10349/df-patched-upgrade-20240312, influx_origin/iox-10349/df-patched-upgrade-20240312)
    Author: comphead <[email protected]>
    Date:   Thu Mar 21 11:07:40 2024 -0700
    
        build: modify code to comply with latest clippy requirement (#9725)
    

alamb and others added 4 commits April 1, 2024 11:08
… dictionaries (apache#9679)

* Add test for multiple count distincts on a dictionary

* Fix accumulator merge bug

* Fix cleanup code
…r common subexpr elimination optimization (apache#9685)

* test(9678): reproducer of short-circuiting causing expr elimination to error

* fix(9678): populate visited stack for short-circuited expressions, during the common-expr elimination optimization

* test(9678): reproducer for optimizer error (in common_subexpr_eliminate), as seen in other test case

* chore: extract id_array into abstraction, to make it more clear the relationship between the two visitors

* refactor: tweak the fix and make code more explicit (JumpMark, node_to_identifier)

* fix: get the series_number and curr_id with the correct self.current_idx, before the various incr/decr

* chore: remove unneeded conditional check (already done earlier), and add code comments

* Refine documentation in common_subexpr_eliminate.rs

* chore: cleanup -- fix 1 doc comment and consolidate common-expr-elimination test with other expr test

---------

Co-authored-by: Andrew Lamb <[email protected]>
…re-find the correct expression during re-write. (apache#9871)

* test(9870): reproducer of error with jumping traversal patterns in common-expr-elimination traversals

* refactor: remove the IdArray ordered idx, since the idx ordering does not always stay in sync with the updated TreeNode traversal

* refactor: use the only reproducible key (expr_identifer) for expr_set, while keeping the (stack-popped) symbol used for alias.

* refactor: encapsulate most of the logic within ExprSet, and delineate the expr_identifier from the alias symbol

* test(9870): demonstrate that the sqllogictests are now passing
)

* fix CI clippy

* fix scalar size test

* fix tests

* fix tests
@wiedld
Copy link
Collaborator Author

wiedld commented Apr 1, 2024

Note: I chose 2024-03-12, since it includes the ParquetSink written metadata exposure.

@alamb
Copy link
Collaborator

alamb commented Apr 1, 2024

Note: I chose 2024-03-12, since it includes the ParquetSink written metadata exposure.

Good call ✅

@appletreeisyellow
Copy link

The upgrade is done. Closing

@appletreeisyellow appletreeisyellow deleted the iox-10349/df-patched-upgrade-20240312 branch April 29, 2024 16:45
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.

4 participants