From f4190cfca6f2c8b8cfb4a0b94b95df357c08b2b5 Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Mon, 17 Apr 2023 20:10:36 +0800 Subject: [PATCH] fix: table scan without projection (#1404) * fix: table scan without projection Signed-off-by: Ruihang Xia * update PR reference Signed-off-by: Ruihang Xia --------- Signed-off-by: Ruihang Xia --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 15 ++++++++------- .../{ => common}/copy/copy_from_fs.result | 0 .../{ => common}/copy/copy_from_fs.sql | 0 .../{ => common}/copy/copy_to_fs.result | 0 .../{ => common}/copy/copy_to_fs.sql | 0 6 files changed, 17 insertions(+), 16 deletions(-) rename tests/cases/standalone/{ => common}/copy/copy_from_fs.result (100%) rename tests/cases/standalone/{ => common}/copy/copy_from_fs.sql (100%) rename tests/cases/standalone/{ => common}/copy/copy_to_fs.result (100%) rename tests/cases/standalone/{ => common}/copy/copy_to_fs.sql (100%) diff --git a/Cargo.lock b/Cargo.lock index c42fc74b9d..3d8630f20b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2253,7 +2253,7 @@ dependencies = [ [[package]] name = "datafusion" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "ahash 0.8.3", "arrow", @@ -2302,7 +2302,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "arrow", "arrow-array", @@ -2316,7 +2316,7 @@ dependencies = [ [[package]] name = "datafusion-execution" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "dashmap", "datafusion-common", @@ -2333,7 +2333,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "ahash 0.8.3", "arrow", @@ -2344,7 +2344,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "arrow", "async-trait", @@ -2361,7 +2361,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "ahash 0.8.3", "arrow", @@ -2392,7 +2392,7 @@ dependencies = [ [[package]] name = "datafusion-row" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "arrow", "datafusion-common", @@ -2403,7 +2403,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "arrow", "arrow-schema", @@ -2416,7 +2416,7 @@ dependencies = [ [[package]] name = "datafusion-substrait" version = "22.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=74a778ca6016a853a3c3add3fa8c6f12f4fe4561#74a778ca6016a853a3c3add3fa8c6f12f4fe4561" +source = "git+https://github.com/waynexia/arrow-datafusion.git?rev=b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793#b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" dependencies = [ "async-recursion", "chrono", diff --git a/Cargo.toml b/Cargo.toml index d2391c7623..08d09b1b4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,13 +59,14 @@ arrow-schema = { version = "37.0", features = ["serde"] } async-stream = "0.3" async-trait = "0.1" chrono = { version = "0.4", features = ["serde"] } -datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" } -datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" } -datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" } -datafusion-optimizer = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" } -datafusion-physical-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" } -datafusion-sql = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" } -datafusion-substrait = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" } +# TODO(ruihang): use arrow-datafusion when it contains https://github.com/apache/arrow-datafusion/pull/6032 +datafusion = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" } +datafusion-common = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" } +datafusion-expr = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" } +datafusion-optimizer = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" } +datafusion-physical-expr = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" } +datafusion-sql = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" } +datafusion-substrait = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "b14f7a9ffe91257fc3d2a5d654f2a1a14a8fc793" } futures = "0.3" futures-util = "0.3" parquet = "37.0" diff --git a/tests/cases/standalone/copy/copy_from_fs.result b/tests/cases/standalone/common/copy/copy_from_fs.result similarity index 100% rename from tests/cases/standalone/copy/copy_from_fs.result rename to tests/cases/standalone/common/copy/copy_from_fs.result diff --git a/tests/cases/standalone/copy/copy_from_fs.sql b/tests/cases/standalone/common/copy/copy_from_fs.sql similarity index 100% rename from tests/cases/standalone/copy/copy_from_fs.sql rename to tests/cases/standalone/common/copy/copy_from_fs.sql diff --git a/tests/cases/standalone/copy/copy_to_fs.result b/tests/cases/standalone/common/copy/copy_to_fs.result similarity index 100% rename from tests/cases/standalone/copy/copy_to_fs.result rename to tests/cases/standalone/common/copy/copy_to_fs.result diff --git a/tests/cases/standalone/copy/copy_to_fs.sql b/tests/cases/standalone/common/copy/copy_to_fs.sql similarity index 100% rename from tests/cases/standalone/copy/copy_to_fs.sql rename to tests/cases/standalone/common/copy/copy_to_fs.sql