Skip to content

Commit 605d13b

Browse files
authored
Merge bdaf281 into 779684a
2 parents 779684a + bdaf281 commit 605d13b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

ydb/core/kqp/runtime/kqp_stream_lookup_worker.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ class TKqpLookupRows : public TKqpStreamLookupWorker {
231231
}
232232
}
233233

234-
std::vector<THolder<TEvDataShard::TEvRead>> RebuildRequest(const ui64& prevReadId, ui32 firstUnprocessedQuery,
234+
std::vector<THolder<TEvDataShard::TEvRead>> RebuildRequest(const ui64& prevReadId, ui32 firstUnprocessedQuery,
235235
TMaybe<TOwnedCellVec> lastProcessedKey, ui64& newReadId) final {
236236

237237
auto it = PendingKeysByReadId.find(prevReadId);
@@ -280,7 +280,7 @@ class TKqpLookupRows : public TKqpStreamLookupWorker {
280280
requests.emplace_back(std::move(request));
281281
PendingKeysByReadId.insert({newReadId, std::move(unprocessedRanges)});
282282
}
283-
283+
284284
return requests;
285285
}
286286

@@ -495,7 +495,7 @@ class TKqpJoinRows : public TKqpStreamLookupWorker {
495495
UnprocessedRows.emplace_back(std::make_pair(TOwnedCellVec(joinKeyCells), std::move(inputRow.GetElement(1))));
496496
}
497497

498-
std::vector<THolder<TEvDataShard::TEvRead>> RebuildRequest(const ui64& prevReadId, ui32 firstUnprocessedQuery,
498+
std::vector<THolder<TEvDataShard::TEvRead>> RebuildRequest(const ui64& prevReadId, ui32 firstUnprocessedQuery,
499499
TMaybe<TOwnedCellVec> lastProcessedKey, ui64& newReadId) final {
500500

501501
auto readIt = PendingKeysByReadId.find(prevReadId);
@@ -934,6 +934,7 @@ class TKqpJoinRows : public TKqpStreamLookupWorker {
934934
if (rowStats.ResultBytesCount > (ui64)freeSpace) {
935935
resultRow.DeleteUnreferenced();
936936
rowStats.Clear();
937+
return NUdf::TUnboxedValuePod();
937938
}
938939

939940
return resultRow;

0 commit comments

Comments
 (0)