always request all pages

Author: kunga

ydb/core/tablet_flat/flat_executor.cpp

@@ -659,8 +659,6 @@ void TExecutor::ActivateWaitingTransactions(const TVector<TIntrusivePtr<NPageCol
                 } else {
                     EnqueueActivation(seat, activate);
                 }
-            } else {
-                Y_Fail("Unexpected wait pad triggered");
             }
         }
         if (cancelled && activate) {
@@ -2033,7 +2031,6 @@ void TExecutor::PostponeTransaction(TSeat* seat, TPageCollectionTxEnv &env,
 
     ui32 touchedPages = 0;
     ui32 newPinnedPages = 0;
-    ui32 loadPages = 0;
     ui64 prevTouched = seat->MemoryTouched;
 
     PrivatePageCache->PinTouches(seat->Pinned, touchedPages, newPinnedPages, seat->MemoryTouched);
@@ -2044,6 +2041,7 @@ void TExecutor::PostponeTransaction(TSeat* seat, TPageCollectionTxEnv &env,
     prevTouched = seat->MemoryTouched;
 
     PrivatePageCache->PinToLoad(seat->Pinned, newPinnedPages, seat->MemoryTouched);
+    ui64 loadBytes = seat->MemoryTouched - prevTouched;
     TransactionPagesMemory += seat->MemoryTouched - prevTouched;
 
     if (seat->AttachedMemory)
@@ -2122,42 +2120,34 @@ void TExecutor::PostponeTransaction(TSeat* seat, TPageCollectionTxEnv &env,
     auto waitPad = MakeIntrusive<TTransactionWaitPad>(seat);
     TransactionWaitPads[waitPad.Get()] = waitPad;
 
-    ui32 waitPages = 0;
-    ui64 loadBytes = 0;
+    ui32 loadPages = 0;
     auto toLoad = PrivatePageCache->GetToLoad();
-    for (auto &xpair : toLoad) {
-        TPrivatePageCache::TInfo *pageCollectionInfo = xpair.first;
-        TVector<NTable::TPageId> &pages = xpair.second;
-        waitPages += pages.size();
-
-        const std::pair<ui32, ui64> toLoad = PrivatePageCache->Request(pages, pageCollectionInfo);
-        if (toLoad.first) {
-            if (auto logl = Logger->Log(ELnLev::Dbg03)) {
-                logl
-                    << NFmt::Do(*this) << " requests PageCollection " << pageCollectionInfo->PageCollection->Label()
-                    << " " << toLoad.second << " bytes, " << toLoad.first << " pages: [";
-                for (auto i : xrange(pages.size())) {
-                    if (i != 0) logl << ", ";
-                    logl << pages[i] << " " << ui32(pageCollectionInfo->GetPageType(pages[i]));
-                }
-                logl << "]";
+    for (auto &[pageCollectionInfo, pages] : toLoad) {
+        Y_DEBUG_ABORT_UNLESS(pages);
+        loadPages += pages.size();
+
+        if (auto logl = Logger->Log(ELnLev::Dbg03)) {
+            logl
+                << NFmt::Do(*this) << " requests PageCollection " << pageCollectionInfo->PageCollection->Label()
+                << " " << pages.size() << " pages: [";
+            for (auto i : xrange(pages.size())) {
+                if (i != 0) logl << ", ";
+                logl << pages[i] << " " << ui32(pageCollectionInfo->GetPageType(pages[i]));
             }
+            logl << "]";
+        }
 
-            auto *req = new NPageCollection::TFetch(0, pageCollectionInfo->PageCollection, std::move(pages));
-            req->TraceId = waitPad->GetWaitingTraceId();
-            req->WaitPad = waitPad; // TODO: deal with one tx multiple fetches
+        auto *req = new NPageCollection::TFetch(0, pageCollectionInfo->PageCollection, std::move(pages));
+        req->TraceId = waitPad->GetWaitingTraceId();
+        req->WaitPad = waitPad; // TODO: deal with one tx multiple fetches
 
-            loadPages += toLoad.first;
-            loadBytes += toLoad.second;
-            RequestFromSharedCache(req, NBlockIO::EPriority::Fast, EPageCollectionRequest::Cache);
-        }
+        RequestFromSharedCache(req, NBlockIO::EPriority::Fast, EPageCollectionRequest::Cache);
     }
 
     if (auto logl = Logger->Log(ELnLev::Debug)) {
         logl
             << NFmt::Do(*this) << " " << NFmt::Do(*seat) << " postponed"
-            << ", " << loadBytes << "b, pages "
-            << "{" << waitPages << " wait, " << loadPages << " load}"
+            << ", loading " << loadPages << " pages, " << loadBytes << " bytes"
             << ", freshly touched " << newPinnedPages << " pages";
     }
 

ydb/core/tablet_flat/flat_sausagecache.cpp

@@ -174,37 +174,6 @@ void TPrivatePageCache::Unpin(TPage *page, TPrivatePageCachePinPad *pad) {
     }
 }
 
-std::pair<ui32, ui64> TPrivatePageCache::Request(TVector<TPageId> &pages, TInfo *info) {
-    ui32 blocksToRequest = 0;
-    ui64 bytesToRequest = 0;
-
-    auto it = pages.begin();
-    auto end = pages.end();
-
-    while (it != end) {
-        TPage *page = info->EnsurePage(*it);
-        switch (page->LoadState) {
-        case TPage::LoadStateNo:
-            page->LoadState = TPage::LoadStateRequested;
-            bytesToRequest += page->Size;
-
-            ++blocksToRequest;
-            ++it;
-            break;
-        case TPage::LoadStateLoaded:
-            Y_ABORT("must not request already loaded pages");
-        case TPage::LoadStateRequested:
-            // TODO: request always
-            --end;
-            if (end != it)
-                *it = *end;
-            break;
-        }
-    }
-    pages.erase(end, pages.end());
-    return std::make_pair(blocksToRequest, bytesToRequest);
-}
-
 void TPrivatePageCache::TryLoad(TPage *page) {
     if (page->LoadState == TPage::LoadStateLoaded) {
         return;

ydb/core/tablet_flat/flat_sausagecache.h

@@ -39,7 +39,6 @@ class TPrivatePageCache {
         enum ELoadState {
             LoadStateNo,
             LoadStateLoaded,
-            LoadStateRequested,
         };
 
         ui32 LoadState : 2;
@@ -164,8 +163,6 @@ class TPrivatePageCache {
 
     const TStats& GetStats() const { return Stats; }
 
-    std::pair<ui32, ui64> Request(TVector<ui32> &pages, TInfo *info); // blocks to load, bytes to load
-
     const TSharedData* Lookup(TPageId pageId, TInfo *collection);
 
     void CountTouches(TPinned &pinned, ui32 &newPages, ui64 &newMemory, ui64 &pinnedMemory);