Use upstream result type

apache · Jul 4, 2023 · cba0451 · cba0451
1 parent 0b4cd0b
commit cba0451
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 185 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -73,10 +73,10 @@ panic = 'unwind'
 rpath = false
 
 [patch.crates-io]
-arrow = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-arith = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-array = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-buffer = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-flight = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-schema = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-parquet = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
+arrow = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-arith = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-array = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-buffer = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-flight = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-schema = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+parquet = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock
diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
@@ -51,10 +51,10 @@ predicates = "3.0"
 rstest = "0.17"
 
 [patch.crates-io]
-arrow = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-arith = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-array = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-buffer = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-flight = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-arrow-schema = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
-parquet = { git = "https://github.com/tustvold/arrow-rs.git", rev = "41a7e5ac8691b181199e9d2fc8b90c383c6a8cd6" }
+arrow = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-arith = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-array = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-buffer = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-flight = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+arrow-schema = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
+parquet = { git = "https://github.com/tustvold/arrow-rs.git", rev = "f402dd3fe427453e43d7df8a5974151ca93d3306" }
diff --git a/datafusion/expr/Cargo.toml b/datafusion/expr/Cargo.toml
@@ -37,6 +37,7 @@ path = "src/lib.rs"
 [dependencies]
 ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
 arrow = { workspace = true }
+arrow-arith = { workspace = true }
 datafusion-common = { path = "../common", version = "27.0.0" }
 lazy_static = { version = "^1.4.0" }
 sqlparser = { workspace = true }