You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2019/06/02 07:28:21 UTC
[arrow] branch master updated: ARROW-5479: [Rust] [DataFusion] Use
ARROW_TEST_DATA instead of relative path for testing
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 76e6726 ARROW-5479: [Rust] [DataFusion] Use ARROW_TEST_DATA instead of relative path for testing
76e6726 is described below
commit 76e6726958010aaa61f4170a8036691c8e2ab1a9
Author: Chao Sun <su...@apache.org>
AuthorDate: Sun Jun 2 16:28:08 2019 +0900
ARROW-5479: [Rust] [DataFusion] Use ARROW_TEST_DATA instead of relative path for testing
Author: Chao Sun <su...@apache.org>
Closes #4449 from sunchao/ARROW-5479 and squashes the following commits:
fddab6ad <Chao Sun> Use ARROW_TEST_DATA instead of relative path for testing
---
rust/datafusion/examples/csv_sql.rs | 5 ++++-
rust/datafusion/src/execution/aggregate.rs | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/rust/datafusion/examples/csv_sql.rs b/rust/datafusion/examples/csv_sql.rs
index 82d3d11..ac908b8 100644
--- a/rust/datafusion/examples/csv_sql.rs
+++ b/rust/datafusion/examples/csv_sql.rs
@@ -48,10 +48,13 @@ fn main() {
Field::new("c13", DataType::Utf8, false),
]));
+ let testdata =
+ ::std::env::var("ARROW_TEST_DATA").expect("ARROW_TEST_DATA not defined");
+
// register csv file with the execution context
ctx.register_csv(
"aggregate_test_100",
- "../../testing/data/csv/aggregate_test_100.csv",
+ &format!("{}/csv/aggregate_test_100.csv", testdata),
&schema,
true,
);
diff --git a/rust/datafusion/src/execution/aggregate.rs b/rust/datafusion/src/execution/aggregate.rs
index dc7b380..28fc9e8 100644
--- a/rust/datafusion/src/execution/aggregate.rs
+++ b/rust/datafusion/src/execution/aggregate.rs
@@ -1241,7 +1241,9 @@ mod tests {
#[test]
fn count() {
let schema = aggr_test_schema();
- let relation = load_csv("../../testing/data/csv/aggregate_test_100.csv", &schema);
+ let testdata = env::var("ARROW_TEST_DATA").expect("ARROW_TEST_DATA not defined");
+ let relation =
+ load_csv(&format!("{}/csv/aggregate_test_100.csv", testdata), &schema);
let context = ExecutionContext::new();
let aggr_expr = vec![expression::compile_aggregate_expr(