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

Style [#METR-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-01-06 20:35:01 +03:00
parent 26bf3e1228
commit c567d4e1fe
38 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/include/DB/AggregateFunctions/AggregateFunctionQuantile.h
View File

@ -64,7 +64,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
level = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
level = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
}
@ -141,7 +141,7 @@ public:
levels.resize(size);
for (size_t i = 0; i < size; ++i)
levels[i] = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[i]);
levels[i] = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[i]);
}

4
dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileDeterministic.h
View File

@ -70,7 +70,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
level = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
level = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
}
@ -154,7 +154,7 @@ public:
levels.resize(size);
for (size_t i = 0; i < size; ++i)
levels[i] = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[i]);
levels[i] = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[i]);
}

2
dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExact.h
View File

@ -65,7 +65,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
level = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
level = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
}
void addImpl(AggregateDataPtr place, const IColumn & column, size_t row_num, Arena *) const

2
dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h
View File

@ -71,7 +71,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
level = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
level = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
}
void addImpl(AggregateDataPtr place, const IColumn & column_value, const IColumn & column_weight, size_t row_num, Arena *) const

4
dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h
View File

@ -379,7 +379,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
level = apply_visitor(FieldVisitorConvertToNumber<Float32>(), params[0]);
level = applyVisitor(FieldVisitorConvertToNumber<Float32>(), params[0]);
}
void addImpl(AggregateDataPtr place, const IColumn & column, size_t row_num, Arena *) const
@ -446,7 +446,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
level = apply_visitor(FieldVisitorConvertToNumber<Float32>(), params[0]);
level = applyVisitor(FieldVisitorConvertToNumber<Float32>(), params[0]);
}
void addImpl(AggregateDataPtr place, const IColumn & column_value, const IColumn & column_weight, size_t row_num, Arena *) const

4
dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h
View File

@ -811,7 +811,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
level = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
level = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
}
@ -870,7 +870,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
level = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
level = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
}
void addImpl(AggregateDataPtr place, const IColumn & column_value, const IColumn & column_weight, size_t row_num, Arena *) const

4
dbms/include/DB/AggregateFunctions/AggregateFunctionUniqUpTo.h
View File

@ -142,7 +142,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
UInt64 threshold_param = apply_visitor(FieldVisitorConvertToNumber<UInt64>(), params[0]);
UInt64 threshold_param = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), params[0]);
if (threshold_param > uniq_upto_max_threshold)
throw Exception("Too large parameter for aggregate function " + getName() + ". Maximum: " + toString(uniq_upto_max_threshold),
@ -215,7 +215,7 @@ public:
if (params.size() != 1)
throw Exception("Aggregate function " + getName() + " requires exactly one parameter.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
UInt64 threshold_param = apply_visitor(FieldVisitorConvertToNumber<UInt64>(), params[0]);
UInt64 threshold_param = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), params[0]);
if (threshold_param > uniq_upto_max_threshold)
throw Exception("Too large parameter for aggregate function " + getName() + ". Maximum: " + toString(uniq_upto_max_threshold),

2
dbms/include/DB/AggregateFunctions/QuantilesCommon.h
View File

@ -40,7 +40,7 @@ struct QuantileLevels
for (size_t i = 0; i < size; ++i)
{
levels[i] = apply_visitor(FieldVisitorConvertToNumber<Float64>(), params[i]);
levels[i] = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[i]);
permutation[i] = i;
}

22
dbms/include/DB/Core/FieldVisitors.h
View File

@ -16,7 +16,7 @@ namespace ErrorCodes
/** StaticVisitor (and its descendants) - class with overloaded operator() for all types of fields.
* You could call visitor for field using function 'apply_visitor'.
* You could call visitor for field using function 'applyVisitor'.
* Also "binary visitor" is supported - its operator() takes two arguments.
*/
template <typename R = void>
@ -28,7 +28,7 @@ struct StaticVisitor
/// F is template parameter, to allow universal reference for field, that is useful for const and non-const values.
template <typename Visitor, typename F>
typename std::decay<Visitor>::type::ResultType apply_visitor(Visitor && visitor, F && field)
typename std::decay<Visitor>::type::ResultType applyVisitor(Visitor && visitor, F && field)
{
switch (field.getType())
{
@ -47,7 +47,7 @@ typename std::decay<Visitor>::type::ResultType apply_visitor(Visitor && visitor,
template <typename Visitor, typename F1, typename F2>
static typename std::decay<Visitor>::type::ResultType apply_binary_visitor_impl(Visitor && visitor, F1 && field1, F2 && field2)
static typename std::decay<Visitor>::type::ResultType applyBinaryVisitorImpl(Visitor && visitor, F1 && field1, F2 && field2)
{
switch (field2.getType())
{
@ -65,30 +65,30 @@ static typename std::decay<Visitor>::type::ResultType apply_binary_visitor_impl(
}
template <typename Visitor, typename F1, typename F2>
typename std::decay<Visitor>::type::ResultType apply_visitor(Visitor && visitor, F1 && field1, F2 && field2)
typename std::decay<Visitor>::type::ResultType applyVisitor(Visitor && visitor, F1 && field1, F2 && field2)
{
switch (field1.getType())
{
case Field::Types::Null:
return apply_binary_visitor_impl(
return applyBinaryVisitorImpl(
std::forward<Visitor>(visitor), field1.template get<Null>(), std::forward<F2>(field2));
case Field::Types::UInt64:
return apply_binary_visitor_impl(
return applyBinaryVisitorImpl(
std::forward<Visitor>(visitor), field1.template get<UInt64>(), std::forward<F2>(field2));
case Field::Types::Int64:
return apply_binary_visitor_impl(
return applyBinaryVisitorImpl(
std::forward<Visitor>(visitor), field1.template get<Int64>(), std::forward<F2>(field2));
case Field::Types::Float64:
return apply_binary_visitor_impl(
return applyBinaryVisitorImpl(
std::forward<Visitor>(visitor), field1.template get<Float64>(), std::forward<F2>(field2));
case Field::Types::String:
return apply_binary_visitor_impl(
return applyBinaryVisitorImpl(
std::forward<Visitor>(visitor), field1.template get<String>(), std::forward<F2>(field2));
case Field::Types::Array:
return apply_binary_visitor_impl(
return applyBinaryVisitorImpl(
std::forward<Visitor>(visitor), field1.template get<Array>(), std::forward<F2>(field2));
case Field::Types::Tuple:
return apply_binary_visitor_impl(
return applyBinaryVisitorImpl(
std::forward<Visitor>(visitor), field1.template get<Tuple>(), std::forward<F2>(field2));
default:

4
dbms/include/DB/Functions/FunctionsArithmetic.h
View File

@ -886,8 +886,8 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameAbs>
static bool has() { return true; }
static IFunction::Monotonicity get(const Field & left, const Field & right)
{
Float64 left_float = left.isNull() ? -std::numeric_limits<Float64>::infinity() : apply_visitor(FieldVisitorConvertToNumber<Float64>(), left);
Float64 right_float = right.isNull() ? std::numeric_limits<Float64>::infinity() : apply_visitor(FieldVisitorConvertToNumber<Float64>(), right);
Float64 left_float = left.isNull() ? -std::numeric_limits<Float64>::infinity() : applyVisitor(FieldVisitorConvertToNumber<Float64>(), left);
Float64 right_float = right.isNull() ? std::numeric_limits<Float64>::infinity() : applyVisitor(FieldVisitorConvertToNumber<Float64>(), right);
if ((left_float < 0 && right_float > 0) || (left_float > 0 && right_float < 0))
return {};

4
dbms/include/DB/Functions/FunctionsArray.h
View File

@ -897,7 +897,7 @@ private:
for (size_t i = 0, size = arr.size(); i < size; ++i)
{
if (apply_visitor(FieldVisitorAccurateEquals(), arr[i], value))
if (applyVisitor(FieldVisitorAccurateEquals(), arr[i], value))
{
if (!IndexConv::apply(i, current))
break;
@ -940,7 +940,7 @@ private:
if (null_map && ((*null_map)[row] == 1))
hit = true;
}
else if (apply_visitor(FieldVisitorAccurateEquals(), arr[i], value))
else if (applyVisitor(FieldVisitorAccurateEquals(), arr[i], value))
hit = true;
if (hit)

2
dbms/include/DB/Functions/FunctionsMiscellaneous.h
View File

@ -959,7 +959,7 @@ private:
if (!column.isConst())
throw Exception(which_argument + String(" argument for function ") + getName() + " must be constant.", ErrorCodes::ILLEGAL_COLUMN);
return apply_visitor(FieldVisitorConvertToNumber<T>(), column[0]);
return applyVisitor(FieldVisitorConvertToNumber<T>(), column[0]);
}
template <typename T>

4
dbms/include/DB/Functions/FunctionsTransform.h
View File

@ -781,13 +781,13 @@ private:
{
converted_to.resize(to.size());
for (size_t i = 0, size = to.size(); i < size; ++i)
converted_to[i] = apply_visitor(FieldVisitorConvertToNumber<Float64>(), to[i]);
converted_to[i] = applyVisitor(FieldVisitorConvertToNumber<Float64>(), to[i]);
used_to = &converted_to;
}
else if (!default_col_is_float && to_is_float)
{
if (const_default_col)
const_default_value = apply_visitor(FieldVisitorConvertToNumber<Float64>(), const_default_value);
const_default_value = applyVisitor(FieldVisitorConvertToNumber<Float64>(), const_default_value);
}
}

2
dbms/include/DB/Parsers/ASTEnumElement.h
View File

@ -30,7 +30,7 @@ protected:
frame.need_parens = false;
const std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
settings.ostr << settings.nl_or_ws << indent_str << '\'' << name << "' = " << apply_visitor(FieldVisitorToString{}, value);
settings.ostr << settings.nl_or_ws << indent_str << '\'' << name << "' = " << applyVisitor(FieldVisitorToString{}, value);
}
};

4
dbms/include/DB/Parsers/ASTLiteral.h
View File

@ -21,14 +21,14 @@ public:
String getColumnName() const override;
/** Получить текст, который идентифицирует этот элемент. */
String getID() const override { return "Literal_" + apply_visitor(FieldVisitorDump(), value); }
String getID() const override { return "Literal_" + applyVisitor(FieldVisitorDump(), value); }
ASTPtr clone() const override { return std::make_shared<ASTLiteral>(*this); }
protected:
void formatImplWithoutAlias(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override
{
settings.ostr << apply_visitor(FieldVisitorToString(), value);
settings.ostr << applyVisitor(FieldVisitorToString(), value);
}
};

2
dbms/include/DB/Parsers/ASTSetQuery.h
View File

@ -43,7 +43,7 @@ protected:
if (it != changes.begin())
settings.ostr << ", ";
settings.ostr << it->name << " = " << apply_visitor(FieldVisitorToString(), it->value);
settings.ostr << it->name << " = " << applyVisitor(FieldVisitorToString(), it->value);
}
}
};

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

@ -190,12 +190,12 @@ public:
if (!left_bounded)
str << "(-inf, ";
else
str << (left_included ? '[' : '(') << apply_visitor(FieldVisitorToString(), left) << ", ";
str << (left_included ? '[' : '(') << applyVisitor(FieldVisitorToString(), left) << ", ";
if (!right_bounded)
str << "+inf)";
else
str << apply_visitor(FieldVisitorToString(), right) << (right_included ? ']' : ')');
str << applyVisitor(FieldVisitorToString(), right) << (right_included ? ']' : ')');
return str.str();
}

4
dbms/src/Analyzers/TypeAndConstantInference.cpp
View File

@ -56,7 +56,7 @@ static void processLiteral(const String & column_name, const ASTPtr & ast, TypeA
expression_info.node = ast;
expression_info.is_constant_expression = true;
expression_info.value = literal->value;
expression_info.data_type = apply_visitor(FieldToDataType(), expression_info.value);
expression_info.data_type = applyVisitor(FieldToDataType(), expression_info.value);
info.emplace(column_name, std::move(expression_info));
}
@ -368,7 +368,7 @@ void TypeAndConstantInference::dump(WriteBuffer & out) const
if (it->second.is_constant_expression)
{
writeCString(" = ", out);
String value = apply_visitor(FieldVisitorToString(), it->second.value);
String value = applyVisitor(FieldVisitorToString(), it->second.value);
writeString(value, out);
}

8
dbms/src/Core/Field.cpp
View File

@ -14,7 +14,7 @@ namespace mysqlxx
{
std::ostream & operator<< (mysqlxx::EscapeManipResult res, const DB::Array & value)
{
return res.ostr << DB::apply_visitor(DB::FieldVisitorToString(), DB::Field(value));
return res.ostr << DB::applyVisitor(DB::FieldVisitorToString(), DB::Field(value));
}
std::ostream & operator<< (mysqlxx::QuoteManipResult res, const DB::Array & value)
@ -35,7 +35,7 @@ namespace mysqlxx
std::ostream & operator<< (mysqlxx::EscapeManipResult res, const DB::Tuple & value)
{
return res.ostr << DB::apply_visitor(DB::FieldVisitorToString(), DB::Field(value));
return res.ostr << DB::applyVisitor(DB::FieldVisitorToString(), DB::Field(value));
}
std::ostream & operator<< (mysqlxx::QuoteManipResult res, const DB::Tuple & value)
@ -169,7 +169,7 @@ namespace DB
void writeText(const Array & x, WriteBuffer & buf)
{
DB::String res = apply_visitor(DB::FieldVisitorToString(), DB::Field(x));
DB::String res = applyVisitor(DB::FieldVisitorToString(), DB::Field(x));
buf.write(res.data(), res.size());
}
}
@ -291,7 +291,7 @@ namespace DB
void writeText(const Tuple & x, WriteBuffer & buf)
{
DB::String res = apply_visitor(DB::FieldVisitorToString(), DB::Field(x));
DB::String res = applyVisitor(DB::FieldVisitorToString(), DB::Field(x));
buf.write(res.data(), res.size());
}
}

10
dbms/src/Core/FieldVisitors.cpp
View File

@ -56,7 +56,7 @@ String FieldVisitorDump::operator() (const Array & x) const
{
if (it != x.begin())
wb.write(", ", 2);
writeString(apply_visitor(*this, *it), wb);
writeString(applyVisitor(*this, *it), wb);
}
writeChar(']', wb);
@ -74,7 +74,7 @@ String FieldVisitorDump::operator() (const Tuple & x_def) const
{
if (it != x.begin())
wb.write(", ", 2);
writeString(apply_visitor(*this, *it), wb);
writeString(applyVisitor(*this, *it), wb);
}
writeChar(')', wb);
@ -121,7 +121,7 @@ String FieldVisitorToString::operator() (const Array & x) const
{
if (it != x.begin())
wb.write(", ", 2);
writeString(apply_visitor(*this, *it), wb);
writeString(applyVisitor(*this, *it), wb);
}
writeChar(']', wb);
@ -139,7 +139,7 @@ String FieldVisitorToString::operator() (const Tuple & x_def) const
{
if (it != x.begin())
wb.write(", ", 2);
writeString(apply_visitor(*this, *it), wb);
writeString(applyVisitor(*this, *it), wb);
}
writeChar(')', wb);
@ -193,7 +193,7 @@ void FieldVisitorHash::operator() (const Array & x) const
hash.update(reinterpret_cast<const char *>(&size), sizeof(size));
for (const auto & elem : x)
apply_visitor(*this, elem);
applyVisitor(*this, elem);
}

12
dbms/src/Core/tests/field.cpp
View File

@ -19,27 +19,27 @@ int main(int argc, char ** argv)
FieldVisitorToString to_string;
Field field = UInt64(0);
std::cerr << apply_visitor(to_string, field) << std::endl;
std::cerr << applyVisitor(to_string, field) << std::endl;
field = std::string("Hello, world!");
std::cerr << apply_visitor(to_string, field) << std::endl;
std::cerr << applyVisitor(to_string, field) << std::endl;
field = Null();
std::cerr << apply_visitor(to_string, field) << std::endl;
std::cerr << applyVisitor(to_string, field) << std::endl;
Field field2;
field2 = field;
std::cerr << apply_visitor(to_string, field2) << std::endl;
std::cerr << applyVisitor(to_string, field2) << std::endl;
Array array;
array.push_back(UInt64(123));
array.push_back(Int64(-123));
array.push_back(String("Hello"));
field = array;
std::cerr << apply_visitor(to_string, field) << std::endl;
std::cerr << applyVisitor(to_string, field) << std::endl;
get<Array &>(field).push_back(field);
std::cerr << apply_visitor(to_string, field) << std::endl;
std::cerr << applyVisitor(to_string, field) << std::endl;
std::cerr << (field < field2) << std::endl;
std::cerr << (field2 < field) << std::endl;

2
dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp
View File

@ -26,7 +26,7 @@ void CollapsingSortedBlockInputStream::reportIncorrectData()
{
if (i != 0)
s << ", ";
s << apply_visitor(FieldVisitorToString(), (*current_key.columns[i])[current_key.row_num]);
s << applyVisitor(FieldVisitorToString(), (*current_key.columns[i])[current_key.row_num]);
}
s << ").";

4
dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
View File

@ -316,7 +316,7 @@ bool SummingSortedBlockInputStream::mergeMap(const MapDescription & desc, Row &
bool has_non_zero = false;
size_t size = dst.size();
for (size_t i = 0; i < size; ++i)
if (apply_visitor(FieldVisitorSum(src[i]), dst[i]))
if (applyVisitor(FieldVisitorSum(src[i]), dst[i]))
has_non_zero = true;
return has_non_zero;
};
@ -373,7 +373,7 @@ bool SummingSortedBlockInputStream::addRow(Row & row, TSortCursor & cursor)
for (size_t i = 0, size = column_numbers_to_sum.size(); i < size; ++i)
{
size_t j = column_numbers_to_sum[i];
if (apply_visitor(FieldVisitorSum((*cursor->all_columns[j])[cursor->pos]), row[j]))
if (applyVisitor(FieldVisitorSum((*cursor->all_columns[j])[cursor->pos]), row[j]))
res = true;
}

2
dbms/src/DataStreams/ValuesRowInputStream.cpp
View File

@ -134,7 +134,7 @@ bool ValuesRowInputStream::read(Block & block)
}
if (!is_null_allowed)
throw Exception{"Expression returns value " + apply_visitor(FieldVisitorToString(), value)
throw Exception{"Expression returns value " + applyVisitor(FieldVisitorToString(), value)
+ ", that is out of range of type " + type.getName()
+ ", at: " + String(prev_istr_position, std::min(SHOW_CHARS_ON_SYNTAX_ERROR, istr.buffer().end() - prev_istr_position)),
ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE};

2
dbms/src/DataTypes/DataTypeAggregateFunction.cpp
View File

@ -24,7 +24,7 @@ std::string DataTypeAggregateFunction::getName() const
{
if (i)
stream << ", ";
stream << apply_visitor(DB::FieldVisitorToString(), parameters[i]);
stream << applyVisitor(DB::FieldVisitorToString(), parameters[i]);
}
stream << ")";
}

2
dbms/src/DataTypes/DataTypeFactory.cpp
View File

@ -83,7 +83,7 @@ inline DataTypePtr parseEnum(const String & name, const String & base_name, cons
if (value > std::numeric_limits<FieldType>::max() || value < std::numeric_limits<FieldType>::min())
throw Exception{
"Value " + apply_visitor(FieldVisitorToString{}, e.value) + " for element '" + e.name + "' exceeds range of " + base_name,
"Value " + applyVisitor(FieldVisitorToString{}, e.value) + " for element '" + e.name + "' exceeds range of " + base_name,
ErrorCodes::ARGUMENT_OUT_OF_BOUND
};

4
dbms/src/DataTypes/FieldToDataType.cpp
View File

@ -22,7 +22,7 @@ static void convertArrayToCommonType(Array & arr)
for (auto & elem : arr)
{
if (!elem.isNull())
elem = apply_visitor(FieldVisitorConvertToNumber<T>(), elem);
elem = applyVisitor(FieldVisitorConvertToNumber<T>(), elem);
}
}
@ -217,7 +217,7 @@ DataTypePtr FieldToDataType::operator() (Tuple & x) const
element_types.reserve(ext::size(tuple));
for (auto & element : tuple)
element_types.push_back(apply_visitor(FieldToDataType{}, element));
element_types.push_back(applyVisitor(FieldToDataType{}, element));
return std::make_shared<DataTypeTuple>(element_types);
}

2
dbms/src/Dictionaries/MongoDBDictionarySource.cpp
View File

@ -230,7 +230,7 @@ BlockInputStreamPtr MongoDBDictionarySource::loadKeys(
case AttributeUnderlyingType::Float32:
case AttributeUnderlyingType::Float64:
key.add(attr.second.name, apply_visitor(FieldVisitorConvertToNumber<Float64>(), (*key_columns[attr.first])[row_idx]));
key.add(attr.second.name, applyVisitor(FieldVisitorConvertToNumber<Float64>(), (*key_columns[attr.first])[row_idx]));
break;
case AttributeUnderlyingType::String:

2
dbms/src/Functions/FunctionsArray.cpp
View File

@ -116,7 +116,7 @@ bool tryAddField(DataTypePtr type_res, const Field & f, Array & arr)
if (f.isNull())
arr.emplace_back();
else
arr.push_back(apply_visitor(FieldVisitorConvertToNumber<typename T1::FieldType>(), f));
arr.push_back(applyVisitor(FieldVisitorConvertToNumber<typename T1::FieldType>(), f));
return true;
}
return false;

2
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -1994,7 +1994,7 @@ void ExpressionAnalyzer::getActionsImpl(ASTPtr ast, bool no_subqueries, bool onl
}
else if (ASTLiteral * node = typeid_cast<ASTLiteral *>(ast.get()))
{
DataTypePtr type = apply_visitor(FieldToDataType(), node->value);
DataTypePtr type = applyVisitor(FieldToDataType(), node->value);
ColumnWithTypeAndName column;
column.column = type->createConstColumn(1, node->value);

2
dbms/src/Interpreters/Set.cpp
View File

@ -522,7 +522,7 @@ std::string Set::describe() const
ss << "{";
for (const Field & f : *ordered_set_elements)
{
ss << (first ? "" : ", ") << apply_visitor(FieldVisitorToString(), f);
ss << (first ? "" : ", ") << applyVisitor(FieldVisitorToString(), f);
first = false;
}
ss << "}";

4
dbms/src/Parsers/ASTLiteral.cpp
View File

@ -16,13 +16,13 @@ String ASTLiteral::getColumnName() const
&& value.get<const Array &>().size() > 100) /// 100 - just arbitary value.
{
SipHash hash;
apply_visitor(FieldVisitorHash(hash), value);
applyVisitor(FieldVisitorHash(hash), value);
UInt64 low, high;
hash.get128(low, high);
return "__array_" + toString(low) + "_" + toString(high);
}
return apply_visitor(FieldVisitorToString(), value);
return applyVisitor(FieldVisitorToString(), value);
}
}

2
dbms/src/Parsers/ASTSelectQuery.cpp
View File

@ -318,7 +318,7 @@ void ASTSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, F
if (it != ast_set.changes.begin())
s.ostr << ", ";
s.ostr << it->name << " = " << apply_visitor(FieldVisitorToString(), it->value);
s.ostr << it->name << " = " << applyVisitor(FieldVisitorToString(), it->value);
}
}

2
dbms/src/Parsers/ParserOptimizeQuery.cpp
View File

@ -79,7 +79,7 @@ bool ParserOptimizeQuery::parseImpl(Pos & pos, Pos end, ASTPtr & node, Pos & max
if (table)
query->table = typeid_cast<const ASTIdentifier &>(*table).name;
if (partition)
query->partition = apply_visitor(FieldVisitorToString(), typeid_cast<const ASTLiteral &>(*partition).value);
query->partition = applyVisitor(FieldVisitorToString(), typeid_cast<const ASTLiteral &>(*partition).value);
query->final = final;
return true;

12
dbms/src/Storages/MergeTree/PKCondition.cpp
View File

@ -172,8 +172,8 @@ const PKCondition::AtomMap PKCondition::atom_map{
};
inline bool Range::equals(const Field & lhs, const Field & rhs) { return apply_visitor(FieldVisitorAccurateEquals(), lhs, rhs); }
inline bool Range::less(const Field & lhs, const Field & rhs) { return apply_visitor(FieldVisitorAccurateLess(), lhs, rhs); }
inline bool Range::equals(const Field & lhs, const Field & rhs) { return applyVisitor(FieldVisitorAccurateEquals(), lhs, rhs); }
inline bool Range::less(const Field & lhs, const Field & rhs) { return applyVisitor(FieldVisitorAccurateLess(), lhs, rhs); }
Block PKCondition::getBlockWithConstants(
@ -666,13 +666,13 @@ bool PKCondition::mayBeTrueInRange(
/* std::cerr << "Checking for: [";
for (size_t i = 0; i != used_key_size; ++i)
std::cerr << (i != 0 ? ", " : "") << apply_visitor(FieldVisitorToString(), left_pk[i]);
std::cerr << (i != 0 ? ", " : "") << applyVisitor(FieldVisitorToString(), left_pk[i]);
std::cerr << " ... ";
if (right_bounded)
{
for (size_t i = 0; i != used_key_size; ++i)
std::cerr << (i != 0 ? ", " : "") << apply_visitor(FieldVisitorToString(), right_pk[i]);
std::cerr << (i != 0 ? ", " : "") << applyVisitor(FieldVisitorToString(), right_pk[i]);
std::cerr << "]\n";
}
else
@ -726,8 +726,8 @@ bool PKCondition::mayBeTrueInRangeImpl(const std::vector<Range> & key_ranges, co
/* std::cerr << "Function " << func->getName() << " is " << (monotonicity.is_monotonic ? "" : "not ")
<< "monotonic " << (monotonicity.is_monotonic ? (monotonicity.is_positive ? "(positive) " : "(negative) ") : "")
<< "in range "
<< "[" << apply_visitor(FieldVisitorToString(), key_range_transformed.left)
<< ", " << apply_visitor(FieldVisitorToString(), key_range_transformed.right) << "]\n";*/
<< "[" << applyVisitor(FieldVisitorToString(), key_range_transformed.left)
<< ", " << applyVisitor(FieldVisitorToString(), key_range_transformed.right) << "]\n";*/
if (!monotonicity.is_monotonic)
{

14
dbms/src/Storages/StorageFactory.cpp
View File

@ -498,14 +498,14 @@ StoragePtr StorageFactory::get(
String destination_database = static_cast<const ASTLiteral &>(*args[0]).value.safeGet<String>();
String destination_table = static_cast<const ASTLiteral &>(*args[1]).value.safeGet<String>();
size_t num_buckets = apply_visitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[2]).value);
size_t num_buckets = applyVisitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[2]).value);
time_t min_time = apply_visitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[3]).value);
time_t max_time = apply_visitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[4]).value);
size_t min_rows = apply_visitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[5]).value);
size_t max_rows = apply_visitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[6]).value);
size_t min_bytes = apply_visitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[7]).value);
size_t max_bytes = apply_visitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[8]).value);
time_t min_time = applyVisitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[3]).value);
time_t max_time = applyVisitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[4]).value);
size_t min_rows = applyVisitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[5]).value);
size_t max_rows = applyVisitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[6]).value);
size_t min_bytes = applyVisitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[7]).value);
size_t max_bytes = applyVisitor(FieldVisitorConvertToNumber<size_t>(), typeid_cast<ASTLiteral &>(*args[8]).value);
return StorageBuffer::create(
table_name, columns,

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

@ -402,7 +402,7 @@ void StorageMergeTree::dropPartition(ASTPtr query, const Field & partition, bool
data.replaceParts({part}, {}, false);
}
LOG_INFO(log, (detach ? "Detached " : "Removed ") << removed_parts << " parts inside " << apply_visitor(FieldVisitorToString(), partition) << ".");
LOG_INFO(log, (detach ? "Detached " : "Removed ") << removed_parts << " parts inside " << applyVisitor(FieldVisitorToString(), partition) << ".");
}

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

@ -2574,7 +2574,7 @@ void StorageReplicatedMergeTree::dropUnreplicatedPartition(const Field & partiti
unreplicated_data->replaceParts({part}, {}, false);
}
LOG_INFO(log, (detach ? "Detached " : "Removed ") << removed_parts << " unreplicated parts inside " << apply_visitor(FieldVisitorToString(), partition) << ".");
LOG_INFO(log, (detach ? "Detached " : "Removed ") << removed_parts << " unreplicated parts inside " << applyVisitor(FieldVisitorToString(), partition) << ".");
}