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

Fixing NameOrDefault mode in ConvertingBlockInputStream.

Browse Source
This commit is contained in:
Vitaliy Zakaznikov 2020-01-23 12:40:27 +01:00
parent 76af9dedc5
commit 024dce32d8
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbms/src/DataStreams/ConvertingBlockInputStream.cpp
View File

@ -1,4 +1,5 @@
#include <DataStreams/ConvertingBlockInputStream.h>
#include <Interpreters/addMissingDefaults.h>
#include <Interpreters/castColumn.h>
#include <Columns/ColumnConst.h>
#include <Common/assert_cast.h>
@ -34,8 +35,9 @@ ConvertingBlockInputStream::ConvertingBlockInputStream(
const Context & context_,
const BlockInputStreamPtr & input,
const Block & result_header,
MatchColumnsMode mode)
: context(context_), header(result_header), conversion(header.columns())
MatchColumnsMode mode,
const ColumnDefaults & column_defaults_)
: context(context_), header(result_header), column_defaults(column_defaults_), conversion(header.columns())
{
children.emplace_back(input);
@ -128,9 +130,12 @@ Block ConvertingBlockInputStream::readImpl()
res_elem.column = std::move(converted);
}
// erase any columns that need to be set to default value or expression
// replace missing columns with default value or expression if any
if (!default_columns.empty())
{
res.erase(default_columns);
res = addMissingDefaults(res, header.getNamesAndTypesList(), column_defaults, context);
}
return res;
}

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

@ -2,6 +2,7 @@
#include <unordered_map>
#include <DataStreams/IBlockInputStream.h>
#include <Storages/ColumnDefault.h>
namespace DB
@ -37,7 +38,8 @@ public:
const Context & context,
const BlockInputStreamPtr & input,
const Block & result_header,
MatchColumnsMode mode);
MatchColumnsMode mode,
const ColumnDefaults & column_defaults = {});
String getName() const override { return "Converting"; }
Block getHeader() const override { return header; }
@ -47,6 +49,8 @@ private:
const Context & context;
Block header;
/// Only used in NameOrDefault mode
const ColumnDefaults column_defaults;
/// How to construct result block. Position in source block, where to get each column.
using Conversion = std::vector<size_t>;

11
dbms/src/DataStreams/PushingToViewsBlockOutputStream.cpp
View File

@ -230,7 +230,16 @@ void PushingToViewsBlockOutputStream::process(const Block & block, size_t view_n
/// and two-level aggregation is triggered).
in = std::make_shared<SquashingBlockInputStream>(
in, context.getSettingsRef().min_insert_block_size_rows, context.getSettingsRef().min_insert_block_size_bytes);
in = std::make_shared<ConvertingBlockInputStream>(context, in, view.out->getHeader(), ConvertingBlockInputStream::MatchColumnsMode::NameOrDefault);
auto view_table = context.getTable(view.table_id);
if (auto * materialized_view = dynamic_cast<const StorageMaterializedView *>(view_table.get()))
{
StoragePtr inner_table = materialized_view->getTargetTable();
in = std::make_shared<ConvertingBlockInputStream>(context, in, view.out->getHeader(), ConvertingBlockInputStream::MatchColumnsMode::NameOrDefault, inner_table->getColumns().getDefaults());
}
else
in = std::make_shared<ConvertingBlockInputStream>(context, in, view.out->getHeader(), ConvertingBlockInputStream::MatchColumnsMode::Name);
}
else
in = std::make_shared<OneBlockInputStream>(block);

1
dbms/tests/queries/0_stateless/01023_materialized_view_query_context.sql
View File

@ -1,5 +1,6 @@
-- Create dictionary, since dictGet*() uses DB::Context in executeImpl()
-- (To cover scope of the Context in DB::PushingToViewsBlockOutputStream::process)
DROP TABLE IF EXISTS mv;
DROP DATABASE IF EXISTS dict_in_01023;
CREATE DATABASE dict_in_01023;