From 4ec3d51ebae0606edc6d99d1fcf5e672a89a373e Mon Sep 17 00:00:00 2001 From: Bruce Ritchie Date: Fri, 26 Apr 2024 12:00:07 -0400 Subject: [PATCH] Make modules public, add Default impl's. (#10239) --- datafusion/functions/src/string/ascii.rs | 7 +++ datafusion/functions/src/string/bit_length.rs | 6 +++ datafusion/functions/src/string/btrim.rs | 6 +++ datafusion/functions/src/string/chr.rs | 6 +++ .../functions/src/string/levenshtein.rs | 6 +++ datafusion/functions/src/string/lower.rs | 6 +++ datafusion/functions/src/string/ltrim.rs | 6 +++ datafusion/functions/src/string/mod.rs | 44 +++++++++---------- .../functions/src/string/octet_length.rs | 6 +++ datafusion/functions/src/string/overlay.rs | 6 +++ datafusion/functions/src/string/repeat.rs | 6 +++ datafusion/functions/src/string/replace.rs | 6 +++ datafusion/functions/src/string/rtrim.rs | 6 +++ datafusion/functions/src/string/split_part.rs | 6 +++ .../functions/src/string/starts_with.rs | 7 +++ datafusion/functions/src/string/to_hex.rs | 7 +++ datafusion/functions/src/string/upper.rs | 6 +++ datafusion/functions/src/string/uuid.rs | 6 +++ .../functions/src/unicode/character_length.rs | 6 +++ .../functions/src/unicode/find_in_set.rs | 6 +++ datafusion/functions/src/unicode/left.rs | 6 +++ datafusion/functions/src/unicode/lpad.rs | 6 +++ datafusion/functions/src/unicode/mod.rs | 22 +++++----- datafusion/functions/src/unicode/reverse.rs | 6 +++ datafusion/functions/src/unicode/right.rs | 6 +++ datafusion/functions/src/unicode/rpad.rs | 6 +++ datafusion/functions/src/unicode/strpos.rs | 6 +++ datafusion/functions/src/unicode/substr.rs | 6 +++ .../functions/src/unicode/substrindex.rs | 6 +++ datafusion/functions/src/unicode/translate.rs | 6 +++ 30 files changed, 204 insertions(+), 33 deletions(-) diff --git a/datafusion/functions/src/string/ascii.rs b/datafusion/functions/src/string/ascii.rs index 15a3c2391ac6..9e1e6b81b61d 100644 --- a/datafusion/functions/src/string/ascii.rs +++ b/datafusion/functions/src/string/ascii.rs @@ -47,6 +47,13 @@ pub fn ascii(args: &[ArrayRef]) -> Result { pub struct AsciiFunc { signature: Signature, } + +impl Default for AsciiFunc { + fn default() -> Self { + Self::new() + } +} + impl AsciiFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/bit_length.rs b/datafusion/functions/src/string/bit_length.rs index 17c49216553b..65ec1a4a7734 100644 --- a/datafusion/functions/src/string/bit_length.rs +++ b/datafusion/functions/src/string/bit_length.rs @@ -31,6 +31,12 @@ pub struct BitLengthFunc { signature: Signature, } +impl Default for BitLengthFunc { + fn default() -> Self { + Self::new() + } +} + impl BitLengthFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/btrim.rs b/datafusion/functions/src/string/btrim.rs index 971f7bbd4d92..97b54a194a27 100644 --- a/datafusion/functions/src/string/btrim.rs +++ b/datafusion/functions/src/string/btrim.rs @@ -41,6 +41,12 @@ pub struct BTrimFunc { aliases: Vec, } +impl Default for BTrimFunc { + fn default() -> Self { + Self::new() + } +} + impl BTrimFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/chr.rs b/datafusion/functions/src/string/chr.rs index 21d79cf6b0f1..4da7dc01594d 100644 --- a/datafusion/functions/src/string/chr.rs +++ b/datafusion/functions/src/string/chr.rs @@ -65,6 +65,12 @@ pub struct ChrFunc { signature: Signature, } +impl Default for ChrFunc { + fn default() -> Self { + Self::new() + } +} + impl ChrFunc { pub fn new() -> Self { Self { diff --git a/datafusion/functions/src/string/levenshtein.rs b/datafusion/functions/src/string/levenshtein.rs index ec22b0a4a480..3edf6de8c863 100644 --- a/datafusion/functions/src/string/levenshtein.rs +++ b/datafusion/functions/src/string/levenshtein.rs @@ -34,6 +34,12 @@ pub struct LevenshteinFunc { signature: Signature, } +impl Default for LevenshteinFunc { + fn default() -> Self { + Self::new() + } +} + impl LevenshteinFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/lower.rs b/datafusion/functions/src/string/lower.rs index b9b3840252c5..29ca682c380b 100644 --- a/datafusion/functions/src/string/lower.rs +++ b/datafusion/functions/src/string/lower.rs @@ -31,6 +31,12 @@ pub struct LowerFunc { signature: Signature, } +impl Default for LowerFunc { + fn default() -> Self { + Self::new() + } +} + impl LowerFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/ltrim.rs b/datafusion/functions/src/string/ltrim.rs index 1a6a9d497f66..ef05a2cb2a13 100644 --- a/datafusion/functions/src/string/ltrim.rs +++ b/datafusion/functions/src/string/ltrim.rs @@ -40,6 +40,12 @@ pub struct LtrimFunc { signature: Signature, } +impl Default for LtrimFunc { + fn default() -> Self { + Self::new() + } +} + impl LtrimFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/mod.rs b/datafusion/functions/src/string/mod.rs index 9eb2a7426fba..52411142cb8d 100644 --- a/datafusion/functions/src/string/mod.rs +++ b/datafusion/functions/src/string/mod.rs @@ -21,28 +21,28 @@ use std::sync::Arc; use datafusion_expr::ScalarUDF; -mod ascii; -mod bit_length; -mod btrim; -mod chr; -mod common; -mod concat; -mod concat_ws; -mod ends_with; -mod initcap; -mod levenshtein; -mod lower; -mod ltrim; -mod octet_length; -mod overlay; -mod repeat; -mod replace; -mod rtrim; -mod split_part; -mod starts_with; -mod to_hex; -mod upper; -mod uuid; +pub mod ascii; +pub mod bit_length; +pub mod btrim; +pub mod chr; +pub mod common; +pub mod concat; +pub mod concat_ws; +pub mod ends_with; +pub mod initcap; +pub mod levenshtein; +pub mod lower; +pub mod ltrim; +pub mod octet_length; +pub mod overlay; +pub mod repeat; +pub mod replace; +pub mod rtrim; +pub mod split_part; +pub mod starts_with; +pub mod to_hex; +pub mod upper; +pub mod uuid; // create UDFs make_udf_function!(ascii::AsciiFunc, ASCII, ascii); diff --git a/datafusion/functions/src/string/octet_length.rs b/datafusion/functions/src/string/octet_length.rs index bdd262b7e37e..12980fab1f11 100644 --- a/datafusion/functions/src/string/octet_length.rs +++ b/datafusion/functions/src/string/octet_length.rs @@ -31,6 +31,12 @@ pub struct OctetLengthFunc { signature: Signature, } +impl Default for OctetLengthFunc { + fn default() -> Self { + Self::new() + } +} + impl OctetLengthFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/overlay.rs b/datafusion/functions/src/string/overlay.rs index 3f92a73c1af9..772b04136129 100644 --- a/datafusion/functions/src/string/overlay.rs +++ b/datafusion/functions/src/string/overlay.rs @@ -34,6 +34,12 @@ pub struct OverlayFunc { signature: Signature, } +impl Default for OverlayFunc { + fn default() -> Self { + Self::new() + } +} + impl OverlayFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/repeat.rs b/datafusion/functions/src/string/repeat.rs index 77521120d9d8..a70d0a162562 100644 --- a/datafusion/functions/src/string/repeat.rs +++ b/datafusion/functions/src/string/repeat.rs @@ -34,6 +34,12 @@ pub struct RepeatFunc { signature: Signature, } +impl Default for RepeatFunc { + fn default() -> Self { + Self::new() + } +} + impl RepeatFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/replace.rs b/datafusion/functions/src/string/replace.rs index 01a3762acaf4..4cebbba839fa 100644 --- a/datafusion/functions/src/string/replace.rs +++ b/datafusion/functions/src/string/replace.rs @@ -34,6 +34,12 @@ pub struct ReplaceFunc { signature: Signature, } +impl Default for ReplaceFunc { + fn default() -> Self { + Self::new() + } +} + impl ReplaceFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/rtrim.rs b/datafusion/functions/src/string/rtrim.rs index e6e93e38c966..2e39080e226b 100644 --- a/datafusion/functions/src/string/rtrim.rs +++ b/datafusion/functions/src/string/rtrim.rs @@ -40,6 +40,12 @@ pub struct RtrimFunc { signature: Signature, } +impl Default for RtrimFunc { + fn default() -> Self { + Self::new() + } +} + impl RtrimFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/split_part.rs b/datafusion/functions/src/string/split_part.rs index 4396386afff5..517fa93e5284 100644 --- a/datafusion/functions/src/string/split_part.rs +++ b/datafusion/functions/src/string/split_part.rs @@ -34,6 +34,12 @@ pub struct SplitPartFunc { signature: Signature, } +impl Default for SplitPartFunc { + fn default() -> Self { + Self::new() + } +} + impl SplitPartFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/starts_with.rs b/datafusion/functions/src/string/starts_with.rs index edbf5c9217a7..05bd960ff14b 100644 --- a/datafusion/functions/src/string/starts_with.rs +++ b/datafusion/functions/src/string/starts_with.rs @@ -43,6 +43,13 @@ pub fn starts_with(args: &[ArrayRef]) -> Result { pub struct StartsWithFunc { signature: Signature, } + +impl Default for StartsWithFunc { + fn default() -> Self { + Self::new() + } +} + impl StartsWithFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/to_hex.rs b/datafusion/functions/src/string/to_hex.rs index 5050d8bab3e9..79aa9254f9b1 100644 --- a/datafusion/functions/src/string/to_hex.rs +++ b/datafusion/functions/src/string/to_hex.rs @@ -63,6 +63,13 @@ where pub struct ToHexFunc { signature: Signature, } + +impl Default for ToHexFunc { + fn default() -> Self { + Self::new() + } +} + impl ToHexFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/upper.rs b/datafusion/functions/src/string/upper.rs index 8f03d7dc6bbc..da31948fbcfa 100644 --- a/datafusion/functions/src/string/upper.rs +++ b/datafusion/functions/src/string/upper.rs @@ -28,6 +28,12 @@ pub struct UpperFunc { signature: Signature, } +impl Default for UpperFunc { + fn default() -> Self { + Self::new() + } +} + impl UpperFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/string/uuid.rs b/datafusion/functions/src/string/uuid.rs index 9c97b4dd7413..3ddc320fcec1 100644 --- a/datafusion/functions/src/string/uuid.rs +++ b/datafusion/functions/src/string/uuid.rs @@ -32,6 +32,12 @@ pub struct UuidFunc { signature: Signature, } +impl Default for UuidFunc { + fn default() -> Self { + Self::new() + } +} + impl UuidFunc { pub fn new() -> Self { Self { diff --git a/datafusion/functions/src/unicode/character_length.rs b/datafusion/functions/src/unicode/character_length.rs index 7e2723771ff2..4f32f4c17776 100644 --- a/datafusion/functions/src/unicode/character_length.rs +++ b/datafusion/functions/src/unicode/character_length.rs @@ -33,6 +33,12 @@ pub struct CharacterLengthFunc { aliases: Vec, } +impl Default for CharacterLengthFunc { + fn default() -> Self { + Self::new() + } +} + impl CharacterLengthFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/find_in_set.rs b/datafusion/functions/src/unicode/find_in_set.rs index fc45f897c5f4..7c864bc191d7 100644 --- a/datafusion/functions/src/unicode/find_in_set.rs +++ b/datafusion/functions/src/unicode/find_in_set.rs @@ -35,6 +35,12 @@ pub struct FindInSetFunc { signature: Signature, } +impl Default for FindInSetFunc { + fn default() -> Self { + Self::new() + } +} + impl FindInSetFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/left.rs b/datafusion/functions/src/unicode/left.rs index 24ea2d5a8f25..7d456f5f1e94 100644 --- a/datafusion/functions/src/unicode/left.rs +++ b/datafusion/functions/src/unicode/left.rs @@ -35,6 +35,12 @@ pub struct LeftFunc { signature: Signature, } +impl Default for LeftFunc { + fn default() -> Self { + Self::new() + } +} + impl LeftFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/lpad.rs b/datafusion/functions/src/unicode/lpad.rs index 47208903bcef..ce5e0064362b 100644 --- a/datafusion/functions/src/unicode/lpad.rs +++ b/datafusion/functions/src/unicode/lpad.rs @@ -33,6 +33,12 @@ pub struct LPadFunc { signature: Signature, } +impl Default for LPadFunc { + fn default() -> Self { + Self::new() + } +} + impl LPadFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/mod.rs b/datafusion/functions/src/unicode/mod.rs index eba4cd5048eb..5a8e953bc161 100644 --- a/datafusion/functions/src/unicode/mod.rs +++ b/datafusion/functions/src/unicode/mod.rs @@ -21,17 +21,17 @@ use std::sync::Arc; use datafusion_expr::ScalarUDF; -mod character_length; -mod find_in_set; -mod left; -mod lpad; -mod reverse; -mod right; -mod rpad; -mod strpos; -mod substr; -mod substrindex; -mod translate; +pub mod character_length; +pub mod find_in_set; +pub mod left; +pub mod lpad; +pub mod reverse; +pub mod right; +pub mod rpad; +pub mod strpos; +pub mod substr; +pub mod substrindex; +pub mod translate; // create UDFs make_udf_function!( diff --git a/datafusion/functions/src/unicode/reverse.rs b/datafusion/functions/src/unicode/reverse.rs index 6b24c2336810..52666cc57059 100644 --- a/datafusion/functions/src/unicode/reverse.rs +++ b/datafusion/functions/src/unicode/reverse.rs @@ -32,6 +32,12 @@ pub struct ReverseFunc { signature: Signature, } +impl Default for ReverseFunc { + fn default() -> Self { + Self::new() + } +} + impl ReverseFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/right.rs b/datafusion/functions/src/unicode/right.rs index dddbf31e721b..20cbbe020ff1 100644 --- a/datafusion/functions/src/unicode/right.rs +++ b/datafusion/functions/src/unicode/right.rs @@ -35,6 +35,12 @@ pub struct RightFunc { signature: Signature, } +impl Default for RightFunc { + fn default() -> Self { + Self::new() + } +} + impl RightFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/rpad.rs b/datafusion/functions/src/unicode/rpad.rs index 8946f07006b7..fc6bf1ffe748 100644 --- a/datafusion/functions/src/unicode/rpad.rs +++ b/datafusion/functions/src/unicode/rpad.rs @@ -33,6 +33,12 @@ pub struct RPadFunc { signature: Signature, } +impl Default for RPadFunc { + fn default() -> Self { + Self::new() + } +} + impl RPadFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/strpos.rs b/datafusion/functions/src/unicode/strpos.rs index 4ebdd9d58623..395fd0b77d12 100644 --- a/datafusion/functions/src/unicode/strpos.rs +++ b/datafusion/functions/src/unicode/strpos.rs @@ -36,6 +36,12 @@ pub struct StrposFunc { aliases: Vec, } +impl Default for StrposFunc { + fn default() -> Self { + Self::new() + } +} + impl StrposFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/substr.rs b/datafusion/functions/src/unicode/substr.rs index 260937a01a74..c297182057fe 100644 --- a/datafusion/functions/src/unicode/substr.rs +++ b/datafusion/functions/src/unicode/substr.rs @@ -34,6 +34,12 @@ pub struct SubstrFunc { signature: Signature, } +impl Default for SubstrFunc { + fn default() -> Self { + Self::new() + } +} + impl SubstrFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/substrindex.rs b/datafusion/functions/src/unicode/substrindex.rs index da4ff55828e9..a057e4298546 100644 --- a/datafusion/functions/src/unicode/substrindex.rs +++ b/datafusion/functions/src/unicode/substrindex.rs @@ -34,6 +34,12 @@ pub struct SubstrIndexFunc { aliases: Vec, } +impl Default for SubstrIndexFunc { + fn default() -> Self { + Self::new() + } +} + impl SubstrIndexFunc { pub fn new() -> Self { use DataType::*; diff --git a/datafusion/functions/src/unicode/translate.rs b/datafusion/functions/src/unicode/translate.rs index 25daf8738b21..5f64d8875bf5 100644 --- a/datafusion/functions/src/unicode/translate.rs +++ b/datafusion/functions/src/unicode/translate.rs @@ -35,6 +35,12 @@ pub struct TranslateFunc { signature: Signature, } +impl Default for TranslateFunc { + fn default() -> Self { + Self::new() + } +} + impl TranslateFunc { pub fn new() -> Self { use DataType::*;