fixup

Author: lll-phill-lll

ydb/library/yql/minikql/comp_nodes/mkql_grace_join_imp.cpp

@@ -1433,71 +1433,85 @@ void TTableBucketSpiller::ProcessBucketRestoration() {
     while (NextVectorToProcess != ENextVectorToProcess::None) {
         switch (NextVectorToProcess) {
             case ENextVectorToProcess::KeyAndVals:
-                if (StateUi64Adapter.HasRunningAsyncIoOperation()) return;
+                if (StateUi64Adapter.IsDataReady()) {
+                    AppendVector(CurrentBucket.KeyIntVals, StateUi64Adapter.ExtractVector());
+                    NextVectorToProcess = ENextVectorToProcess::DataIntVals;
+                    break;
+                }
 
-                if (!StateUi64Adapter.IsDataReady()) {
+                if (StateUi64Adapter.IsAcceptingDataRequests()) {
                     StateUi64Adapter.RequestNextVector();
-                    if (StateUi64Adapter.HasRunningAsyncIoOperation()) return;
+                    break;
                 }
-                AppendVector(CurrentBucket.KeyIntVals, StateUi64Adapter.ExtractVector());
-                NextVectorToProcess = ENextVectorToProcess::DataIntVals;
-                break;
+                return;
             case ENextVectorToProcess::DataIntVals:
-                if (StateUi64Adapter.HasRunningAsyncIoOperation()) return;
+                if (StateUi64Adapter.IsDataReady()) {
+                    AppendVector(CurrentBucket.DataIntVals, StateUi64Adapter.ExtractVector());
+                    NextVectorToProcess = ENextVectorToProcess::StringsValues;
+                    break;
+                }
 
-                if (!StateUi64Adapter.IsDataReady()) {
+                if (StateUi64Adapter.IsAcceptingDataRequests()) {
                     StateUi64Adapter.RequestNextVector();
-                    if (StateUi64Adapter.HasRunningAsyncIoOperation()) return;
+                    break;
                 }
-                AppendVector(CurrentBucket.DataIntVals, StateUi64Adapter.ExtractVector());
-                NextVectorToProcess = ENextVectorToProcess::StringsValues;
-                break;
+                return;
             case ENextVectorToProcess::StringsValues:
-                if (StateCharAdapter.HasRunningAsyncIoOperation()) return;
+                if (StateCharAdapter.IsDataReady()) {
+                    AppendVector(CurrentBucket.StringsValues, StateCharAdapter.ExtractVector());
+                    NextVectorToProcess = ENextVectorToProcess::StringsOffsets;
+                    break;
+                }
 
-                if (!StateCharAdapter.IsDataReady()) {
+                if (StateCharAdapter.IsAcceptingDataRequests()) {
                     StateCharAdapter.RequestNextVector();
-                    if (StateCharAdapter.HasRunningAsyncIoOperation()) return;
+                    break;
                 }
-                AppendVector(CurrentBucket.StringsValues, StateCharAdapter.ExtractVector());
-                NextVectorToProcess = ENextVectorToProcess::StringsOffsets;
-                break;
+                return;
             case ENextVectorToProcess::StringsOffsets:
-                if (StateUi32Adapter.HasRunningAsyncIoOperation()) return;
+                if (StateUi32Adapter.IsDataReady()) {
+                    AppendVector(CurrentBucket.StringsOffsets, StateUi32Adapter.ExtractVector());
+                    NextVectorToProcess = ENextVectorToProcess::InterfaceValues;
+                    break;
+                }
 
-                if (!StateUi32Adapter.IsDataReady()) {
+                if (StateUi32Adapter.IsAcceptingDataRequests()) {
                     StateUi32Adapter.RequestNextVector();
-                    if (StateUi32Adapter.HasRunningAsyncIoOperation()) return;
+                    break;
                 }
-                AppendVector(CurrentBucket.StringsOffsets, StateUi32Adapter.ExtractVector());
-                NextVectorToProcess = ENextVectorToProcess::InterfaceValues;
-                break;
+                return;
             case ENextVectorToProcess::InterfaceValues:
-                if (StateCharAdapter.HasRunningAsyncIoOperation()) return;
+                if (StateCharAdapter.IsDataReady()) {
+                    AppendVector(CurrentBucket.InterfaceValues, StateCharAdapter.ExtractVector());
+                    NextVectorToProcess = ENextVectorToProcess::InterfaceOffsets;
+                    break;
+                }
 
-                if (!StateCharAdapter.IsDataReady()) {
+                if (StateCharAdapter.IsAcceptingDataRequests()) {
                     StateCharAdapter.RequestNextVector();
-                    if (StateCharAdapter.HasRunningAsyncIoOperation()) return;
+                    break;
                 }
-                AppendVector(CurrentBucket.InterfaceValues, StateCharAdapter.ExtractVector());
-                NextVectorToProcess = ENextVectorToProcess::InterfaceOffsets;
-                break;
+                return;
             case ENextVectorToProcess::InterfaceOffsets:
-                if (StateUi32Adapter.HasRunningAsyncIoOperation()) return;
+                if (StateUi32Adapter.IsDataReady()) {
+                    AppendVector(CurrentBucket.InterfaceOffsets, StateUi32Adapter.ExtractVector());
+                    
+                    SpilledBucketsCount--;
+                    if (SpilledBucketsCount == 0) {
+                        NextVectorToProcess = ENextVectorToProcess::None;
+                        State = EState::WaitingForExtraction;
+                    } else {
+                        NextVectorToProcess = ENextVectorToProcess::KeyAndVals;
+                    }
+                    
+                    break;
+                }
 
-                if (!StateUi32Adapter.IsDataReady()) {
+                if (StateUi32Adapter.IsAcceptingDataRequests()) {
                     StateUi32Adapter.RequestNextVector();
-                    if (StateUi32Adapter.HasRunningAsyncIoOperation()) return;
+                    break;
                 }
-                AppendVector(CurrentBucket.InterfaceOffsets, StateUi32Adapter.ExtractVector());
-                SpilledBucketsCount--;
-                if (SpilledBucketsCount == 0) {
-                    NextVectorToProcess = ENextVectorToProcess::None;
-                    State = EState::WaitingForExtraction;
-                } else {
-                    NextVectorToProcess = ENextVectorToProcess::KeyAndVals;
-                }
-                break;
+                return;
             default:
                 return;