thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preparation [#METR-23747].

Browse Source
This commit is contained in:
Alexey Milovidov 2016-12-08 06:04:30 +03:00
parent 6998b5ecd9
commit 2dc425b7e6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbms/CMakeLists.txt
View File

@ -5,6 +5,11 @@ add_subdirectory (src)
if (ENABLE_MONGODB)
set (LINK_MONGOCLIENT libmongoclient.a ${OPENSSL_LIBRARIES} ${Boost_THREAD_LIBRARY})
set (MONGODB_FILES
include/DB/Dictionaries/MongoDBBlockInputStream.h
include/DB/Dictionaries/MongoDBDictionarySource.h
src/Dictionaries/MongoDBDictionarySource.cpp
src/Dictionaries/MongoDBBlockInputStream.cpp)
add_definitions(-D ENABLE_MONGODB)
endif ()
@ -308,8 +313,6 @@ add_library (dbms
include/DB/Dictionaries/IDictionary.h
include/DB/Dictionaries/MySQLBlockInputStream.h
include/DB/Dictionaries/MySQLDictionarySource.h
include/DB/Dictionaries/MongoDBBlockInputStream.h
include/DB/Dictionaries/MongoDBDictionarySource.h
include/DB/Dictionaries/ODBCBlockInputStream.h
include/DB/Dictionaries/ODBCDictionarySource.h
include/DB/Dictionaries/HashedDictionary.h
@ -812,10 +815,8 @@ add_library (dbms
src/Dictionaries/MySQLDictionarySource.cpp
src/Dictionaries/ODBCDictionarySource.cpp
src/Dictionaries/ClickHouseDictionarySource.cpp
src/Dictionaries/MongoDBDictionarySource.cpp
src/Dictionaries/ExecutableDictionarySource.cpp
src/Dictionaries/HTTPDictionarySource.cpp
src/Dictionaries/MongoDBBlockInputStream.cpp
src/Dictionaries/MySQLBlockInputStream.cpp
src/Dictionaries/ODBCBlockInputStream.cpp
src/Dictionaries/ExternalQueryBuilder.cpp
@ -972,6 +973,8 @@ add_library (dbms
src/Client/Connection.cpp
src/Client/MultiplexedConnections.cpp
${MONGODB_FILES}
)
if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

2
dbms/src/Dictionaries/DictionarySourceFactory.cpp
View File

@ -127,7 +127,6 @@ DictionarySourcePtr DictionarySourceFactory::create(
{
return std::make_unique<ODBCDictionarySource>(dict_struct, config, config_prefix + ".odbc", sample_block);
}
else if ("executable" == source_type)
{
if (dict_struct.has_expressions)
@ -137,7 +136,6 @@ DictionarySourcePtr DictionarySourceFactory::create(
return std::make_unique<ExecutableDictionarySource>(dict_struct, config, config_prefix + ".executable", sample_block, context);
}
else if ("http" == source_type)
{
if (dict_struct.has_expressions)