thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yandex/ClickHouse

Browse Source
This commit is contained in:
Alexey Milovidov 2019-02-11 20:26:44 +03:00
commit 0b084ba531
5 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/CMakeLists.txt
View File

@ -102,7 +102,9 @@ add_headers_and_sources(dbms src/Interpreters/ClusterProxy)
add_headers_and_sources(dbms src/Columns)
add_headers_and_sources(dbms src/Storages)
add_headers_and_sources(dbms src/Storages/Distributed)
add_headers_and_sources(dbms src/Storages/Kafka)
if(USE_RDKAFKA)
add_headers_and_sources(dbms src/Storages/Kafka)
endif()
add_headers_and_sources(dbms src/Storages/MergeTree)
add_headers_and_sources(dbms src/Client)
add_headers_and_sources(dbms src/Formats)

4
dbms/src/Storages/Kafka/KafkaSettings.cpp
View File

@ -1,6 +1,3 @@
#include <Common/config.h>
#if USE_RDKAFKA
#include <Storages/Kafka/KafkaSettings.h>
#include <Parsers/ASTCreateQuery.h>
#include <Common/Exception.h>
@ -41,4 +38,3 @@ void KafkaSettings::loadFromQuery(ASTStorage & storage_def)
}
}
#endif

3
dbms/src/Storages/Kafka/KafkaSettings.h
View File

@ -1,6 +1,4 @@
#pragma once
#include <Common/config.h>
#if USE_RDKAFKA
#include <Poco/Util/AbstractConfiguration.h>
#include <Core/Defines.h>
@ -42,4 +40,3 @@ public:
};
}
#endif

4
dbms/src/Storages/Kafka/StorageKafka.cpp
View File

@ -1,7 +1,5 @@
#include <Storages/Kafka/StorageKafka.h>
#if USE_RDKAFKA
#include <DataStreams/IBlockInputStream.h>
#include <DataStreams/LimitBlockInputStream.h>
#include <DataStreams/UnionBlockInputStream.h>
@ -597,5 +595,3 @@ void registerStorageKafka(StorageFactory & factory)
}
#endif

6
dbms/src/Storages/Kafka/StorageKafka.h
View File

@ -1,9 +1,5 @@
#pragma once
#include <Common/config.h>
#if USE_RDKAFKA
#include <Core/BackgroundSchedulePool.h>
#include <Core/NamesAndTypes.h>
#include <DataStreams/IBlockOutputStream.h>
@ -107,5 +103,3 @@ protected:
};
}
#endif