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/05/31 18:50:16 UTC
[arrow-datafusion] branch main updated: Fix builds fail with error: symbol init___rust_ctor___ctor is already defined #6495 (#6505)
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 79c67c2dbe Fix builds fail with error: symbol init___rust_ctor___ctor is already defined #6495 (#6505)
79c67c2dbe is described below
commit 79c67c2dbe140750edabc1361a44490107f7a6fc
Author: Andrew Lamb <an...@nerdnetworks.org>
AuthorDate: Wed May 31 14:50:09 2023 -0400
Fix builds fail with error: symbol init___rust_ctor___ctor is already defined #6495 (#6505)
---
datafusion/optimizer/src/decorrelate_predicate_subquery.rs | 6 ------
datafusion/optimizer/src/lib.rs | 7 +++++++
datafusion/optimizer/src/scalar_subquery_to_join.rs | 6 ------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/datafusion/optimizer/src/decorrelate_predicate_subquery.rs b/datafusion/optimizer/src/decorrelate_predicate_subquery.rs
index 8630c60649..5ecafe6e37 100644
--- a/datafusion/optimizer/src/decorrelate_predicate_subquery.rs
+++ b/datafusion/optimizer/src/decorrelate_predicate_subquery.rs
@@ -602,12 +602,6 @@ mod tests {
assert_optimized_plan_equal(&plan, expected)
}
- #[cfg(test)]
- #[ctor::ctor]
- fn init() {
- let _ = env_logger::try_init();
- }
-
/// Test multiple correlated subqueries
/// See subqueries.rs where_in_multiple()
#[test]
diff --git a/datafusion/optimizer/src/lib.rs b/datafusion/optimizer/src/lib.rs
index b8217e0ac7..7930c059ea 100644
--- a/datafusion/optimizer/src/lib.rs
+++ b/datafusion/optimizer/src/lib.rs
@@ -49,3 +49,10 @@ pub use optimizer::{OptimizerConfig, OptimizerContext, OptimizerRule};
pub use utils::optimize_children;
mod plan_signature;
+
+#[cfg(test)]
+#[ctor::ctor]
+fn init() {
+ // Enable logging for tests
+ let _ = env_logger::try_init();
+}
diff --git a/datafusion/optimizer/src/scalar_subquery_to_join.rs b/datafusion/optimizer/src/scalar_subquery_to_join.rs
index 26f86c607a..04e0e0920b 100644
--- a/datafusion/optimizer/src/scalar_subquery_to_join.rs
+++ b/datafusion/optimizer/src/scalar_subquery_to_join.rs
@@ -307,12 +307,6 @@ mod tests {
};
use std::ops::Add;
- #[cfg(test)]
- #[ctor::ctor]
- fn init() {
- let _ = env_logger::try_init();
- }
-
/// Test multiple correlated subqueries
#[test]
fn multiple_subqueries() -> Result<()> {