Merge pull request #60759 from ClickHouse/revert-60522-sync-with-priv…

…ate-3 Revert "Synchronize parsers"
ClickHouse · Mar 4, 2024 · fb02137 · fb02137
2 parents 017a816 + 2e64b67
commit fb02137
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 33 deletions.
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -1209,12 +1209,7 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             break;
         }
         case Type::DROP_DISK_METADATA_CACHE:
-        case Type::DROP_DISTRIBUTED_CACHE:
-        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/");
-        }
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Not implemented");
         case Type::RELOAD_DICTIONARY:
         case Type::RELOAD_DICTIONARIES:
         case Type::RELOAD_EMBEDDED_DICTIONARIES:

diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
@@ -172,8 +172,6 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState & s
         case Type::START_PULLING_REPLICATION_LOG:
         case Type::STOP_CLEANUP:
         case Type::START_CLEANUP:
-        case Type::START_VIRTUAL_PARTS_UPDATE:
-        case Type::STOP_VIRTUAL_PARTS_UPDATE:
         {
             if (table)
             {
@@ -296,12 +294,6 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState & s
             }
             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:
         {
             print_keyword(" WITH NAME ");

diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
@@ -30,7 +30,6 @@ class ASTSystemQuery : public IAST, public ASTQueryWithOnCluster
         DROP_QUERY_CACHE,
         DROP_COMPILED_EXPRESSION_CACHE,
         DROP_FILESYSTEM_CACHE,
-        DROP_DISTRIBUTED_CACHE,
         DROP_DISK_METADATA_CACHE,
         DROP_SCHEMA_CACHE,
         DROP_FORMAT_SCHEMA_CACHE,
@@ -99,8 +98,6 @@ class ASTSystemQuery : public IAST, public ASTQueryWithOnCluster
         STOP_VIEWS,
         CANCEL_VIEW,
         TEST_VIEW,
-        STOP_VIRTUAL_PARTS_UPDATE,
-        START_VIRTUAL_PARTS_UPDATE,
         END
     };
 
@@ -129,8 +126,6 @@ class ASTSystemQuery : public IAST, public ASTQueryWithOnCluster
     UInt64 seconds{};
 
     String filesystem_cache_name;
-    String distributed_cache_servive_id;
-
     std::string key_to_drop;
     std::optional<size_t> offset_to_drop;
 

diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
@@ -14,6 +14,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int SUPPORT_IS_DISABLED;
+}
+
 [[nodiscard]] static bool parseQueryWithOnClusterAndMaybeTable(std::shared_ptr<ASTSystemQuery> & res, IParser::Pos & pos,
                                                  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::STOP_CLEANUP:
         case Type::START_CLEANUP:
-        case Type::STOP_VIRTUAL_PARTS_UPDATE:
-        case Type::START_VIRTUAL_PARTS_UPDATE:
             if (!parseQueryWithOnCluster(res, pos, expected))
                 return false;
             parseDatabaseAndTableAsAST(pos, expected, res->database, res->table);
@@ -467,15 +470,6 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
             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:
         {
             ParserLiteral path_parser;
@@ -488,9 +482,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
         }
         case Type::DROP_DISK_METADATA_CACHE:
         {
-            if (!parseQueryWithOnClusterAndTarget(res, pos, expected, SystemQueryTargetType::Disk))
-                return false;
-            break;
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Not implemented");
         }
         case Type::DROP_SCHEMA_CACHE:
         {