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

Using lexer: better error messages [#CLICKHOUSE-2].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-13 07:51:44 +03:00 committed by alexey-milovidov
parent 96468884f3
commit 47d9083c08
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Parsers/TokenIterator.h
View File

@ -67,6 +67,7 @@ public:
TokenIterator & operator--() { --index; return *this; }
bool operator< (const TokenIterator & rhs) const { return index < rhs.index; }
bool operator<= (const TokenIterator & rhs) const { return index <= rhs.index; }
bool operator== (const TokenIterator & rhs) const { return index == rhs.index; }
bool isValid() { return get().type < TokenType::EndOfStream; }
@ -78,6 +79,6 @@ public:
/// Returns positions of unmatched parentheses.
using UnmatchedParentheses = std::vector<const char *>;
UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, TokenIterator end);
UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token * last);
}

43
dbms/src/Parsers/parseQuery.cpp
View File

@ -82,7 +82,7 @@ void writeQueryWithHighlightedErrorPositions(
out << "\033[41;1m";
out.write(current_position_to_hilite, bytes_to_hilite);
out << "\033[0m";
pos += bytes_to_hilite;
pos = current_position_to_hilite + bytes_to_hilite;
}
out.write(pos, end - pos);
}
@ -234,33 +234,35 @@ ASTPtr tryParseQuery(
ASTPtr res;
bool parse_res = parser.parse(token_iterator, res, expected);
const char * max_parsed_pos = token_iterator.max().begin;
Token last_token = token_iterator.max();
const char * max_parsed_pos = last_token.begin;
/// Lexical error
if (!parse_res && token_iterator->isError())
{
out_error_message = getLexicalErrorMessage(begin, end, max_parsed_pos, getErrorTokenDescription(token_iterator->type), hilite, query_description);
return nullptr;
}
/// Unmatched parentheses
if (!parse_res)
{
UnmatchedParentheses unmatched_parens = checkUnmatchedParentheses(TokenIterator(tokens), token_iterator);
/// Lexical error
if (last_token.isError())
{
out_error_message = getLexicalErrorMessage(begin, end, max_parsed_pos, getErrorTokenDescription(last_token.type), hilite, query_description);
return nullptr;
}
/// Unmatched parentheses
UnmatchedParentheses unmatched_parens = checkUnmatchedParentheses(TokenIterator(tokens), &last_token);
if (!unmatched_parens.empty())
{
out_error_message = getUnmatchedParenthesesErrorMessage(begin, end, unmatched_parens, hilite, query_description);
return nullptr;
}
/// Parse error.
out_error_message = getSyntaxErrorMessage(begin, end, max_parsed_pos, expected, hilite, query_description);
return nullptr;
}
/// Excessive input after query. Parsed query must end with end of data or semicolon or data for INSERT.
ASTInsertQuery * insert = nullptr;
if (parse_res)
insert = typeid_cast<ASTInsertQuery *>(res.get());
ASTInsertQuery * insert = typeid_cast<ASTInsertQuery *>(res.get());
if (parse_res
&& !token_iterator->isEnd()
if (!token_iterator->isEnd()
&& token_iterator->type != TokenType::Semicolon
&& !(insert && insert->data))
{
@ -273,7 +275,7 @@ ASTPtr tryParseQuery(
++token_iterator;
/// If multi-statements are not allowed, then after semicolon, there must be no non-space characters.
if (parse_res && !allow_multi_statements
if (!allow_multi_statements
&& !token_iterator->isEnd()
&& !(insert && insert->data))
{
@ -282,13 +284,6 @@ ASTPtr tryParseQuery(
return nullptr;
}
/// Parse error.
if (!parse_res)
{
out_error_message = getSyntaxErrorMessage(begin, end, max_parsed_pos, expected, hilite, query_description);
return nullptr;
}
pos = token_iterator->begin;
return res;
}