From 08736556111c16b15d6f05f3a53b8d5c8863259d Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Sun, 24 Mar 2024 06:06:57 -0400 Subject: [PATCH 1/2] Minor: make uuid an optional dependency on datafusion-functions --- datafusion/functions/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datafusion/functions/Cargo.toml b/datafusion/functions/Cargo.toml index 81050dfddf66..1ad92704038f 100644 --- a/datafusion/functions/Cargo.toml +++ b/datafusion/functions/Cargo.toml @@ -51,7 +51,7 @@ math_expressions = [] # enable regular expressions regex_expressions = ["regex"] # enable string functions -string_expressions = [] +string_expressions = ["uuid"] [lib] name = "datafusion_functions" @@ -75,7 +75,7 @@ log = { workspace = true } md-5 = { version = "^0.10.0", optional = true } regex = { version = "1.8", optional = true } sha2 = { version = "^0.10.1", optional = true } -uuid = { version = "1.7", features = ["v4"] } +uuid = { version = "1.7", features = ["v4"], optional = true } [dev-dependencies] criterion = "0.5" From 699344839e90195770278ac7ec4fe801eb67855a Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Fri, 29 Mar 2024 07:15:04 -0400 Subject: [PATCH 2/2] fix merge --- datafusion/functions/Cargo.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/datafusion/functions/Cargo.toml b/datafusion/functions/Cargo.toml index d093da66aae9..3ae3061012e0 100644 --- a/datafusion/functions/Cargo.toml +++ b/datafusion/functions/Cargo.toml @@ -52,13 +52,9 @@ math_expressions = [] # enable regular expressions regex_expressions = ["regex"] # enable string functions -<<<<<<< HEAD string_expressions = ["uuid"] -======= -string_expressions = [] # enable unicode functions unicode_expressions = ["unicode-segmentation"] ->>>>>>> apache/main [lib] name = "datafusion_functions"