Skip to content

Commit e5b03fb

Browse files
committed
Fixed rows checking
1 parent c453246 commit e5b03fb

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,15 @@ class TRunScriptActor : public NActors::TActorBootstrapped<TRunScriptActor> {
289289
}
290290

291291
void SaveResult(size_t resultSetId) {
292-
auto resultSetInfo = ResultSetInfos[resultSetId];
293-
if (SaveResultInflight || resultSetInfo.PendingResult.rows_size() == 0) {
292+
if (SaveResultInflight) {
294293
return;
295294
}
296295

297296
if (!ExpireAt && ResultsTtl > TDuration::Zero()) {
298297
ExpireAt = TInstant::Now() + ResultsTtl;
299298
}
300299

300+
auto resultSetInfo = ResultSetInfos[resultSetId];
301301
Register(CreateSaveScriptExecutionResultActor(SelfId(), Database, ExecutionId, resultSetId, ExpireAt, resultSetInfo.FirstRowId, resultSetInfo.AccumulatedSize, std::move(resultSetInfo.PendingResult)));
302302
SaveResultInflight++;
303303
PendingResultSetsSize -= resultSetInfo.ByteCount - resultSetInfo.AccumulatedSize;
@@ -598,10 +598,10 @@ class TRunScriptActor : public NActors::TActorBootstrapped<TRunScriptActor> {
598598
}
599599

600600
static bool ShouldSaveResult(TResultSetInfo& resultInfo) {
601-
if (resultInfo.Truncated && resultInfo.PendingResult.rows_size()) {
602-
return true;
601+
if (!resultInfo.PendingResult.rows_size()) {
602+
return false;
603603
}
604-
return resultInfo.PendingResult.rows_size() >= MIN_SAVE_RESULT_BATCH_ROWS || resultInfo.ByteCount - resultInfo.AccumulatedSize >= MIN_SAVE_RESULT_BATCH_SIZE;
604+
return resultInfo.Truncated || resultInfo.PendingResult.rows_size() >= MIN_SAVE_RESULT_BATCH_ROWS || resultInfo.ByteCount - resultInfo.AccumulatedSize >= MIN_SAVE_RESULT_BATCH_SIZE;
605605
}
606606

607607
private:

0 commit comments

Comments
 (0)