thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 09:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve class name conflict

Browse Source
This commit is contained in:
chertus 2018-12-05 15:27:21 +03:00
parent 3db00b7b98
commit 1a7313eaa0
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/DataStreams/AddingDefaultBlockInputStream.cpp → dbms/src/DataStreams/AddingMissedBlockInputStream.cpp
View File

@ -1,11 +1,11 @@
#include <DataStreams/AddingDefaultBlockInputStream.h>
#include <DataStreams/AddingMissedBlockInputStream.h>
#include <Interpreters/addMissingDefaults.h>
namespace DB
{
AddingDefaultBlockInputStream::AddingDefaultBlockInputStream(
AddingMissedBlockInputStream::AddingMissedBlockInputStream(
const BlockInputStreamPtr & input_,
const Block & header_,
const ColumnDefaults & column_defaults_,
@ -16,7 +16,7 @@ AddingDefaultBlockInputStream::AddingDefaultBlockInputStream(
children.emplace_back(input);
}
Block AddingDefaultBlockInputStream::readImpl()
Block AddingMissedBlockInputStream::readImpl()
{
Block src = children.back()->read();
if (!src)

4
dbms/src/DataStreams/AddingDefaultBlockInputStream.h → dbms/src/DataStreams/AddingMissedBlockInputStream.h
View File

@ -14,10 +14,10 @@ namespace DB
* 3. Columns that materialized from other columns (materialized columns)
* All three types of columns are materialized (not constants).
*/
class AddingDefaultBlockInputStream : public IProfilingBlockInputStream
class AddingMissedBlockInputStream : public IProfilingBlockInputStream
{
public:
AddingDefaultBlockInputStream(
AddingMissedBlockInputStream(
const BlockInputStreamPtr & input_,
const Block & header_,
const ColumnDefaults & column_defaults_,

6
dbms/src/DataStreams/IBlockInputStream.h
View File

@ -63,6 +63,12 @@ public:
*/
virtual Block read() = 0;
virtual const BlockMissingValues & getMissingValues() const
{
static const BlockMissingValues none;
return none;
}
/** Read something before starting all data or after the end of all data.
* In the `readSuffix` function, you can implement a finalization that can lead to an exception.
* readPrefix() must be called before the first call to read().

4
dbms/src/Storages/StorageBuffer.cpp
View File

@ -4,7 +4,7 @@
#include <Interpreters/InterpreterAlterQuery.h>
#include <Interpreters/castColumn.h>
#include <Interpreters/evaluateConstantExpression.h>
#include <DataStreams/AddingDefaultBlockInputStream.h>
#include <DataStreams/AddingMissedBlockInputStream.h>
#include <DataStreams/ConvertingBlockInputStream.h>
#include <DataStreams/IProfilingBlockInputStream.h>
#include <Databases/IDatabase.h>
@ -198,7 +198,7 @@ BlockInputStreams StorageBuffer::read(
streams_from_dst = destination->read(columns_intersection, query_info, context, processed_stage, max_block_size, num_streams);
for (auto & stream : streams_from_dst)
{
stream = std::make_shared<AddingDefaultBlockInputStream>(
stream = std::make_shared<AddingMissedBlockInputStream>(
stream, header_after_adding_defaults, getColumns().defaults, context);
stream = std::make_shared<ConvertingBlockInputStream>(
context, stream, header, ConvertingBlockInputStream::MatchColumnsMode::Name);