Improve CCTZ contrib

CMakeLists.txt

@@ -354,7 +354,6 @@ endif ()
 
 # Need to process before "contrib" dir:
 include (cmake/find/jemalloc.cmake)
-include (cmake/find/cctz.cmake)
 include (cmake/find/mysqlclient.cmake)
 
 # When testing for memory leaks with Valgrind, don't link tcmalloc or jemalloc.

base/common/CMakeLists.txt

@@ -41,10 +41,6 @@ endif ()
 
 target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
 
-if(CCTZ_INCLUDE_DIR)
-    target_include_directories(common BEFORE PRIVATE ${CCTZ_INCLUDE_DIR})
-endif()
-
 if (NOT USE_INTERNAL_BOOST_LIBRARY)
     target_include_directories (common SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
 endif ()
@@ -53,10 +49,6 @@ if(NOT USE_INTERNAL_POCO_LIBRARY)
     target_include_directories (common SYSTEM BEFORE PUBLIC ${Poco_Foundation_INCLUDE_DIR})
 endif()
 
-if(CCTZ_LIBRARY)
-    target_link_libraries(common PRIVATE ${CCTZ_LIBRARY})
-endif()
-
 # allow explicitly fallback to readline
 if (NOT ENABLE_REPLXX AND ENABLE_READLINE)
     message (STATUS "Attempt to fallback to readline explicitly")
@@ -88,6 +80,9 @@ target_link_libraries (common
         ${Boost_SYSTEM_LIBRARY}
         FastMemcpy
         replxx
+
+    PRIVATE
+        cctz
 )
 
 if (ENABLE_TESTS)

base/common/DateLUT.cpp

@@ -1,9 +1,10 @@
-#include <common/DateLUT.h>
+#include "DateLUT.h"
 
-#include <filesystem>
+#include <Poco/DigestStream.h>
 #include <Poco/Exception.h>
 #include <Poco/SHA1Engine.h>
-#include <Poco/DigestStream.h>
+
+#include <filesystem>
 #include <fstream>
 
 

base/common/DateLUT.h

@@ -1,20 +1,15 @@
 #pragma once
 
 #include "DateLUTImpl.h"
-#include <unordered_map>
-#include <atomic>
-#include <mutex>
-#include <memory>
+
+#include "defines.h"
+
 #include <boost/noncopyable.hpp>
 
-// Also defined in Core/Defines.h
-#if !defined(ALWAYS_INLINE)
-#if defined(_MSC_VER)
-    #define ALWAYS_INLINE __forceinline
-#else
-    #define ALWAYS_INLINE __attribute__((__always_inline__))
-#endif
-#endif
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include <unordered_map>
 
 
 /// This class provides lazy initialization and lookup of singleton DateLUTImpl objects for a given timezone.

base/common/DateLUTImpl.cpp

@@ -1,23 +1,14 @@
-#if __has_include(<cctz/civil_time.h>)
-#include <cctz/civil_time.h> // bundled, debian
-#else
-#include <civil_time.h> // freebsd
-#endif
+#include "DateLUTImpl.h"
 
-#if __has_include(<cctz/time_zone.h>)
+#include <cctz/civil_time.h>
 #include <cctz/time_zone.h>
-#else
-#include <time_zone.h>
-#endif
-
-#include <common/DateLUTImpl.h>
 #include <Poco/Exception.h>
 
-#include <memory>
+#include <cassert>
 #include <chrono>
 #include <cstring>
-#include <cassert>
 #include <iostream>
+#include <memory>
 
 #define DATE_LUT_MIN 0
 

base/common/DateLUTImpl.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include "Types.h"
 #include "DayNum.h"
-#include "likely.h"
+#include "defines.h"
+#include "types.h"
+
 #include <ctime>
 #include <string>
 

base/common/DayNum.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/Types.h>
+#include <common/types.h>
 #include <common/strong_typedef.h>
 
 /** Represents number of days since 1970-01-01.

base/common/JSON.h

@@ -3,7 +3,7 @@
 #include <typeinfo>
 #include <Poco/Exception.h>
 #include <common/StringRef.h>
-#include <common/Types.h>
+#include <common/types.h>
 
 
 /** Очень простой класс для чтения JSON (или его кусочков).

base/common/LineReader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/Types.h>
+#include <common/types.h>
 
 #include <atomic>
 #include <vector>

base/common/StringRef.h

@@ -5,7 +5,7 @@
 #include <functional>
 #include <ostream>
 
-#include <common/Types.h>
+#include <common/types.h>
 #include <common/unaligned.h>
 
 #include <city.h>

base/common/defines.h

@@ -0,0 +1,87 @@
+#pragma once
+
+#if defined(_MSC_VER)
+#   if !defined(likely)
+#      define likely(x)   (x)
+#   endif
+#   if !defined(unlikely)
+#      define unlikely(x) (x)
+#   endif
+#else
+#   if !defined(likely)
+#       define likely(x)   (__builtin_expect(!!(x), 1))
+#   endif
+#   if !defined(unlikely)
+#       define unlikely(x) (__builtin_expect(!!(x), 0))
+#   endif
+#endif
+
+#if defined(_MSC_VER)
+#    define ALWAYS_INLINE __forceinline
+#    define NO_INLINE static __declspec(noinline)
+#    define MAY_ALIAS
+#else
+#    define ALWAYS_INLINE __attribute__((__always_inline__))
+#    define NO_INLINE __attribute__((__noinline__))
+#    define MAY_ALIAS __attribute__((__may_alias__))
+#endif
+
+#if !defined(__x86_64__) && !defined(__aarch64__) && !defined(__PPC__)
+#    error "The only supported platforms are x86_64 and AArch64, PowerPC (work in progress)"
+#endif
+
+/// Check for presence of address sanitizer
+#if !defined(ADDRESS_SANITIZER)
+#    if defined(__has_feature)
+#        if __has_feature(address_sanitizer)
+#            define ADDRESS_SANITIZER 1
+#        endif
+#    elif defined(__SANITIZE_ADDRESS__)
+#        define ADDRESS_SANITIZER 1
+#    endif
+#endif
+
+#if !defined(THREAD_SANITIZER)
+#    if defined(__has_feature)
+#        if __has_feature(thread_sanitizer)
+#            define THREAD_SANITIZER 1
+#        endif
+#    elif defined(__SANITIZE_THREAD__)
+#        define THREAD_SANITIZER 1
+#    endif
+#endif
+
+#if !defined(MEMORY_SANITIZER)
+#    if defined(__has_feature)
+#        if __has_feature(memory_sanitizer)
+#            define MEMORY_SANITIZER 1
+#        endif
+#    elif defined(__MEMORY_SANITIZER__)
+#        define MEMORY_SANITIZER 1
+#    endif
+#endif
+
+/// TODO: Strange enough, there is no way to detect UB sanitizer.
+
+/// Explicitly allow undefined behaviour for certain functions. Use it as a function attribute.
+/// It is useful in case when compiler cannot see (and exploit) it, but UBSan can.
+/// Example: multiplication of signed integers with possibility of overflow when both sides are from user input.
+#if defined(__clang__)
+#    define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
+#    define NO_SANITIZE_ADDRESS __attribute__((__no_sanitize__("address")))
+#    define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
+#else  /// It does not work in GCC. GCC 7 cannot recognize this attribute and GCC 8 simply ignores it.
+#    define NO_SANITIZE_UNDEFINED
+#    define NO_SANITIZE_ADDRESS
+#    define NO_SANITIZE_THREAD
+#endif
+
+#if defined __GNUC__ && !defined __clang__
+#    define OPTIMIZE(x) __attribute__((__optimize__(x)))
+#else
+#    define OPTIMIZE(x)
+#endif
+
+/// A macro for suppressing warnings about unused variables or function results.
+/// Useful for structured bindings which have no standard way to declare this.
+#define UNUSED(...) (void)(__VA_ARGS__)

base/common/itoa.h

@@ -30,7 +30,6 @@
 #include <cstddef>
 #include <cstring>
 #include <type_traits>
-#include "likely.h"
 
 using int128_t = __int128;
 using uint128_t = unsigned __int128;

base/common/memory.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <new>
-#include "likely.h"
+#include "defines.h"
 
 #if __has_include(<common/config_common.h>)
 #include <common/config_common.h>
@@ -19,27 +19,11 @@
 #include <cstdlib>
 #endif
 
-// Also defined in Core/Defines.h
-#if !defined(ALWAYS_INLINE)
-#if defined(_MSC_VER)
-    #define ALWAYS_INLINE inline __forceinline
-#else
-    #define ALWAYS_INLINE inline __attribute__((__always_inline__))
-#endif
-#endif
-
-#if !defined(NO_INLINE)
-#if defined(_MSC_VER)
-    #define NO_INLINE static __declspec(noinline)
-#else
-    #define NO_INLINE __attribute__((__noinline__))
-#endif
-#endif
 
 namespace Memory
 {
 
-ALWAYS_INLINE void * newImpl(std::size_t size)
+inline ALWAYS_INLINE void * newImpl(std::size_t size)
 {
     auto * ptr = malloc(size);
     if (likely(ptr != nullptr))
@@ -49,19 +33,19 @@ ALWAYS_INLINE void * newImpl(std::size_t size)
     throw std::bad_alloc{};
 }
 
-ALWAYS_INLINE void * newNoExept(std::size_t size) noexcept
+inline ALWAYS_INLINE void * newNoExept(std::size_t size) noexcept
 {
     return malloc(size);
 }
 
-ALWAYS_INLINE void deleteImpl(void * ptr) noexcept
+inline ALWAYS_INLINE void deleteImpl(void * ptr) noexcept
 {
     free(ptr);
 }
 
 #if USE_JEMALLOC
 
-ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
+inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
 {
     if (unlikely(ptr == nullptr))
         return;
@@ -71,7 +55,7 @@ ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
 
 #else
 
-ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size [[maybe_unused]]) noexcept
+inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size [[maybe_unused]]) noexcept
 {
     free(ptr);
 }

base/common/shift10.cpp

@@ -1,6 +1,6 @@
 #include <common/shift10.h>
 
-#include <common/likely.h>
+#include "defines.h"
 
 #include <limits>
 

base/common/shift10.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/Types.h>
+#include <common/types.h>
 
 /** Almost the same as x = x * exp10(exponent), but gives more accurate result.
   * Example:

base/common/terminalColors.h

@@ -1,5 +1,5 @@
 #include <string>
-#include <common/Types.h>
+#include <common/types.h>
 
 
 /** Set color in terminal based on 64-bit hash value.

base/daemon/BaseDaemon.h

@@ -17,7 +17,7 @@
 #include <Poco/Util/ServerApplication.h>
 #include <Poco/Net/SocketAddress.h>
 #include <Poco/Version.h>
-#include <common/Types.h>
+#include <common/types.h>
 #include <common/logger_useful.h>
 #include <common/getThreadId.h>
 #include <daemon/GraphiteWriter.h>

base/mysqlxx/Value.h

@@ -9,7 +9,7 @@
 #include <limits>
 
 #include <common/preciseExp10.h>
-#include <common/Types.h>
+#include <common/types.h>
 #include <common/DateLUT.h>
 
 #include <mysqlxx/Types.h>