fixup

velox/external/date/tz.cpp

@@ -3577,7 +3577,7 @@ tzdb::locate_zone(const std::string& tz_name) const
                 return &*zi;
         }
 #endif  // !USE_OS_TZDB
-        throw std::runtime_error(std::string(tz_name) + " not found in timezone database");
+        throw invalid_timezone(std::string(tz_name));
     }
     return &*zi;
 }

velox/external/date/tz.h

@@ -284,6 +284,33 @@ ambiguous_local_time::make_msg(local_time<Duration> tp, const local_info& i)
     return os.str();
 }
 
+class invalid_timezone
+    : public std::runtime_error
+{
+public:
+    invalid_timezone(const std::string tz_name);
+
+private:
+    static
+    std::string
+    make_msg(const std::string tz_name);
+};
+
+inline
+invalid_timezone::invalid_timezone(const std::string tz_name)
+    : std::runtime_error(make_msg(tz_name))
+{
+}
+
+inline
+std::string
+invalid_timezone::make_msg(const std::string tz_name)
+{
+    std::ostringstream os;
+    os << tz_name << " not found in timezone database";
+    return os.str();
+}
+
 class time_zone;
 
 #if HAS_STRING_VIEW

velox/type/tz/TimeZoneMap.cpp

@@ -65,7 +65,7 @@ TTimeZoneDatabase buildTimeZoneDatabase(
       const date::time_zone* zone;
       try {
         zone = date::locate_zone(entry.second);
-      } catch (std::runtime_error& err) {
+      } catch (date::invalid_timezone& err) {
         // Timezone not found in OS, skip it.
         LOG(WARNING) << "Timezone [" << entry.second << "] not found due to: '"
                      << err.what() << "', ignoring it. ";