Merge branch 'master' into pod-array-overflow

base/base/phdr_cache.h

@@ -8,6 +8,7 @@
   * As a drawback, this only works if no dynamic object unloading happens after this point.
   * This function is thread-safe. You should call it to update cache after loading new shared libraries.
   * Otherwise exception handling from dlopened libraries won't work (will call std::terminate immediately).
+  * NOTE: dlopen is forbidden in our code.
   *
   * NOTE: It is disabled with Thread Sanitizer because TSan can only use original "dl_iterate_phdr" function.
   */

programs/benchmark/clickhouse-benchmark.cpp

@@ -1,2 +1 @@
 extern int mainEntryClickHouseBenchmark(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseBenchmark(argc_, argv_); }

programs/client/clickhouse-client.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseClient(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseClient(argc_, argv_); }

programs/compressor/clickhouse-compressor.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseCompressor(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseCompressor(argc_, argv_); }

programs/copier/clickhouse-copier.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseClusterCopier(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseClusterCopier(argc_, argv_); }

programs/disks/clickhouse-disks.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseDisks(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseDisks(argc_, argv_); }

programs/extract-from-config/clickhouse-extract-from-config.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseExtractFromConfig(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseExtractFromConfig(argc_, argv_); }

programs/format/clickhouse-format.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseFormat(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseFormat(argc_, argv_); }

programs/git-import/clickhouse-git-import.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseGitImport(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseGitImport(argc_, argv_); }

programs/keeper-converter/clickhouse-keeper-converter.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseKeeperConverter(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseKeeperConverter(argc_, argv_); }

programs/library-bridge/CMakeLists.txt

@@ -9,6 +9,7 @@ set (CLICKHOUSE_LIBRARY_BRIDGE_SOURCES
     LibraryBridge.cpp
     LibraryBridgeHandlerFactory.cpp
     LibraryBridgeHandlers.cpp
+    SharedLibrary.cpp
     library-bridge.cpp
 )
 

programs/library-bridge/CatBoostLibraryHandler.h

@@ -7,12 +7,13 @@
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/IColumn.h>
-#include <Common/SharedLibrary.h>
 #include <base/defines.h>
+#include "SharedLibrary.h"
 
 #include <chrono>
 #include <mutex>
 
+
 namespace DB
 {
 

programs/library-bridge/ExternalDictionaryLibraryHandler.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/SharedLibrary.h>
+#include "SharedLibrary.h"
 #include <Common/logger_useful.h>
 #include "ExternalDictionaryLibraryUtils.h"
 

programs/library-bridge/SharedLibrary.cpp

@@ -1,8 +1,7 @@
 #include "SharedLibrary.h"
 #include <string>
-#include <boost/core/noncopyable.hpp>
 #include <base/phdr_cache.h>
-#include "Exception.h"
+#include <Common/Exception.h>
 
 
 namespace DB

programs/local/clickhouse-local.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseLocal(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseLocal(argc_, argv_); }

programs/main.cpp

@@ -422,6 +422,7 @@ int main(int argc_, char ** argv_)
     /// PHDR cache is required for query profiler to work reliably
     /// It also speed up exception handling, but exceptions from dynamically loaded libraries (dlopen)
     ///  will work only after additional call of this function.
+    /// Note: we forbid dlopen in our code.
     updatePHDRCache();
 
 #ifndef DISABLE_HARMFUL_ENV_VAR_CHECK

programs/obfuscator/clickhouse-obfuscator.cpp

@@ -1,3 +1 @@
 int mainEntryClickHouseObfuscator(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseObfuscator(argc_, argv_); }
-

programs/server/clickhouse-server.cpp

@@ -1,24 +1 @@
-#include <new>
-
-#include <base/phdr_cache.h>
-
-
 int mainEntryClickHouseServer(int argc, char ** argv);
-
-/**
-  * This is the entry-point for the split build server. The initialization
-  * is copied from single-binary entry point in main.cpp.
-  */
-int main(int argc_, char ** argv_)
-{
-    /// Reset new handler to default (that throws std::bad_alloc)
-    /// It is needed because LLVM library clobbers it.
-    std::set_new_handler(nullptr);
-
-    /// PHDR cache is required for query profiler to work reliably
-    /// It also speed up exception handling, but exceptions from dynamically loaded libraries (dlopen)
-    ///  will work only after additional call of this function.
-    updatePHDRCache();
-
-    return mainEntryClickHouseServer(argc_, argv_);
-}

programs/static-files-disk-uploader/clickhouse-static-files-disk-uploader.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseStaticFilesDiskUploader(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseStaticFilesDiskUploader(argc_, argv_); }

programs/su/clickhouse-su.cpp

@@ -1,2 +1 @@
 int mainEntryClickHouseSU(int argc, char ** argv);
-int main(int argc_, char ** argv_) { return mainEntryClickHouseSU(argc_, argv_); }