Backport #60768 to 24.1: Update tzdata to 2024a

ClickHouse · Mar 5, 2024 · 48fdb17 · 48fdb17
1 parent c6129a2
commit 48fdb17
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/contrib/cctz b/contrib/cctz
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
@@ -9,7 +9,9 @@
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteHelpers.h>
+
 #include <boost/algorithm/string/predicate.hpp>
+#include <cctz/time_zone.h>
 
 #include <cmath>
 
@@ -496,6 +498,13 @@ void SettingFieldTimezone::readBinary(ReadBuffer & in)
     *this = std::move(str);
 }
 
+void SettingFieldTimezone::validateTimezone(const std::string & tz_str)
+{
+    cctz::time_zone validated_tz;
+    if (!tz_str.empty() && !cctz::load_time_zone(tz_str, &validated_tz))
+        throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Invalid time zone: {}", tz_str);
+}
+
 String SettingFieldCustom::toString() const
 {
     return value.dump();

diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
@@ -6,7 +6,6 @@
 #include <Core/Field.h>
 #include <Core/MultiEnum.h>
 #include <boost/range/adaptor/map.hpp>
-#include <cctz/time_zone.h>
 #include <chrono>
 #include <unordered_map>
 #include <string_view>
@@ -608,12 +607,7 @@ struct SettingFieldTimezone
     void readBinary(ReadBuffer & in);
 
 private:
-    void validateTimezone(const std::string & tz_str)
-    {
-        cctz::time_zone validated_tz;
-        if (!tz_str.empty() && !cctz::load_time_zone(tz_str, &validated_tz))
-            throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Invalid time zone: {}", tz_str);
-    }
+    void validateTimezone(const std::string & tz_str);
 };
 
 /// Can keep a value of any type. Used for user-defined settings.