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

Update ObjectStore 0.7.0 and Arrow 46.0.0 #7282

Merged
merged 14 commits into from
Aug 25, 2023
Merged

Update ObjectStore 0.7.0 and Arrow 46.0.0 #7282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
80e73d7
Prepare for ObjectStore 0.7.0
tustvold Aug 14, 2023
4b3e187
Merge remote-tracking branch 'upstream/main' into prepare-object-stor…
tustvold Aug 15, 2023
0d5d5d0
Update arrow
tustvold Aug 18, 2023
bb896c4
Use is_distinct kernels
tustvold Aug 18, 2023
5f4126a
Merge remote-tracking branch 'upstream/main' into prepare-object-stor…
tustvold Aug 18, 2023
677839c
Further fixes
tustvold Aug 18, 2023
3e0e8c8
Update bool cast
tustvold Aug 18, 2023
f4fafa9
Further fixes
tustvold Aug 18, 2023
43f6a90
Lockfile
tustvold Aug 18, 2023
33aa0ee
Update pin
tustvold Aug 21, 2023
3b1080e
Merge remote-tracking branch 'upstream/main' into prepare-object-stor…
tustvold Aug 24, 2023
f758fca
Remove pin
tustvold Aug 24, 2023
5a9be81
Update sort_spill_reservation
tustvold Aug 25, 2023
ec1d6f2
Merge remote-tracking branch 'upstream/main' into prepare-object-stor…
tustvold Aug 25, 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
12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ panic = 'unwind'
rpath = false

[patch.crates-io]
arrow = {git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow-array = {git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow-buffer = {git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow-flight = {git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow-schema = {git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
parquet = {git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow = {git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
arrow-array = {git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
arrow-buffer = {git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
arrow-flight = {git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
arrow-schema = {git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
parquet = {git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
30 changes: 15 additions & 15 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.

10 changes: 5 additions & 5 deletions datafusion-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ predicates = "3.0"
rstest = "0.17"

[patch.crates-io]
arrow = { git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow-array = { git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow-buffer = { git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow-schema = { git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
parquet = { git = "https://github.com/tustvold/arrow-rs.git", rev = "d55bf0c4dfff8758b517b2a8a29882f1b27f6e8a" }
arrow = { git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
arrow-array = { git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
arrow-buffer = { git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
arrow-schema = { git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
parquet = { git = "https://github.com/tustvold/arrow-rs.git", rev = "2aff33df7a91e5d46b784ed38cba4263683b5f4e" }
4 changes: 0 additions & 4 deletions datafusion/core/src/physical_plan/joins/hash_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,10 +1175,6 @@ fn eq_dyn_null(
null_equals_null: bool,
) -> Result<BooleanArray, ArrowError> {
match (left.data_type(), right.data_type()) {
(DataType::Null, DataType::Null) => Ok(BooleanArray::new(
BooleanBuffer::collect_bool(left.len(), |_| null_equals_null),
None,
)),
_ if null_equals_null => not_distinct(&left, &right),
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI @Dandandan

Copy link
Contributor

Choose a reason for hiding this comment

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

Nice 👍

_ => eq(&left, &right),
}
Expand Down
1 change: 1 addition & 0 deletions datafusion/core/tests/memory_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ async fn sort_preserving_merge() {
}

#[tokio::test]
#[ignore] // TODO: Fix this
Copy link
Contributor

Choose a reason for hiding this comment

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

this still seems to be left TODO

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, forgot about that 😅

async fn sort_spill_reservation() {
let partition_size = batches_byte_size(&dict_batches());

Expand Down
4 changes: 2 additions & 2 deletions datafusion/optimizer/tests/optimizer_integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ fn concat_literals() -> Result<()> {
FROM test";
let plan = test_sql(sql)?;
let expected =
"Projection: concat(Utf8(\"1\"), CAST(test.col_int32 AS Utf8), Utf8(\"0hello\"), test.col_utf8, Utf8(\"123.4\")) AS col\
"Projection: concat(Utf8(\"true\"), CAST(test.col_int32 AS Utf8), Utf8(\"falsehello\"), test.col_utf8, Utf8(\"123.4\")) AS col\
\n TableScan: test projection=[col_int32, col_utf8]";
assert_eq!(expected, format!("{plan:?}"));
Ok(())
Expand All @@ -224,7 +224,7 @@ fn concat_ws_literals() -> Result<()> {
FROM test";
let plan = test_sql(sql)?;
let expected =
"Projection: concat_ws(Utf8(\"-\"), Utf8(\"1\"), CAST(test.col_int32 AS Utf8), Utf8(\"0-hello\"), test.col_utf8, Utf8(\"12--3.4\")) AS col\
"Projection: concat_ws(Utf8(\"-\"), Utf8(\"true\"), CAST(test.col_int32 AS Utf8), Utf8(\"false-hello\"), test.col_utf8, Utf8(\"12--3.4\")) AS col\
\n TableScan: test projection=[col_int32, col_utf8]";
assert_eq!(expected, format!("{plan:?}"));
Ok(())
Expand Down
1 change: 1 addition & 0 deletions datafusion/sqllogictest/src/engines/datafusion_engine/normalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ pub fn cell_to_string(col: &ArrayRef, row: usize) -> Result<String> {
Ok(NULL_STR.to_string())
} else {
match col.data_type() {
DataType::Null => Ok(NULL_STR.to_string()),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

apache/arrow-rs#4691

DataType::Boolean => {
Ok(bool_to_str(get_row_value!(array::BooleanArray, col, row)))
}
Expand Down
2 changes: 1 addition & 1 deletion datafusion/sqllogictest/test_files/ddl.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ CREATE TABLE my_table(c1 float, c2 double, c3 boolean, c4 varchar) AS SELECT *,c
query RRBT rowsort
SELECT * FROM my_table order by c1 LIMIT 1
----
0.00001 0.000000000001 true 1
0.00001 0.000000000001 true true
Copy link
Contributor

Choose a reason for hiding this comment

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

converting boolean to "true" seems like an improvement from 1 to me


statement ok
DROP TABLE my_table;
Expand Down
2 changes: 1 addition & 1 deletion datafusion/sqllogictest/test_files/functions.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ from (values
query ?
SELECT struct(c1,c2,c3,c4,a,b) from simple_struct_test
----
{c0: 1, c1: 1, c2: 3.1, c3: 3.14, c4: str, c5: text}
{c0: true, c1: 1, c2: 3.1, c3: 3.14, c4: str, c5: text}

statement ok
drop table simple_struct_test
Expand Down