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.

Sign up for GitHub

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

Jump to bottom

Update arrow 34 #5375

Merged
merged 4 commits into from
Feb 27, 2023
Merged

Update arrow 34 #5375

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70d7009
Update arrow 34
tustvold Feb 23, 2023
e50e3fc
Remove pin
tustvold Feb 27, 2023
17a79fc
Merge remote-tracking branch 'upstream/main' into update-arrow-34
tustvold Feb 27, 2023
3113f34
Merge remote-tracking branch 'upstream/main' into update-arrow-34
tustvold Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,10 @@ opt-level = 3
overflow-checks = false
panic = 'unwind'
rpath = false

[patch.crates-io]
arrow = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
arrow-flight = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
arrow-buffer = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
arrow-schema = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
parquet = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
45 changes: 15 additions & 30 deletions datafusion-cli/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions datafusion-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@ parking_lot = { version = "0.12" }
rustyline = "10.0"
tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot"] }
url = "2.2"

[patch.crates-io]
arrow = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
arrow-buffer = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
arrow-schema = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
parquet = { git = "https://github.com/apache/arrow-rs.git", rev = "57f79c03a8dee9d8bf8601bf555aa271746913fe" }
2 changes: 1 addition & 1 deletion datafusion/core/src/physical_plan/sorts/sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,7 @@ mod tests {
#[tokio::test]
async fn test_sort_fetch_memory_calculation() -> Result<()> {
// This test mirrors down the size from the example above.
let avg_batch_size = 5336;
let avg_batch_size = 6000;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I suspect this relates to the recent changes that make arrays themselves slightly larger

let partitions = 4;

// A tuple of (fetch, expect_spillage)
Expand Down
2 changes: 1 addition & 1 deletion datafusion/proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ tokio = "1.18"
[build-dependencies]
# Pin these dependencies so that the generated output is deterministic
pbjson-build = { version = "=0.5.1" }
prost-build = { version = "=0.11.6" }
prost-build = { version = "=0.11.7" }