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

Merge pull request #54067 from ClickHouse/vdimir/is_not_distinct_from_operator

Browse Source 
Parse IS NOT DISTINCT and <=> operators
This commit is contained in:
Nikita Mikhaylov 2023-08-31 17:14:42 +02:00 committed by GitHub
commit c08fc52812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 159 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Parsers/ExpressionListParsers.cpp
View File

@ -2336,12 +2336,14 @@ const std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::o
{":", Operator("if", 3, 3, OperatorType::FinishIf)},
{"OR", Operator("or", 3, 2, OperatorType::Mergeable)},
{"AND", Operator("and", 4, 2, OperatorType::Mergeable)},
{"IS NOT DISTINCT FROM", Operator("isNotDistinctFrom", 6, 2)},
{"IS NULL", Operator("isNull", 6, 1, OperatorType::IsNull)},
{"IS NOT NULL", Operator("isNotNull", 6, 1, OperatorType::IsNull)},
{"BETWEEN", Operator("", 7, 0, OperatorType::StartBetween)},
{"NOT BETWEEN", Operator("", 7, 0, OperatorType::StartNotBetween)},
{"==", Operator("equals", 9, 2, OperatorType::Comparison)},
{"!=", Operator("notEquals", 9, 2, OperatorType::Comparison)},
{"<=>", Operator("isNotDistinctFrom", 9, 2, OperatorType::Comparison)},
{"<>", Operator("notEquals", 9, 2, OperatorType::Comparison)},
{"<=", Operator("lessOrEquals", 9, 2, OperatorType::Comparison)},
{">=", Operator("greaterOrEquals", 9, 2, OperatorType::Comparison)},

7
src/Parsers/Lexer.cpp
View File

@ -375,9 +375,14 @@ Token Lexer::nextTokenImpl()
return Token(TokenType::NotEquals, token_begin, ++pos);
return Token(TokenType::ErrorSingleExclamationMark, token_begin, pos);
}
case '<': /// <, <=, <>
case '<': /// <, <=, <>, <=>
{
++pos;
if (pos + 1 < end && *pos == '=' && *(pos + 1) == '>')
{
pos += 2;
return Token(TokenType::Spaceship, token_begin, pos);
}
if (pos < end && *pos == '=')
return Token(TokenType::LessOrEquals, token_begin, ++pos);
if (pos < end && *pos == '>')

1
src/Parsers/Lexer.h
View File

@ -51,6 +51,7 @@ namespace DB
M(Greater) \
M(LessOrEquals) \
M(GreaterOrEquals) \
M(Spaceship) /** <=>. Used in MySQL for NULL-safe equality comparison. */ \
M(PipeMark) \
M(Concatenation) /** String concatenation operator: || */ \
\

1
src/Parsers/fuzzers/codegen_fuzzer/clickhouse-template.g
View File

@ -66,6 +66,7 @@ $1 " as " $2 ;
"==";
"!=";
"<>";
"<=>"
"<";
"<=";
">";

1
src/Parsers/obfuscateQueries.cpp
View File

@ -42,6 +42,7 @@ const std::unordered_set<std::string_view> keywords
"<>",
"=",
"==",
"<=>",
">",
">=",
"?",

116
tests/queries/0_stateless/02868_operator_is_not_distinct_from_priority.reference Normal file
View File

@ -0,0 +1,116 @@
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal Bool_0
Function in (children 1)
ExpressionList (children 2)
Literal Bool_1
Literal Tuple_(Bool_1, Bool_0)
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal UInt64_1
Function plus (children 1)
ExpressionList (children 2)
Literal UInt64_1
Literal UInt64_1
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal Bool_1
Function like (children 1)
ExpressionList (children 2)
Literal \'x\'
Literal \'a\'
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal \'x\'
Function concat (children 1)
ExpressionList (children 2)
Literal \'x\'
Literal \'a\'
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal UInt64_1
Function CAST (children 1)
ExpressionList (children 2)
Literal \'1\'
Literal \'integer\'
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function not (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal UInt64_1
Literal UInt64_1
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal Int64_-1
Literal UInt64_1
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function or (children 1)
ExpressionList (children 2)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal Bool_0
Literal Bool_1
Literal Bool_1
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Function isNull (children 1)
ExpressionList (children 1)
Literal NULL
Literal NULL
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function equals (children 1)
ExpressionList (children 2)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Literal UInt64_1
Literal UInt64_1
Literal UInt64_1
SelectWithUnionQuery (children 1)
ExpressionList (children 1)
SelectQuery (children 1)
ExpressionList (children 1)
Function isNotDistinctFrom (children 1)
ExpressionList (children 2)
Function equals (children 1)
ExpressionList (children 2)
Literal UInt64_1
Literal UInt64_1
Literal UInt64_1

32
tests/queries/0_stateless/02868_operator_is_not_distinct_from_priority.sql Normal file
View File

@ -0,0 +1,32 @@
-- EXPLAIN AST SELECT false IS NOT DISTINCT FROM (true IN (true, false));
EXPLAIN AST SELECT false IS NOT DISTINCT FROM true IN (true, false);
-- EXPLAIN AST SELECT 1 IS NOT DISTINCT FROM (1 + 1);
EXPLAIN AST SELECT 1 IS NOT DISTINCT FROM 1 + 1;
-- EXPLAIN AST SELECT true IS NOT DISTINCT FROM ('x' LIKE 'a');
EXPLAIN AST SELECT true IS NOT DISTINCT FROM 'x' LIKE 'a';
-- EXPLAIN AST SELECT 'x' IS NOT DISTINCT FROM ('x' || 'a');
EXPLAIN AST SELECT 'x' IS NOT DISTINCT FROM 'x' || 'a';
-- EXPLAIN AST SELECT 1 IS NOT DISTINCT FROM (1 :: integer);
EXPLAIN AST SELECT 1 IS NOT DISTINCT FROM 1 :: integer;
-- EXPLAIN AST SELECT NOT (1 IS NOT DISTINCT FROM 1);
EXPLAIN AST SELECT NOT 1 IS NOT DISTINCT FROM 1;
-- EXPLAIN AST SELECT (- 1) IS NOT DISTINCT FROM 1 ;
EXPLAIN AST SELECT - 1 IS NOT DISTINCT FROM 1 ;
-- EXPLAIN AST SELECT (false IS NOT DISTINCT FROM true) OR true;
EXPLAIN AST SELECT false IS NOT DISTINCT FROM true OR true;
-- EXPLAIN AST SELECT (NULL IS NULL) IS NOT DISTINCT FROM NULL;
EXPLAIN AST SELECT NULL IS NULL IS NOT DISTINCT FROM NULL;
-- EXPLAIN AST SELECT (1 <=> 1) == 1;
EXPLAIN AST SELECT 1 <=> 1 == 1;
-- EXPLAIN AST SELECT (1 == 1) <=> 1;
EXPLAIN AST SELECT 1 == 1 <=> 1;