Add expected submodule

liuneng1994 · Apr 12, 2024 · bff3199 · bff3199
1 parent c20444d
commit bff3199
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -369,3 +369,6 @@
 [submodule "contrib/idna"]
 	path = contrib/idna
 	url = https://github.com/ada-url/idna.git
+[submodule "contrib/expected"]
+	path = contrib/expected
+	url = https://github.com/TartanLlama/expected
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
@@ -222,6 +222,7 @@ else ()
 endif ()
 
 add_contrib (xxHash-cmake xxHash)
+add_contrib (expected-cmake expected)
 
 add_contrib (libbcrypt-cmake libbcrypt)
 

diff --git a/contrib/expected b/contrib/expected
diff --git a/contrib/expected-cmake/CMakeLists.txt b/contrib/expected-cmake/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(expected INTERFACE)
+target_include_directories(expected SYSTEM BEFORE INTERFACE "${ClickHouse_SOURCE_DIR}/contrib/expected/include")
+add_library(ch_contrib::expected ALIAS expected)
diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt
@@ -46,6 +46,7 @@ list (APPEND PUBLIC_LIBS
 
 list (APPEND PRIVATE_LIBS
         ch_contrib::zlib
+        ch_contrib::expected
         boost::filesystem
         divide_impl
         ch_contrib::xxHash

diff --git a/src/Functions/parseDateTime.cpp b/src/Functions/parseDateTime.cpp
@@ -16,6 +16,7 @@
 #include <IO/WriteHelpers.h>
 #include <boost/algorithm/string/case_conv.hpp>
 
+#include <tl/expected.hpp>
 
 namespace DB
 {