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

Cosmetics: variable naming

Browse Source
This commit is contained in:
Robert Schulze 2024-08-09 13:47:39 +00:00
parent 1bf320a1a8
commit e20eff635e
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.cpp
View File

@ -251,7 +251,7 @@ void ApproximateNearestNeighborCondition::traverseOrderByAST(const ASTPtr & node
}
/// Returns true and stores ANNExpr if the query has valid ORDERBY clause
bool ApproximateNearestNeighborCondition::matchRPNOrderBy(RPN & rpn, ApproximateNearestNeighborInformation & ann_info)
bool ApproximateNearestNeighborCondition::matchRPNOrderBy(RPN & rpn, ApproximateNearestNeighborInformation & info)
{
/// ORDER BY clause must have at least 3 expressions
if (rpn.size() < 3)
@ -266,13 +266,13 @@ bool ApproximateNearestNeighborCondition::matchRPNOrderBy(RPN & rpn, Approximate
if (iter->function != RPNElement::FUNCTION_DISTANCE)
return false;
ann_info.distance_function = stringToDistanceFunction(iter->func_name);
info.distance_function = stringToDistanceFunction(iter->func_name);
++iter;
if (iter->function == RPNElement::FUNCTION_IDENTIFIER)
{
identifier_found = true;
ann_info.column_name = std::move(iter->identifier.value());
info.column_name = std::move(iter->identifier.value());
++iter;
}
@ -281,7 +281,7 @@ bool ApproximateNearestNeighborCondition::matchRPNOrderBy(RPN & rpn, Approximate
if (iter->function == RPNElement::FUNCTION_LITERAL_ARRAY)
{
extractReferenceVectorFromLiteral(ann_info.reference_vector, iter->array_literal);
extractReferenceVectorFromLiteral(info.reference_vector, iter->array_literal);
++iter;
}
@ -296,7 +296,7 @@ bool ApproximateNearestNeighborCondition::matchRPNOrderBy(RPN & rpn, Approximate
++iter;
if (iter->function == RPNElement::FUNCTION_LITERAL_ARRAY)
{
extractReferenceVectorFromLiteral(ann_info.reference_vector, iter->array_literal);
extractReferenceVectorFromLiteral(info.reference_vector, iter->array_literal);
++iter;
}
else
@ -307,12 +307,12 @@ bool ApproximateNearestNeighborCondition::matchRPNOrderBy(RPN & rpn, Approximate
{
if (iter->function == RPNElement::FUNCTION_FLOAT_LITERAL ||
iter->function == RPNElement::FUNCTION_INT_LITERAL)
ann_info.reference_vector.emplace_back(getFloatOrIntLiteralOrPanic(iter));
info.reference_vector.emplace_back(getFloatOrIntLiteralOrPanic(iter));
else if (iter->function == RPNElement::FUNCTION_IDENTIFIER)
{
if (identifier_found)
return false;
ann_info.column_name = std::move(iter->identifier.value());
info.column_name = std::move(iter->identifier.value());
identifier_found = true;
}
else
@ -322,7 +322,7 @@ bool ApproximateNearestNeighborCondition::matchRPNOrderBy(RPN & rpn, Approximate
}
/// Final checks of correctness
return identifier_found && !ann_info.reference_vector.empty();
return identifier_found && !info.reference_vector.empty();
}
/// Returns true and stores Length if we have valid LIMIT clause in query

6
src/Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h
View File

@ -142,16 +142,16 @@ private:
void traverseOrderByAST(const ASTPtr & node, RPN & rpn);
/// Returns true and stores ANNExpr if the query has valid WHERE section
static bool matchRPNWhere(RPN & rpn, ApproximateNearestNeighborInformation & ann_info);
static bool matchRPNWhere(RPN & rpn, ApproximateNearestNeighborInformation & info);
/// Returns true and stores ANNExpr if the query has valid ORDERBY section
static bool matchRPNOrderBy(RPN & rpn, ApproximateNearestNeighborInformation & ann_info);
static bool matchRPNOrderBy(RPN & rpn, ApproximateNearestNeighborInformation & info);
/// Returns true and stores Length if we have valid LIMIT clause in query
static bool matchRPNLimit(RPNElement & rpn, UInt64 & limit);
/// Matches dist function, reference vector, column name
static bool matchMainParts(RPN::iterator & iter, const RPN::iterator & end, ApproximateNearestNeighborInformation & ann_info);
static bool matchMainParts(RPN::iterator & iter, const RPN::iterator & end, ApproximateNearestNeighborInformation & info);
/// Gets float or int from AST node
static float getFloatOrIntLiteralOrPanic(const RPN::iterator& iter);