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

Use std::string_view to get rid of strlen

Browse Source
This commit is contained in:
ltrk2 2023-04-06 09:20:34 -07:00
parent 0a1815b9bb
commit 65e08781a6
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Parsers/ExpressionListParsers.cpp
View File

@ -125,21 +125,19 @@ bool ParserUnionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
return true; return true;
} }
static bool parseOperator(IParser::Pos & pos, const char * op, Expected & expected) static bool parseOperator(IParser::Pos & pos, const std::string_view op, Expected & expected)
{ {
if (isWordCharASCII(*op)) if (!op.empty() && isWordCharASCII(op.front()))
{ {
return ParserKeyword(op).ignore(pos, expected); return ParserKeyword(op).ignore(pos, expected);
} }
else else if (op.length() == pos->size() && 0 == memcmp(op.data(), pos->begin, pos->size()))
{ {
if (strlen(op) == pos->size() && 0 == memcmp(op, pos->begin, pos->size())) ++pos;
{ return true;
++pos;
return true;
}
return false;
} }
return false;
} }
enum class SubqueryFunctionType enum class SubqueryFunctionType
@ -781,9 +779,9 @@ protected:
struct ParserExpressionImpl struct ParserExpressionImpl
{ {
static std::vector<std::pair<const char *, Operator>> operators_table; static std::vector<std::pair<std::string_view, Operator>> operators_table;
static std::vector<std::pair<const char *, Operator>> unary_operators_table; static std::vector<std::pair<std::string_view, Operator>> unary_operators_table;
static const char * overlapping_operators_to_skip[]; static std::string_view overlapping_operators_to_skip[];
static Operator finish_between_operator; static Operator finish_between_operator;
@ -2253,7 +2251,6 @@ bool ParseTimestampOperatorExpression(IParser::Pos & pos, ASTPtr & node, Expecte
return true; return true;
} }
bool ParserExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected) bool ParserExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
{ {
auto start = std::make_unique<ExpressionLayer>(false, allow_trailing_commas); auto start = std::make_unique<ExpressionLayer>(false, allow_trailing_commas);
@ -2290,7 +2287,7 @@ bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
} }
} }
std::vector<std::pair<const char *, Operator>> ParserExpressionImpl::operators_table({ std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::operators_table({
{"->", Operator("lambda", 1, 2, OperatorType::Lambda)}, {"->", Operator("lambda", 1, 2, OperatorType::Lambda)},
{"?", Operator("", 2, 0, OperatorType::StartIf)}, {"?", Operator("", 2, 0, OperatorType::StartIf)},
{":", Operator("if", 3, 3, OperatorType::FinishIf)}, {":", Operator("if", 3, 3, OperatorType::FinishIf)},
@ -2330,17 +2327,17 @@ std::vector<std::pair<const char *, Operator>> ParserExpressionImpl::operators_t
{"IS NOT NULL", Operator("isNotNull", 13, 1, OperatorType::IsNull)}, {"IS NOT NULL", Operator("isNotNull", 13, 1, OperatorType::IsNull)},
}); });
std::vector<std::pair<const char *, Operator>> ParserExpressionImpl::unary_operators_table({ std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::unary_operators_table({
{"NOT", Operator("not", 5, 1)}, {"NOT", Operator("not", 5, 1)},
{"-", Operator("negate", 12, 1)} {"-", Operator("negate", 12, 1)}
}); });
Operator ParserExpressionImpl::finish_between_operator = Operator("", 7, 0, OperatorType::FinishBetween); Operator ParserExpressionImpl::finish_between_operator = Operator("", 7, 0, OperatorType::FinishBetween);
const char * ParserExpressionImpl::overlapping_operators_to_skip[] = std::string_view ParserExpressionImpl::overlapping_operators_to_skip[] =
{ {
"IN PARTITION", "IN PARTITION",
nullptr {}
}; };
bool ParserExpressionImpl::parse(std::unique_ptr<Layer> start, IParser::Pos & pos, ASTPtr & node, Expected & expected) bool ParserExpressionImpl::parse(std::unique_ptr<Layer> start, IParser::Pos & pos, ASTPtr & node, Expected & expected)
@ -2585,8 +2582,8 @@ Action ParserExpressionImpl::tryParseOperator(Layers & layers, IParser::Pos & po
/// ///
/// 'IN PARTITION' here is not an 'IN' operator, so we should stop parsing immediately /// 'IN PARTITION' here is not an 'IN' operator, so we should stop parsing immediately
Expected stub; Expected stub;
for (const char ** it = overlapping_operators_to_skip; *it; ++it) for (const auto & it : overlapping_operators_to_skip)
if (ParserKeyword{*it}.checkWithoutMoving(pos, stub)) if (ParserKeyword{it}.checkWithoutMoving(pos, stub))
return Action::NONE; return Action::NONE;
/// Try to find operators from 'operators_table' /// Try to find operators from 'operators_table'