You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by al...@apache.org on 2023/06/02 16:00:52 UTC
[arrow-datafusion] branch main updated: Standardize RUST_LOG configuration test setup (#6506)
This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 21a14a1af3 Standardize RUST_LOG configuration test setup (#6506)
21a14a1af3 is described below
commit 21a14a1af309b11094585ae540fca4ebfc76f1a6
Author: Andrew Lamb <an...@nerdnetworks.org>
AuthorDate: Fri Jun 2 12:00:45 2023 -0400
Standardize RUST_LOG configuration test setup (#6506)
---
datafusion/core/tests/memory_limit.rs | 1 +
datafusion/core/tests/parquet/filter_pushdown.rs | 7 -------
datafusion/core/tests/parquet/mod.rs | 7 +++++++
datafusion/core/tests/sql/subqueries.rs | 6 ------
datafusion/core/tests/sql_integration.rs | 7 +++++++
datafusion/expr/src/expr_rewriter/mod.rs | 5 -----
datafusion/expr/src/lib.rs | 7 +++++++
datafusion/optimizer/src/lib.rs | 2 +-
datafusion/optimizer/tests/integration-test.rs | 1 +
datafusion/sql/tests/integration_test.rs | 1 +
10 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/datafusion/core/tests/memory_limit.rs b/datafusion/core/tests/memory_limit.rs
index a37b6306ec..f2e1223dc6 100644
--- a/datafusion/core/tests/memory_limit.rs
+++ b/datafusion/core/tests/memory_limit.rs
@@ -39,6 +39,7 @@ use test_utils::AccessLogGenerator;
#[cfg(test)]
#[ctor::ctor]
fn init() {
+ // Enable RUST_LOG logging configuration for test
let _ = env_logger::try_init();
}
diff --git a/datafusion/core/tests/parquet/filter_pushdown.rs b/datafusion/core/tests/parquet/filter_pushdown.rs
index 0ace8bea31..885834f939 100644
--- a/datafusion/core/tests/parquet/filter_pushdown.rs
+++ b/datafusion/core/tests/parquet/filter_pushdown.rs
@@ -63,13 +63,6 @@ fn generate_file(tempdir: &TempDir, props: WriterProperties) -> TestParquetFile
test_parquet_file
}
-#[cfg(test)]
-#[ctor::ctor]
-fn init() {
- // enable logging so RUST_LOG works
- let _ = env_logger::try_init();
-}
-
#[cfg(not(target_family = "windows"))]
#[tokio::test]
async fn single_file() {
diff --git a/datafusion/core/tests/parquet/mod.rs b/datafusion/core/tests/parquet/mod.rs
index 86ab41e1f1..f4da1efb80 100644
--- a/datafusion/core/tests/parquet/mod.rs
+++ b/datafusion/core/tests/parquet/mod.rs
@@ -47,6 +47,13 @@ mod filter_pushdown;
mod page_pruning;
mod row_group_pruning;
+#[cfg(test)]
+#[ctor::ctor]
+fn init() {
+ // Enable RUST_LOG logging configuration for test
+ let _ = env_logger::try_init();
+}
+
// ----------------------
// Begin test fixture
// ----------------------
diff --git a/datafusion/core/tests/sql/subqueries.rs b/datafusion/core/tests/sql/subqueries.rs
index 640628e0b5..574553a938 100644
--- a/datafusion/core/tests/sql/subqueries.rs
+++ b/datafusion/core/tests/sql/subqueries.rs
@@ -21,12 +21,6 @@ use datafusion::assert_batches_eq;
use datafusion::prelude::SessionContext;
use log::debug;
-#[cfg(test)]
-#[ctor::ctor]
-fn init() {
- let _ = env_logger::try_init();
-}
-
#[tokio::test]
async fn correlated_recursive_scalar_subquery() -> Result<()> {
let ctx = SessionContext::new();
diff --git a/datafusion/core/tests/sql_integration.rs b/datafusion/core/tests/sql_integration.rs
index b5fcd81d03..f01298ac6d 100644
--- a/datafusion/core/tests/sql_integration.rs
+++ b/datafusion/core/tests/sql_integration.rs
@@ -17,3 +17,10 @@
/// Run all tests that are found in the `sql` directory
mod sql;
+
+#[cfg(test)]
+#[ctor::ctor]
+fn init() {
+ // Enable RUST_LOG logging configuration for test
+ let _ = env_logger::try_init();
+}
diff --git a/datafusion/expr/src/expr_rewriter/mod.rs b/datafusion/expr/src/expr_rewriter/mod.rs
index 63b5d3ed67..ca9383709f 100644
--- a/datafusion/expr/src/expr_rewriter/mod.rs
+++ b/datafusion/expr/src/expr_rewriter/mod.rs
@@ -224,11 +224,6 @@ mod test {
use datafusion_common::tree_node::{RewriteRecursion, TreeNode, TreeNodeRewriter};
use datafusion_common::{DFField, DFSchema, ScalarValue};
- #[ctor::ctor]
- fn init() {
- let _ = env_logger::try_init();
- }
-
#[derive(Default)]
struct RecordingRewriter {
v: Vec<String>,
diff --git a/datafusion/expr/src/lib.rs b/datafusion/expr/src/lib.rs
index 45777e09d4..9f3841841b 100644
--- a/datafusion/expr/src/lib.rs
+++ b/datafusion/expr/src/lib.rs
@@ -76,3 +76,10 @@ pub use udaf::AggregateUDF;
pub use udf::ScalarUDF;
pub use window_frame::{WindowFrame, WindowFrameBound, WindowFrameUnits};
pub use window_function::{BuiltInWindowFunction, WindowFunction};
+
+#[cfg(test)]
+#[ctor::ctor]
+fn init() {
+ // Enable RUST_LOG logging configuration for test
+ let _ = env_logger::try_init();
+}
diff --git a/datafusion/optimizer/src/lib.rs b/datafusion/optimizer/src/lib.rs
index 7930c059ea..d500debf59 100644
--- a/datafusion/optimizer/src/lib.rs
+++ b/datafusion/optimizer/src/lib.rs
@@ -53,6 +53,6 @@ mod plan_signature;
#[cfg(test)]
#[ctor::ctor]
fn init() {
- // Enable logging for tests
+ // Enable RUST_LOG logging configuration for test
let _ = env_logger::try_init();
}
diff --git a/datafusion/optimizer/tests/integration-test.rs b/datafusion/optimizer/tests/integration-test.rs
index a422079745..dfd1955177 100644
--- a/datafusion/optimizer/tests/integration-test.rs
+++ b/datafusion/optimizer/tests/integration-test.rs
@@ -35,6 +35,7 @@ use std::sync::Arc;
#[cfg(test)]
#[ctor::ctor]
fn init() {
+ // enable logging so RUST_LOG works
let _ = env_logger::try_init();
}
diff --git a/datafusion/sql/tests/integration_test.rs b/datafusion/sql/tests/integration_test.rs
index c8aaf060b8..892cf48d56 100644
--- a/datafusion/sql/tests/integration_test.rs
+++ b/datafusion/sql/tests/integration_test.rs
@@ -40,6 +40,7 @@ use rstest::rstest;
#[cfg(test)]
#[ctor::ctor]
fn init() {
+ // Enable RUST_LOG logging configuration for tests
let _ = env_logger::try_init();
}