Made userDefinedFunctionPlanner to uniform the usages (apache#11318)

datafusion/core/src/execution/session_state.rs

@@ -238,10 +238,11 @@ impl SessionState {
             Arc::new(functions_array::planner::ArrayFunctionPlanner),
             #[cfg(feature = "array_expressions")]
             Arc::new(functions_array::planner::FieldAccessPlanner),
-            #[cfg(feature = "datetime_expressions")]
-            Arc::new(functions::datetime::planner::ExtractPlanner),
-            #[cfg(feature = "unicode_expressions")]
-            Arc::new(functions::unicode::planner::PositionPlanner),
+            #[cfg(any(
+                feature = "datetime_expressions",
+                feature = "unicode_expressions"
+            ))]
+            Arc::new(functions::planner::UserDefinedFunctionPlanner),
         ];
 
         let mut new_self = SessionState {

datafusion/functions/src/datetime/mod.rs

@@ -30,7 +30,6 @@ pub mod date_trunc;
 pub mod from_unixtime;
 pub mod make_date;
 pub mod now;
-pub mod planner;
 pub mod to_char;
 pub mod to_date;
 pub mod to_timestamp;

datafusion/functions/src/lib.rs

@@ -130,6 +130,9 @@ make_stub_package!(crypto, "crypto_expressions");
 pub mod unicode;
 make_stub_package!(unicode, "unicode_expressions");
 
+#[cfg(any(feature = "datetime_expressions", feature = "unicode_expressions"))]
+pub mod planner;
+
 mod utils;
 
 /// Fluent-style API for creating `Expr`s

datafusion/functions/src/datetime/planner.rs → datafusion/functions/src/planner.rs

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//! SQL planning extensions like [`ExtractPlanner`]
+//! SQL planning extensions like [`UserDefinedFunctionPlanner`]
 
 use datafusion_common::Result;
 use datafusion_expr::{
@@ -25,12 +25,20 @@ use datafusion_expr::{
 };
 
 #[derive(Default)]
-pub struct ExtractPlanner;
+pub struct UserDefinedFunctionPlanner;
 
-impl UserDefinedSQLPlanner for ExtractPlanner {
+impl UserDefinedSQLPlanner for UserDefinedFunctionPlanner {
+    #[cfg(feature = "datetime_expressions")]
     fn plan_extract(&self, args: Vec<Expr>) -> Result<PlannerResult<Vec<Expr>>> {
         Ok(PlannerResult::Planned(Expr::ScalarFunction(
             ScalarFunction::new_udf(crate::datetime::date_part(), args),
         )))
     }
+
+    #[cfg(feature = "unicode_expressions")]
+    fn plan_position(&self, args: Vec<Expr>) -> Result<PlannerResult<Vec<Expr>>> {
+        Ok(PlannerResult::Planned(Expr::ScalarFunction(
+            ScalarFunction::new_udf(crate::unicode::strpos(), args),
+        )))
+    }
 }

datafusion/functions/src/unicode/mod.rs

@@ -25,7 +25,6 @@ pub mod character_length;
 pub mod find_in_set;
 pub mod left;
 pub mod lpad;
-pub mod planner;
 pub mod reverse;
 pub mod right;
 pub mod rpad;