thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Synchronize parsers"

Browse Source
This commit is contained in:
Alexander Tokmakov 2024-03-04 11:42:21 +01:00 committed by GitHub
parent 017a81692f
commit 2e64b6722f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Interpreters/InterpreterSystemQuery.cpp
View File

@ -1209,12 +1209,7 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
break; break;
} }
case Type::DROP_DISK_METADATA_CACHE: case Type::DROP_DISK_METADATA_CACHE:
case Type::DROP_DISTRIBUTED_CACHE: throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Not implemented");
case Type::STOP_VIRTUAL_PARTS_UPDATE:
case Type::START_VIRTUAL_PARTS_UPDATE:
{
throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Only available in ClickHouse Cloud, https://clickhouse.cloud/");
}
case Type::RELOAD_DICTIONARY: case Type::RELOAD_DICTIONARY:
case Type::RELOAD_DICTIONARIES: case Type::RELOAD_DICTIONARIES:
case Type::RELOAD_EMBEDDED_DICTIONARIES: case Type::RELOAD_EMBEDDED_DICTIONARIES:

8
src/Parsers/ASTSystemQuery.cpp
View File

@ -172,8 +172,6 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState & s
case Type::START_PULLING_REPLICATION_LOG: case Type::START_PULLING_REPLICATION_LOG:
case Type::STOP_CLEANUP: case Type::STOP_CLEANUP:
case Type::START_CLEANUP: case Type::START_CLEANUP:
case Type::START_VIRTUAL_PARTS_UPDATE:
case Type::STOP_VIRTUAL_PARTS_UPDATE:
{ {
if (table) if (table)
{ {
@ -296,12 +294,6 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState & s
} }
break; break;
} }
case Type::DROP_DISTRIBUTED_CACHE:
{
if (!distributed_cache_servive_id.empty())
settings.ostr << (settings.hilite ? hilite_none : "") << " " << distributed_cache_servive_id;
break;
}
case Type::UNFREEZE: case Type::UNFREEZE:
{ {
print_keyword(" WITH NAME "); print_keyword(" WITH NAME ");

5
src/Parsers/ASTSystemQuery.h
View File

@ -30,7 +30,6 @@ public:
DROP_QUERY_CACHE, DROP_QUERY_CACHE,
DROP_COMPILED_EXPRESSION_CACHE, DROP_COMPILED_EXPRESSION_CACHE,
DROP_FILESYSTEM_CACHE, DROP_FILESYSTEM_CACHE,
DROP_DISTRIBUTED_CACHE,
DROP_DISK_METADATA_CACHE, DROP_DISK_METADATA_CACHE,
DROP_SCHEMA_CACHE, DROP_SCHEMA_CACHE,
DROP_FORMAT_SCHEMA_CACHE, DROP_FORMAT_SCHEMA_CACHE,
@ -99,8 +98,6 @@ public:
STOP_VIEWS, STOP_VIEWS,
CANCEL_VIEW, CANCEL_VIEW,
TEST_VIEW, TEST_VIEW,
STOP_VIRTUAL_PARTS_UPDATE,
START_VIRTUAL_PARTS_UPDATE,
END END
}; };
@ -129,8 +126,6 @@ public:
UInt64 seconds{}; UInt64 seconds{};
String filesystem_cache_name; String filesystem_cache_name;
String distributed_cache_servive_id;
std::string key_to_drop; std::string key_to_drop;
std::optional<size_t> offset_to_drop; std::optional<size_t> offset_to_drop;

20
src/Parsers/ParserSystemQuery.cpp
View File

@ -14,6 +14,11 @@
namespace DB namespace DB
{ {
namespace ErrorCodes
{
extern const int SUPPORT_IS_DISABLED;
}
[[nodiscard]] static bool parseQueryWithOnClusterAndMaybeTable(std::shared_ptr<ASTSystemQuery> & res, IParser::Pos & pos, [[nodiscard]] static bool parseQueryWithOnClusterAndMaybeTable(std::shared_ptr<ASTSystemQuery> & res, IParser::Pos & pos,
Expected & expected, bool require_table, bool allow_string_literal) Expected & expected, bool require_table, bool allow_string_literal)
{ {
@ -392,8 +397,6 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
case Type::START_PULLING_REPLICATION_LOG: case Type::START_PULLING_REPLICATION_LOG:
case Type::STOP_CLEANUP: case Type::STOP_CLEANUP:
case Type::START_CLEANUP: case Type::START_CLEANUP:
case Type::STOP_VIRTUAL_PARTS_UPDATE:
case Type::START_VIRTUAL_PARTS_UPDATE:
if (!parseQueryWithOnCluster(res, pos, expected)) if (!parseQueryWithOnCluster(res, pos, expected))
return false; return false;
parseDatabaseAndTableAsAST(pos, expected, res->database, res->table); parseDatabaseAndTableAsAST(pos, expected, res->database, res->table);
@ -467,15 +470,6 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
return false; return false;
break; break;
} }
case Type::DROP_DISTRIBUTED_CACHE:
{
ParserLiteral parser;
ASTPtr ast;
if (!parser.parse(pos, ast, expected))
return false;
res->distributed_cache_servive_id = ast->as<ASTLiteral>()->value.safeGet<String>();
break;
}
case Type::SYNC_FILESYSTEM_CACHE: case Type::SYNC_FILESYSTEM_CACHE:
{ {
ParserLiteral path_parser; ParserLiteral path_parser;
@ -488,9 +482,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
} }
case Type::DROP_DISK_METADATA_CACHE: case Type::DROP_DISK_METADATA_CACHE:
{ {
if (!parseQueryWithOnClusterAndTarget(res, pos, expected, SystemQueryTargetType::Disk)) throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Not implemented");
return false;
break;
} }
case Type::DROP_SCHEMA_CACHE: case Type::DROP_SCHEMA_CACHE:
{ {