Fix after review

ianton-ru · ianton-ru · commit c523f292e2f8 · 2026-02-20T12:46:52.000+01:00
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
@@ -71,7 +71,7 @@ void RemoteQueryExecutorReadContext::Task::run(AsyncCallback async_callback, Sus
             }
             read_context.packet = read_context.executor.getConnections().receivePacketUnlocked(async_callback);
             read_context.has_read_packet_part = PacketPart::Body;
-            if (read_context.packet.type == Protocol::Server::Data)
+            if (read_context.packet.type == Protocol::Server::Data && read_context.packet.block.rows() > 0)
                 read_context.has_data_packets = true;
 
             suspend_callback();
diff --git a/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp b/src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp
@@ -308,13 +308,13 @@ void StorageObjectStorageStableTaskDistributor::rescheduleTasksFromReplica(size_
             "All replicas were marked as lost"
         );
 
-    replica_to_files_to_be_processed.erase(number_of_current_replica);
     for (const auto & file : processed_file_list_ptr->second)
     {
         auto file_replica_idx = getReplicaForFile(file->getPath());
         unprocessed_files.emplace(file->getPath(), std::make_pair(file, file_replica_idx));
         connection_to_files[file_replica_idx].push_back(file);
     }
+    replica_to_files_to_be_processed.erase(number_of_current_replica);
 }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ void RemoteQueryExecutorReadContext::Task::run(AsyncCallback async_callback, Sus`
`71`	`71`	`}`
`72`	`72`	`read_context.packet = read_context.executor.getConnections().receivePacketUnlocked(async_callback);`
`73`	`73`	`read_context.has_read_packet_part = PacketPart::Body;`
`74`		`- if (read_context.packet.type == Protocol::Server::Data)`
	`74`	`+ if (read_context.packet.type == Protocol::Server::Data && read_context.packet.block.rows() > 0)`
`75`	`75`	`read_context.has_data_packets = true;`
`76`	`76`
`77`	`77`	`suspend_callback();`
Original file line number	Diff line number	Diff line change
`@@ -308,13 +308,13 @@ void StorageObjectStorageStableTaskDistributor::rescheduleTasksFromReplica(size_`
`308`	`308`	`"All replicas were marked as lost"`
`309`	`309`	`);`
`310`	`310`
`311`		`- replica_to_files_to_be_processed.erase(number_of_current_replica);`
`312`	`311`	`for (const auto & file : processed_file_list_ptr->second)`
`313`	`312`	`{`
`314`	`313`	`auto file_replica_idx = getReplicaForFile(file->getPath());`
`315`	`314`	`unprocessed_files.emplace(file->getPath(), std::make_pair(file, file_replica_idx));`
`316`	`315`	`connection_to_files[file_replica_idx].push_back(file);`
`317`	`316`	`}`
	`317`	`+ replica_to_files_to_be_processed.erase(number_of_current_replica);`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`}`