Merge branch 'master' into optimize-apply-0512

dbms/src/Interpreters/Context.cpp

@@ -1649,10 +1649,8 @@ bool Context::initializeGlobalStoragePoolIfNeed(const PathPool & path_pool)
     auto lock = getLock();
     if (shared->global_storage_pool)
     {
-        // Can't init GlobalStoragePool twice.
-        // Because we won't remove the gc task in BackGroundPool
-        // Also won't remove it from ~GlobalStoragePool()
-        throw Exception("GlobalStoragePool has already been initialized.", ErrorCodes::LOGICAL_ERROR);
+        // GlobalStoragePool may be initialized many times in some test cases for restore.
+        LOG_WARNING(shared->log, "GlobalStoragePool has already been initialized.");
     }
 
     if (shared->storage_run_mode == PageStorageRunMode::MIX_MODE || shared->storage_run_mode == PageStorageRunMode::ONLY_V3)

dbms/src/Interpreters/InterpreterFactory.cpp

@@ -16,7 +16,6 @@
 #include <Interpreters/InterpreterAlterQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterDBGInvokeQuery.h>
-#include <Interpreters/InterpreterDeleteQuery.h>
 #include <Interpreters/InterpreterDescribeQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Interpreters/InterpreterExistsQuery.h>
@@ -27,15 +26,12 @@
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterSetQuery.h>
-#include <Interpreters/InterpreterShowCreateQuery.h>
 #include <Interpreters/InterpreterShowProcesslistQuery.h>
 #include <Interpreters/InterpreterShowTablesQuery.h>
-#include <Interpreters/InterpreterSystemQuery.h>
 #include <Interpreters/InterpreterUseQuery.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDBGInvokeQuery.h>
-#include <Parsers/ASTDeleteQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTManageQuery.h>
@@ -45,7 +41,6 @@
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTShowProcesslistQuery.h>
 #include <Parsers/ASTShowTablesQuery.h>
-#include <Parsers/ASTSystemQuery.h>
 #include <Parsers/ASTUseQuery.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
 
@@ -122,14 +117,6 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, Context &
     {
         return std::make_unique<InterpreterExistsQuery>(query, context);
     }
-    else if (typeid_cast<ASTShowCreateTableQuery *>(query.get()))
-    {
-        return std::make_unique<InterpreterShowCreateQuery>(query, context);
-    }
-    else if (typeid_cast<ASTShowCreateDatabaseQuery *>(query.get()))
-    {
-        return std::make_unique<InterpreterShowCreateQuery>(query, context);
-    }
     else if (typeid_cast<ASTDescribeQuery *>(query.get()))
     {
         return std::make_unique<InterpreterDescribeQuery>(query, context);
@@ -143,20 +130,11 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, Context &
         throwIfReadOnly(context);
         return std::make_unique<InterpreterAlterQuery>(query, context);
     }
-    else if (typeid_cast<ASTDeleteQuery *>(query.get()))
-    {
-        bool allow_materialized = static_cast<bool>(context.getSettingsRef().insert_allow_materialized_columns);
-        return std::make_unique<InterpreterDeleteQuery>(query, context, allow_materialized);
-    }
     else if (typeid_cast<ASTDBGInvokeQuery *>(query.get()))
     {
         return std::make_unique<InterpreterDBGInvokeQuery>(query, context);
     }
-    else if (typeid_cast<ASTSystemQuery *>(query.get()))
-    {
-        throwIfReadOnly(context);
-        return std::make_unique<InterpreterSystemQuery>(query, context);
-    }
+
     else if (typeid_cast<ASTManageQuery *>(query.get()))
     {
         throwIfReadOnly(context);