From cf2645ae2876e0532eae83709e95f07a3f6e7274 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Thu, 21 Apr 2022 14:47:01 -0600
Subject: [PATCH] remove two source files that only had re-exports

---
 datafusion/core/src/logical_plan/builder.rs   |  2 +-
 datafusion/core/src/logical_plan/dfschema.rs  | 21 -------------------
 datafusion/core/src/logical_plan/mod.rs       |  7 ++-----
 datafusion/core/src/logical_plan/operators.rs | 18 ----------------
 4 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 datafusion/core/src/logical_plan/dfschema.rs
 delete mode 100644 datafusion/core/src/logical_plan/operators.rs

diff --git a/datafusion/core/src/logical_plan/builder.rs b/datafusion/core/src/logical_plan/builder.rs
index 6b08b5beba77c..a0914ae73dc03 100644
--- a/datafusion/core/src/logical_plan/builder.rs
+++ b/datafusion/core/src/logical_plan/builder.rs
@@ -43,7 +43,6 @@ use std::{
     sync::Arc,
 };
 
-use super::dfschema::ToDFSchema;
 use super::{exprlist_to_fields, Expr, JoinConstraint, JoinType, LogicalPlan, PlanType};
 use crate::logical_plan::{
     columnize_expr, normalize_col, normalize_cols, provider_as_source,
@@ -51,6 +50,7 @@ use crate::logical_plan::{
     Partitioning, Repartition, Values,
 };
 use crate::sql::utils::group_window_expr_by_sort_keys;
+use datafusion_common::ToDFSchema;
 
 /// Default table name for unnamed table
 pub const UNNAMED_TABLE: &str = "?table?";
diff --git a/datafusion/core/src/logical_plan/dfschema.rs b/datafusion/core/src/logical_plan/dfschema.rs
deleted file mode 100644
index eb624283ea4fc..0000000000000
--- a/datafusion/core/src/logical_plan/dfschema.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-//! DFSchema is an extended schema struct that DataFusion uses to provide support for
-//! fields with optional relation names.
-
-pub use datafusion_common::{DFField, DFSchema, DFSchemaRef, ExprSchema, ToDFSchema};
diff --git a/datafusion/core/src/logical_plan/mod.rs b/datafusion/core/src/logical_plan/mod.rs
index 488a2b95414c8..f131d3389c528 100644
--- a/datafusion/core/src/logical_plan/mod.rs
+++ b/datafusion/core/src/logical_plan/mod.rs
@@ -22,20 +22,18 @@
 //! physical query plans and executed.
 
 pub(crate) mod builder;
-mod dfschema;
 mod expr;
 mod expr_rewriter;
 mod expr_simplier;
 mod expr_visitor;
-mod operators;
 pub mod plan;
 mod registry;
 pub mod window_frames;
 pub use builder::{
     build_join_schema, union_with_alias, LogicalPlanBuilder, UNNAMED_TABLE,
 };
-pub use datafusion_expr::expr_fn::binary_expr;
-pub use dfschema::{DFField, DFSchema, DFSchemaRef, ToDFSchema};
+pub use datafusion_common::{DFField, DFSchema, DFSchemaRef, ToDFSchema};
+pub use datafusion_expr::{expr_fn::binary_expr, Operator};
 
 pub use crate::logical_expr::ExprSchemable;
 pub use expr::{
@@ -57,7 +55,6 @@ pub use expr_rewriter::{
 };
 pub use expr_simplier::{ExprSimplifiable, SimplifyInfo};
 pub use expr_visitor::{ExprVisitable, ExpressionVisitor, Recursion};
-pub use operators::Operator;
 pub use plan::{provider_as_source, source_as_provider};
 pub use plan::{
     CreateCatalog, CreateCatalogSchema, CreateExternalTable, CreateMemoryTable,
diff --git a/datafusion/core/src/logical_plan/operators.rs b/datafusion/core/src/logical_plan/operators.rs
deleted file mode 100644
index 132f8a89f0639..0000000000000
--- a/datafusion/core/src/logical_plan/operators.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-pub use datafusion_expr::Operator;