From 6603091a3fe9f02c832eaba53586f01a6b6e9fa6 Mon Sep 17 00:00:00 2001
From: Andy Grove <andygrove73@gmail.com>
Date: Mon, 4 Feb 2019 09:21:14 -0700
Subject: [PATCH] update path again, update testing submodule

---
 rust/datafusion/README.md                   | 2 +-
 rust/datafusion/examples/csv_sql.rs         | 2 +-
 rust/datafusion/src/execution/aggregate.rs  | 6 +++---
 rust/datafusion/src/execution/projection.rs | 2 +-
 rust/datafusion/tests/sql.rs                | 2 +-
 testing                                     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rust/datafusion/README.md b/rust/datafusion/README.md
index 392ff7f666fe6..eade95e063536 100644
--- a/rust/datafusion/README.md
+++ b/rust/datafusion/README.md
@@ -40,7 +40,7 @@ fn main() {
     ]));
 
     // register csv file with the execution context
-    let csv_datasource = CsvDataSource::new("../../testing/csv/uk_cities.csv", schema.clone(), 1024);
+    let csv_datasource = CsvDataSource::new("../../testing/data/csv/uk_cities.csv", schema.clone(), 1024);
     ctx.register_datasource("cities", Rc::new(RefCell::new(csv_datasource)));
 
     // simple projection and selection
diff --git a/rust/datafusion/examples/csv_sql.rs b/rust/datafusion/examples/csv_sql.rs
index 39acccc1d9b3c..a0bd99f0b6b2b 100644
--- a/rust/datafusion/examples/csv_sql.rs
+++ b/rust/datafusion/examples/csv_sql.rs
@@ -52,7 +52,7 @@ fn main() {
 
     // register csv file with the execution context
     let csv_datasource =
-        CsvDataSource::new("../../testing/csv/aggregate_test_100.csv", schema.clone(), 1024);
+        CsvDataSource::new("../../testing/data/csv/aggregate_test_100.csv", schema.clone(), 1024);
     ctx.register_datasource("aggregate_test_100", Rc::new(RefCell::new(csv_datasource)));
 
     // simple projection and selection
diff --git a/rust/datafusion/src/execution/aggregate.rs b/rust/datafusion/src/execution/aggregate.rs
index a593d9fb584d0..5acf5fb63a188 100644
--- a/rust/datafusion/src/execution/aggregate.rs
+++ b/rust/datafusion/src/execution/aggregate.rs
@@ -1022,7 +1022,7 @@ mod tests {
     #[test]
     fn min_f64_group_by_string() {
         let schema = aggr_test_schema();
-        let relation = load_csv("../../testing/csv/aggregate_test_100.csv", &schema);
+        let relation = load_csv("../../testing/data/csv/aggregate_test_100.csv", &schema);
         let context = ExecutionContext::new();
 
         let aggr_expr = vec![expression::compile_expr(
@@ -1057,7 +1057,7 @@ mod tests {
     #[test]
     fn max_f64_group_by_string() {
         let schema = aggr_test_schema();
-        let relation = load_csv("../../testing/csv/aggregate_test_100.csv", &schema);
+        let relation = load_csv("../../testing/data/csv/aggregate_test_100.csv", &schema);
         let context = ExecutionContext::new();
 
         let aggr_expr = vec![expression::compile_expr(
@@ -1092,7 +1092,7 @@ mod tests {
     #[test]
     fn test_min_max_sum_f64_group_by_uint32() {
         let schema = aggr_test_schema();
-        let relation = load_csv("../../testing/csv/aggregate_test_100.csv", &schema);
+        let relation = load_csv("../../testing/data/csv/aggregate_test_100.csv", &schema);
 
         let context = ExecutionContext::new();
 
diff --git a/rust/datafusion/src/execution/projection.rs b/rust/datafusion/src/execution/projection.rs
index 98a80843cade4..a4c39690d6e0b 100644
--- a/rust/datafusion/src/execution/projection.rs
+++ b/rust/datafusion/src/execution/projection.rs
@@ -105,7 +105,7 @@ mod tests {
             Field::new("c12", DataType::Utf8, false),
         ]));
         let ds =
-            CsvDataSource::new("../../testing/csv/aggregate_test_100.csv", schema.clone(), 1024);
+            CsvDataSource::new("../../testing/data/csv/aggregate_test_100.csv", schema.clone(), 1024);
         let relation = Rc::new(RefCell::new(DataSourceRelation::new(Rc::new(
             RefCell::new(ds),
         ))));
diff --git a/rust/datafusion/tests/sql.rs b/rust/datafusion/tests/sql.rs
index fe5fff2231b99..bd228087dcc6e 100644
--- a/rust/datafusion/tests/sql.rs
+++ b/rust/datafusion/tests/sql.rs
@@ -95,7 +95,7 @@ fn register_aggregate_csv(ctx: &mut ExecutionContext) {
     register_csv(
         ctx,
         "aggregate_test_100",
-        "../../testing/csv/aggregate_test_100.csv",
+        "../../testing/data/csv/aggregate_test_100.csv",
         &schema,
     );
 }
diff --git a/testing b/testing
index 6ee39a9d17b09..bf0abe442bf7e 160000
--- a/testing
+++ b/testing
@@ -1 +1 @@
-Subproject commit 6ee39a9d17b0902b7372c22b9ff823304c69d709
+Subproject commit bf0abe442bf7e313380452c8972692940f4e56b6