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

Fixed linking [#CLICKHOUSE-2].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-11-20 08:22:54 +03:00
parent 087a379b7c
commit f6f77f5f0b
15 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/poco vendored

@ -1 +1 @@
Subproject commit 864a04d7b110931dff752ec6824090f4a9679347
Subproject commit 4746a846952808f220595602f67831516822dc13

1
dbms/src/DataStreams/RemoteBlockInputStream.cpp
View File

@ -1,6 +1,5 @@
#include <DataStreams/RemoteBlockInputStream.h>
#include <DataStreams/OneBlockInputStream.h>
#include <Common/VirtualColumnUtils.h>
#include <Common/NetException.h>
#include <Interpreters/Context.h>
#include <Storages/IStorage.h>

2
dbms/src/Storages/MergeTree/MergeTreeBaseBlockInputStream.cpp
View File

@ -432,7 +432,7 @@ Block MergeTreeBaseBlockInputStream::readFromPart()
if (task->size_predictor)
task->size_predictor->update(res);
reader->fillMissingColumnsAndReorder(res, task->ordered_names);
reader->fillMissingColumns(res, task->ordered_names, true);
}
}
while (!task->isFinished() && !res && !isCancelled());

2
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -41,7 +41,7 @@
#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/DataTypeDate.h>
#include <DataTypes/DataTypeEnum.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
namespace ProfileEvents

14
dbms/src/Storages/MergeTree/MergeTreeReader.cpp
View File

@ -182,18 +182,6 @@ size_t MergeTreeReader::readRows(size_t from_mark, bool continue_reading, size_t
}
void MergeTreeReader::fillMissingColumns(Block & res, const Names & ordered_names, const bool always_reorder)
{
fillMissingColumnsImpl(res, ordered_names, always_reorder);
}
void MergeTreeReader::fillMissingColumnsAndReorder(Block & res, const Names & ordered_names)
{
fillMissingColumnsImpl(res, ordered_names, true);
}
MergeTreeReader::Stream::Stream(
const String & path_prefix_, const String & extension_, size_t marks_count_,
const MarkRanges & all_mark_ranges,
@ -527,7 +515,7 @@ void MergeTreeReader::readData(
}
void MergeTreeReader::fillMissingColumnsImpl(Block & res, const Names & ordered_names, bool always_reorder)
void MergeTreeReader::fillMissingColumns(Block & res, const Names & ordered_names, bool always_reorder)
{
if (!res)
throw Exception("Empty block passed to fillMissingColumnsImpl", ErrorCodes::LOGICAL_ERROR);

6
dbms/src/Storages/MergeTree/MergeTreeReader.h
View File

@ -46,10 +46,6 @@ public:
/// If at least one column was added, reorders all columns in the block according to ordered_names.
void fillMissingColumns(Block & res, const Names & ordered_names, const bool always_reorder = false);
/// The same as fillMissingColumns(), but always reorders columns according to ordered_names
/// (even if no columns were added).
void fillMissingColumnsAndReorder(Block & res, const Names & ordered_names);
private:
class Stream
{
@ -124,8 +120,6 @@ private:
size_t from_mark, bool continue_reading, size_t max_rows_to_read,
size_t level = 0, bool read_offsets = true);
void fillMissingColumnsImpl(Block & res, const Names & ordered_names, bool always_reorder);
/// Return the number of rows has been read or zero if there is no columns to read.
/// If continue_reading is true, continue reading from last state, otherwise seek to from_mark
size_t readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Block & res);

2
dbms/src/Storages/StorageMerge.cpp
View File

@ -3,7 +3,7 @@
#include <DataStreams/LazyBlockInputStream.h>
#include <DataStreams/NullBlockInputStream.h>
#include <Storages/StorageMerge.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
#include <Interpreters/InterpreterAlterQuery.h>
#include <Interpreters/ExpressionActions.h>
#include <Storages/VirtualColumnFactory.h>

2
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -29,7 +29,7 @@
#include <DataStreams/copyData.h>
#include <Common/Macros.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
#include <Common/formatReadable.h>
#include <Common/setThreadName.h>
#include <Common/escapeForFileName.h>

2
dbms/src/Storages/System/StorageSystemColumns.cpp
View File

@ -7,7 +7,7 @@
#include <DataTypes/DataTypeString.h>
#include <DataTypes/DataTypesNumber.h>
#include <DataStreams/OneBlockInputStream.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
#include <Parsers/queryToString.h>
#include <Databases/IDatabase.h>

2
dbms/src/Storages/System/StorageSystemParts.cpp
View File

@ -8,7 +8,7 @@
#include <Storages/System/StorageSystemParts.h>
#include <Storages/StorageMergeTree.h>
#include <Storages/StorageReplicatedMergeTree.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
#include <Databases/IDatabase.h>
namespace DB

2
dbms/src/Storages/System/StorageSystemReplicas.cpp
View File

@ -5,7 +5,7 @@
#include <DataStreams/OneBlockInputStream.h>
#include <Storages/System/StorageSystemReplicas.h>
#include <Storages/StorageReplicatedMergeTree.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
#include <Common/typeid_cast.h>
#include <Databases/IDatabase.h>

2
dbms/src/Storages/System/StorageSystemReplicationQueue.cpp
View File

@ -8,7 +8,7 @@
#include <DataStreams/OneBlockInputStream.h>
#include <Storages/System/StorageSystemReplicationQueue.h>
#include <Storages/StorageReplicatedMergeTree.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
#include <Common/typeid_cast.h>
#include <Databases/IDatabase.h>

2
dbms/src/Storages/System/StorageSystemTables.cpp
View File

@ -4,7 +4,7 @@
#include <DataTypes/DataTypeDateTime.h>
#include <DataStreams/OneBlockInputStream.h>
#include <Storages/System/StorageSystemTables.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
#include <Databases/IDatabase.h>
#include <Interpreters/Context.h>

2
dbms/src/Common/VirtualColumnUtils.cpp → dbms/src/Storages/VirtualColumnUtils.cpp
View File

@ -13,7 +13,7 @@
#include <Columns/ColumnsNumber.h>
#include <Columns/ColumnsCommon.h>
#include <Common/VirtualColumnUtils.h>
#include <Storages/VirtualColumnUtils.h>
#include <Common/typeid_cast.h>

0
dbms/src/Common/VirtualColumnUtils.h → dbms/src/Storages/VirtualColumnUtils.h
View File