This is an automated email from the ASF dual-hosted git repository.
xudong963 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 485bfa6 Simplify prerequisites for running examples (#2028)
485bfa6 is described below
commit 485bfa6ffcf8dc836a482127ecd367d9abfa7248
Author: Feynman Han <[email protected]>
AuthorDate: Fri Mar 18 10:31:23 2022 +0800
Simplify prerequisites for running examples (#2028)
* simplify prerequisites for running examples
* update README.md
* update CONTRIBUTING.md
---
CONTRIBUTING.md | 2 --
ballista-examples/README.md | 3 ---
ballista-examples/src/bin/ballista-dataframe.rs | 2 +-
ballista-examples/src/bin/ballista-sql.rs | 2 +-
datafusion-examples/examples/avro_sql.rs | 2 +-
datafusion-examples/examples/dataframe.rs | 2 +-
datafusion-examples/examples/flight_client.rs | 2 +-
datafusion-examples/examples/flight_server.rs | 2 +-
datafusion-examples/examples/parquet_sql.rs | 2 +-
datafusion-examples/examples/parquet_sql_multiple_files.rs | 2 +-
docs/source/user-guide/distributed/clients/rust.md | 4 ++--
11 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e0cad12..c3983cd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,8 +52,6 @@ Testing setup:
- `rustup update stable` DataFusion uses the latest stable release of rust
- `git submodule init`
- `git submodule update`
-- `export PARQUET_TEST_DATA=$(pwd)/parquet-testing/data/`
-- `export ARROW_TEST_DATA=$(pwd)/testing/data/`
## Test Organization
diff --git a/ballista-examples/README.md b/ballista-examples/README.md
index 1364ad4..8dd83fc 100644
--- a/ballista-examples/README.md
+++ b/ballista-examples/README.md
@@ -47,9 +47,6 @@ RUST_LOG=info ./target/release/ballista-executor -c 4
## Running the examples
-Refer to the instructions in [DEVELOPERS.md](../DEVELOPERS.md) to define the
`ARROW_TEST_DATA` and
-`PARQUET_TEST_DATA` environment variables so that the examples can find the
test data files.
-
The examples can be run using the `cargo run --bin` syntax.
```bash
diff --git a/ballista-examples/src/bin/ballista-dataframe.rs
b/ballista-examples/src/bin/ballista-dataframe.rs
index 8399324..345b698 100644
--- a/ballista-examples/src/bin/ballista-dataframe.rs
+++ b/ballista-examples/src/bin/ballista-dataframe.rs
@@ -27,7 +27,7 @@ async fn main() -> Result<()> {
.build()?;
let ctx = BallistaContext::remote("localhost", 50050, &config);
- let testdata = datafusion::arrow::util::test_util::parquet_test_data();
+ let testdata = datafusion::test_util::parquet_test_data();
let filename = &format!("{}/alltypes_plain.parquet", testdata);
diff --git a/ballista-examples/src/bin/ballista-sql.rs
b/ballista-examples/src/bin/ballista-sql.rs
index 3e0df21..25fc333 100644
--- a/ballista-examples/src/bin/ballista-sql.rs
+++ b/ballista-examples/src/bin/ballista-sql.rs
@@ -27,7 +27,7 @@ async fn main() -> Result<()> {
.build()?;
let ctx = BallistaContext::remote("localhost", 50050, &config);
- let testdata = datafusion::arrow::util::test_util::arrow_test_data();
+ let testdata = datafusion::test_util::arrow_test_data();
// register csv file with the execution context
ctx.register_csv(
diff --git a/datafusion-examples/examples/avro_sql.rs
b/datafusion-examples/examples/avro_sql.rs
index dd11fb4..9a2189f 100644
--- a/datafusion-examples/examples/avro_sql.rs
+++ b/datafusion-examples/examples/avro_sql.rs
@@ -27,7 +27,7 @@ async fn main() -> Result<()> {
// create local execution context
let mut ctx = SessionContext::new();
- let testdata = datafusion::arrow::util::test_util::arrow_test_data();
+ let testdata = datafusion::test_util::arrow_test_data();
// register avro file with the execution context
let avro_file = &format!("{}/avro/alltypes_plain.avro", testdata);
diff --git a/datafusion-examples/examples/dataframe.rs
b/datafusion-examples/examples/dataframe.rs
index 3df43c5..655c568 100644
--- a/datafusion-examples/examples/dataframe.rs
+++ b/datafusion-examples/examples/dataframe.rs
@@ -25,7 +25,7 @@ async fn main() -> Result<()> {
// create local execution context
let mut ctx = SessionContext::new();
- let testdata = datafusion::arrow::util::test_util::parquet_test_data();
+ let testdata = datafusion::test_util::parquet_test_data();
let filename = &format!("{}/alltypes_plain.parquet", testdata);
diff --git a/datafusion-examples/examples/flight_client.rs
b/datafusion-examples/examples/flight_client.rs
index 6fc8014..e20397c 100644
--- a/datafusion-examples/examples/flight_client.rs
+++ b/datafusion-examples/examples/flight_client.rs
@@ -31,7 +31,7 @@ use datafusion::arrow::util::pretty;
/// This example is run along-side the example `flight_server`.
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
- let testdata = datafusion::arrow::util::test_util::parquet_test_data();
+ let testdata = datafusion::test_util::parquet_test_data();
// Create Flight client
let mut client =
FlightServiceClient::connect("http://localhost:50051";).await?;
diff --git a/datafusion-examples/examples/flight_server.rs
b/datafusion-examples/examples/flight_server.rs
index 04cb49f..5e77f3a 100644
--- a/datafusion-examples/examples/flight_server.rs
+++ b/datafusion-examples/examples/flight_server.rs
@@ -92,7 +92,7 @@ impl FlightService for FlightServiceImpl {
// create local execution context
let mut ctx = SessionContext::new();
- let testdata =
datafusion::arrow::util::test_util::parquet_test_data();
+ let testdata = datafusion::test_util::parquet_test_data();
// register parquet file with the execution context
ctx.register_parquet(
diff --git a/datafusion-examples/examples/parquet_sql.rs
b/datafusion-examples/examples/parquet_sql.rs
index 39deb63..6ab24ff 100644
--- a/datafusion-examples/examples/parquet_sql.rs
+++ b/datafusion-examples/examples/parquet_sql.rs
@@ -25,7 +25,7 @@ async fn main() -> Result<()> {
// create local session context
let mut ctx = SessionContext::new();
- let testdata = datafusion::arrow::util::test_util::parquet_test_data();
+ let testdata = datafusion::test_util::parquet_test_data();
// register parquet file with the execution context
ctx.register_parquet(
diff --git a/datafusion-examples/examples/parquet_sql_multiple_files.rs
b/datafusion-examples/examples/parquet_sql_multiple_files.rs
index 4f001ee..ee6b9e9 100644
--- a/datafusion-examples/examples/parquet_sql_multiple_files.rs
+++ b/datafusion-examples/examples/parquet_sql_multiple_files.rs
@@ -30,7 +30,7 @@ async fn main() -> Result<()> {
// create local execution context
let mut ctx = SessionContext::new();
- let testdata = datafusion::arrow::util::test_util::parquet_test_data();
+ let testdata = datafusion::test_util::parquet_test_data();
// Configure listing options
let file_format = ParquetFormat::default().with_enable_pruning(true);
diff --git a/docs/source/user-guide/distributed/clients/rust.md
b/docs/source/user-guide/distributed/clients/rust.md
index bdb8d2c..8788d05 100644
--- a/docs/source/user-guide/distributed/clients/rust.md
+++ b/docs/source/user-guide/distributed/clients/rust.md
@@ -45,7 +45,7 @@ async fn main() -> Result<()> {
// connect to Ballista scheduler
let ctx = BallistaContext::remote("localhost", 50050, &config);
- let testdata = datafusion::arrow::util::test_util::parquet_test_data();
+ let testdata = datafusion::test_util::parquet_test_data();
let filename = &format!("{}/alltypes_plain.parquet", testdata);
@@ -74,7 +74,7 @@ async fn main() -> Result<()> {
// connect to Ballista scheduler
let ctx = BallistaContext::remote("localhost", 50050, &config);
- let testdata = datafusion::arrow::util::test_util::arrow_test_data();
+ let testdata = datafusion::test_util::arrow_test_data();
// register csv file with the execution context
ctx.register_csv(
