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

Fixed errors in clang (part 2) [#METR-2807].

Browse Source
This commit is contained in:
Alexey Milovidov 2015-01-21 07:00:20 +03:00
parent 1be4bd0663
commit 27543ea7e5
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/DataStreams/AddingDefaultBlockInputStream.h
View File

@ -31,7 +31,7 @@ public:
}
AddingDefaultBlockInputStream(BlockInputStreamPtr input_, NamesAndTypesListPtr required_columns_, const Context & context_)
: AddingDefaultBlockInputStream{input_, required_columns, {}, context}
: AddingDefaultBlockInputStream{input_, required_columns_, ColumnDefaults{}, context_}
{
}

2
dbms/include/DB/Storages/MergeTree/MergeTreeWhereOptimizer.h
View File

@ -230,7 +230,7 @@ private:
if (!typeid_cast<const ASTIdentifier *>(left_arg) && typeid_cast<const ASTIdentifier *>(right_arg))
std::swap(left_arg, right_arg);
if (const auto identifier = typeid_cast<const ASTIdentifier *>(left_arg))
if (typeid_cast<const ASTIdentifier *>(left_arg))
{
/// condition may be "good" if only right_arg is a constant and its value is outside the threshold
if (const auto literal = typeid_cast<const ASTLiteral *>(right_arg))

4
dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
View File

@ -215,7 +215,7 @@ public:
addStream(part_path, it.name, *it.type);
}
void write(const Block & block)
void write(const Block & block) override
{
size_t rows = block.rows();
@ -333,7 +333,7 @@ public:
{
}
void write(const Block & block)
void write(const Block & block) override
{
if (!initialized)
{

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

@ -293,7 +293,7 @@ namespace DB
const auto & tmp_column = block.getByName(column_name + "_tmp");
// column not specified explicitly in the ALTER query may require default_expression modification
if (typeid(*column.type) != typeid(*tmp_column.type))
if (column.type->getName() != tmp_column.type->getName())
{
const auto it = defaults.find(column_name);
this->push_back(AlterCommand{
@ -307,7 +307,7 @@ namespace DB
const auto & tmp_column = block.getByName(column_name + "_tmp");
/// type mismatch between explicitly specified and deduced type, add conversion
if (typeid(*column.type) != typeid(*tmp_column.type))
if (column.type->getName() != tmp_column.type->getName())
{
command_ptr->default_expression = makeASTFunction(
"to" + column.type->getName(),

1
libs/libdouble-conversion/src/cached-powers.cc
View File

@ -131,7 +131,6 @@ static const CachedPower kCachedPowers[] = {
{UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340},
};
static const int kCachedPowersLength = ARRAY_SIZE(kCachedPowers);
static const int kCachedPowersOffset = 348; // -1 * the first decimal_exponent.
static const double kD_1_LOG2_10 = 0.30102999566398114; // 1 / lg(10)
// Difference between the decimal exponents in the table above.