It works!

if compiled with:

CC=clang CXX=clang++ cmake -Wno-dev . -Bbuild -GNinja -DCMAKE_AR:FILEPATH=x86_64-apple-darwin-ar -DCMAKE_RANLIB:FILEPATH=x86_64-apple-darwin-ranlib -DCMAKE_SYSTEM_NAME=Darwin -DSDK_PATH=MacOSX10.14.sdk -DLINKER_NAME=x86_64-apple-darwin-ld -DUSE_SNAPPY=OFF -DENABLE_SSL=OFF -DENABLE_PROTOBUF=OFF -DENABLE_PARQUET=OFF -DENABLE_READLINE=OFF -DENABLE_ICU=OFF -DENABLE_FASTOPS=OFF
This commit is contained in:
Ivan Lezhankin 2019-09-20 19:50:13 +03:00 committed by Ivan Lezhankin
parent 8c356a3830
commit 967e00a8da
8 changed files with 37 additions and 3 deletions

2
contrib/zlib-ng vendored

@ -1 +1 @@
Subproject commit cb43e7fa08ec29fd76d84e3bb35258a0f0bf3df3
Subproject commit cff0f500d9399d7cd3b9461a693d211e4b86fcc9

View File

@ -158,7 +158,9 @@ struct ZooKeeperArgs
}
/// Shuffle the hosts to distribute the load among ZooKeeper nodes.
std::shuffle(hosts_strings.begin(), hosts_strings.end(), thread_local_rng);
std::random_device rd;
std::mt19937 g(rd());
std::shuffle(hosts_strings.begin(), hosts_strings.end(), g);
for (auto & host : hosts_strings)
{

View File

@ -1,10 +1,14 @@
#include "MySQLProtocol.h"
#if USE_SSL
#include <IO/WriteBuffer.h>
#include <IO/ReadBufferFromString.h>
#include <IO/WriteBufferFromString.h>
#include <common/logger_useful.h>
#include <random>
#include <sstream>
#include "MySQLProtocol.h"
namespace DB::MySQLProtocol
@ -100,3 +104,5 @@ size_t getLengthEncodedStringSize(const String & s)
}
}
#endif // USE_SSL

View File

@ -1,5 +1,9 @@
#pragma once
#include "config_core.h"
#if USE_SSL
#include <ext/scope_guard.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
@ -1075,3 +1079,5 @@ private:
}
}
#endif // USE_SSL

View File

@ -264,7 +264,9 @@ void registerOutputFormatProcessorXML(FormatFactory & factory);
void registerOutputFormatProcessorODBCDriver(FormatFactory & factory);
void registerOutputFormatProcessorODBCDriver2(FormatFactory & factory);
void registerOutputFormatProcessorNull(FormatFactory & factory);
#if USE_SSL
void registerOutputFormatProcessorMySQLWrite(FormatFactory & factory);
#endif
/// Input only formats.
void registerInputFormatProcessorCapnProto(FormatFactory & factory);
@ -312,7 +314,9 @@ FormatFactory::FormatFactory()
registerOutputFormatProcessorODBCDriver(*this);
registerOutputFormatProcessorODBCDriver2(*this);
registerOutputFormatProcessorNull(*this);
#if USE_SSL
registerOutputFormatProcessorMySQLWrite(*this);
#endif
}
FormatFactory & FormatFactory::instance()

View File

@ -1,3 +1,5 @@
#include <Core/Defines.h>
namespace DB
{
@ -10,10 +12,14 @@ void registerFunctionTrap(FunctionFactory & factory);
void registerFunctionsIntrospection(FunctionFactory & factory)
{
#if defined (OS_LINUX)
registerFunctionAddressToSymbol(factory);
registerFunctionDemangle(factory);
registerFunctionAddressToLine(factory);
registerFunctionTrap(factory);
#else
UNUSED(factory);
#endif
}
}

View File

@ -1,5 +1,7 @@
#include <Processors/Formats/Impl/MySQLOutputFormat.h>
#if USE_SSL
#include <Core/MySQLProtocol.h>
#include <Interpreters/ProcessList.h>
#include <Formats/FormatFactory.h>
@ -116,3 +118,5 @@ void registerOutputFormatProcessorMySQLWrite(FormatFactory & factory)
}
}
#endif // USE_SSL

View File

@ -1,5 +1,9 @@
#pragma once
#include "config_core.h"
#if USE_SSL
#include <Processors/Formats/IRowOutputFormat.h>
#include <Core/Block.h>
@ -40,3 +44,5 @@ private:
};
}
#endif