fix conflicts

Author: arthurpassos

src/Interpreters/InterpreterKillQueryQuery.cpp

@@ -255,7 +255,7 @@ BlockIO InterpreterKillQueryQuery::execute()
         Block exports_block = getSelectResult(
             "source_database, source_table, transaction_id, destination_database, destination_table, partition_id",
             "system.replicated_partition_exports");
-        if (!exports_block)
+        if (exports_block.empty())
             return res_io;
 
         const ColumnString & src_db_col = typeid_cast<const ColumnString &>(*exports_block.getByName("source_database").column);
@@ -317,7 +317,7 @@ BlockIO InterpreterKillQueryQuery::execute()
             throw Exception(ErrorCodes::ACCESS_DENIED, "Not allowed to kill export partition. "
                 "To execute this query, it's necessary to have the grant {}", required_access_rights.toString());
 
-        res_io.pipeline = QueryPipeline(Pipe(std::make_shared<SourceFromSingleChunk>(header.cloneWithColumns(std::move(res_columns)))));
+        res_io.pipeline = QueryPipeline(Pipe(std::make_shared<SourceFromSingleChunk>(std::make_shared<const Block>(header.cloneWithColumns(std::move(res_columns))))));
 
         break;
     }

src/Parsers/ASTAlterQuery.cpp

@@ -380,14 +380,14 @@ void ASTAlterCommand::formatImpl(WriteBuffer & ostr, const FormatSettings & sett
     }
     else if (type == ASTAlterCommand::EXPORT_PARTITION)
     {
-        ostr << (settings.hilite ? hilite_keyword : "") << "EXPORT PARTITION " << (settings.hilite ? hilite_none : "");
+        ostr << "EXPORT PARTITION ";
         partition->format(ostr, settings, state, frame);
         ostr << " TO TABLE ";
         if (!to_database.empty())
         {
-            ostr << (settings.hilite ? hilite_identifier : "") << backQuoteIfNeed(to_database) << (settings.hilite ? hilite_none : "") << ".";
+            ostr << backQuoteIfNeed(to_database) << ".";
         }
-        ostr << (settings.hilite ? hilite_identifier : "") << backQuoteIfNeed(to_table) << (settings.hilite ? hilite_none : "");
+        ostr << backQuoteIfNeed(to_table);
     }
     else if (type == ASTAlterCommand::REPLACE_PARTITION)
     {

src/Storages/StorageReplicatedMergeTree.cpp

@@ -8701,7 +8701,7 @@ void StorageReplicatedMergeTree::exportPartitionToTable(const PartitionCommand &
         }
 
         /// The check for existence and entry removal are not atomic, so this actually might fail.
-        ops.emplace_back(zkutil::makeRemoveRecursiveRequest(partition_exports_path, -1));
+        ops.emplace_back(zkutil::makeRemoveRecursiveRequest(*zookeeper, partition_exports_path, -1));
     }
 
     ops.emplace_back(zkutil::makeCreateRequest(partition_exports_path, "", zkutil::CreateMode::Persistent));

tests/queries/0_stateless/03604_export_merge_tree_partition.reference

@@ -11,6 +11,7 @@ Select from destination table
 2	2020
 3	2020
 4	2021
+5	2021
 Export partition 2022
 Select from destination table again
 1	2020