@@ -10,7 +10,6 @@ namespace NKikimr::NOlap::NReader {
10
10
constexpr TDuration SCAN_HARD_TIMEOUT = TDuration::Minutes(10 );
11
11
constexpr TDuration SCAN_HARD_TIMEOUT_GAP = TDuration::Seconds(5 );
12
12
13
-
14
13
void TColumnShardScan::PassAway () {
15
14
Send (ResourceSubscribeActorId, new TEvents::TEvPoisonPill);
16
15
Send (ReadCoordinatorActorId, new TEvents::TEvPoisonPill);
@@ -192,9 +191,6 @@ bool TColumnShardScan::ProduceResults() noexcept {
192
191
193
192
std::shared_ptr<TPartialReadResult> resultOpt = resultConclusion.DetachResult ();
194
193
if (!resultOpt) {
195
- if (!!AckReceivedInstant) {
196
- LastResultInstant = TMonotonic::Now ();
197
- }
198
194
ACFL_DEBUG (" stage" , " no data is ready yet" )(" iterator" , ScanIterator->DebugString ());
199
195
return false ;
200
196
}
@@ -260,6 +256,9 @@ void TColumnShardScan::ContinueProcessing() {
260
256
// Send new results if there is available capacity
261
257
while (ScanIterator && ProduceResults ()) {
262
258
}
259
+ if (!!AckReceivedInstant) {
260
+ LastResultInstant = TMonotonic::Now ();
261
+ }
263
262
264
263
if (ScanIterator) {
265
264
// Switch to the next range if the current one is finished
@@ -285,9 +284,9 @@ void TColumnShardScan::ContinueProcessing() {
285
284
}
286
285
}
287
286
}
288
- AFL_VERIFY (!!FinishInstant || !ScanIterator || !ChunksLimiter.HasMore () || ScanCountersPool.InWaiting ())(" scan_actor_id" , ScanActorId)(" tx_id" , TxId)(
289
- " scan_id " , ScanId )(" gen " , ScanGen )(" tablet " , TabletId )(
290
- " debug " , ScanIterator-> DebugString ())( " counters" , ScanCountersPool.DebugString ());
287
+ AFL_VERIFY (!!FinishInstant || !ScanIterator || !ChunksLimiter.HasMore () || ScanCountersPool.InWaiting ())(" scan_actor_id" , ScanActorId)(" tx_id" , TxId)(" scan_id " , ScanId)(
288
+ " gen " , ScanGen )(" tablet " , TabletId )(" debug " , ScanIterator-> DebugString () )(
289
+ " counters" , ScanCountersPool.DebugString ());
291
290
}
292
291
293
292
void TColumnShardScan::MakeResult (size_t reserveRows /* = 0*/ ) {
0 commit comments