Simply request all pages in Scan from Shared Cache (#12055)

Author: kunga

ydb/core/tablet_flat/flat_executor.cpp

@@ -2670,58 +2670,6 @@ void TExecutor::Handle(TEvents::TEvFlushLog::TPtr &ev) {
     CompactionLogic->UpdateLogUsage(LogicRedo->GrabLogUsage());
 }
 
-void TExecutor::Handle(NSharedCache::TEvRequest::TPtr &ev) {
-    const auto priority = ev->Get()->Priority;
-    TAutoPtr<NPageCollection::TFetch> msg = ev->Get()->Fetch;
-
-    Y_ABORT_UNLESS(msg->Pages, "empty page collection request, do not do it");
-
-    const TLogoBlobID &metaId = msg->PageCollection->Label();
-    TPrivatePageCache::TInfo *collectionInfo = PrivatePageCache->Info(metaId);
-    if (!collectionInfo) {
-        auto *reply = new NSharedCache::TEvResult(std::move(msg->PageCollection), msg->Cookie, NKikimrProto::RACE);
-        Send(ev->Sender, reply, 0, ev->Cookie);
-        return;
-    }
-
-    TVector<NSharedCache::TEvResult::TLoaded> cached;
-    TVector<NTable::TPageId> left;
-
-    for (auto &x : msg->Pages) {
-        if (TSharedPageRef body = PrivatePageCache->LookupShared(x, collectionInfo)) {
-            cached.emplace_back(x, body);
-        } else {
-            left.push_back(x);
-        }
-    }
-
-    if (cached) {
-        if (auto logl = Logger->Log(ELnLev::Debug)) {
-            logl
-                << NFmt::Do(*this) << " cache hit for data request from: "
-                << ev->Sender << ", pageCollection " << msg->PageCollection->Label();
-        }
-
-        auto *reply = new NSharedCache::TEvResult(msg->PageCollection, msg->Cookie, NKikimrProto::OK);
-        reply->Loaded.swap(cached);
-        Send(ev->Sender, reply, 0, ev->Cookie);
-    }
-
-    if (left) {
-        DoSwap(msg->Pages, left);
-
-        if (auto logl = Logger->Log(ELnLev::Debug)) {
-            logl
-                << NFmt::Do(*this) << " cache miss for data request from: "
-                << ev->Sender << ", pageCollection " << msg->PageCollection->Label();
-        }
-
-        auto *req = new NSharedCache::TEvRequest(priority, msg, SelfId());
-
-        TActorIdentity(ev->Sender).Send(MakeSharedPageCacheId(), req, 0, ev->Cookie);
-    }
-}
-
 void TExecutor::Handle(NSharedCache::TEvResult::TPtr &ev) {
     const bool failed = (ev->Get()->Status != NKikimrProto::OK);
 
@@ -3950,7 +3898,6 @@ STFUNC(TExecutor::StateWork) {
         HFunc(TEvPrivate::TEvLeaseExtend, Handle);
         HFunc(TEvents::TEvWakeup, Wakeup);
         hFunc(TEvents::TEvFlushLog, Handle);
-        hFunc(NSharedCache::TEvRequest, Handle);
         hFunc(NSharedCache::TEvResult, Handle);
         hFunc(NSharedCache::TEvUpdated, Handle);
         HFunc(TEvTablet::TEvDropLease, Handle);

ydb/core/tablet_flat/flat_executor.h

@@ -558,7 +558,6 @@ class TExecutor
     void Handle(TEvents::TEvFlushLog::TPtr &ev);
     void Handle(TEvBlobStorage::TEvCollectGarbageResult::TPtr&);
     void Handle(NSharedCache::TEvResult::TPtr &ev);
-    void Handle(NSharedCache::TEvRequest::TPtr &ev);
     void Handle(NSharedCache::TEvUpdated::TPtr &ev);
     void Handle(NResourceBroker::TEvResourceBroker::TEvResourceAllocated::TPtr&);
     void Handle(NOps::TEvScanStat::TPtr &ev, const TActorContext &ctx);

ydb/core/tablet_flat/flat_scan_actor.h

@@ -484,13 +484,7 @@ namespace NOps {
                     if (auto logl = Logger->Log(ELnLev::Debug))
                         logl << NFmt::Do(*this) << " " << NFmt::Do(*req);
 
-                    const auto label = req->PageCollection->Label();
-                    if (PrivateCollections.contains(label)) {
-                        Send(MakeSharedPageCacheId(), new NSharedCache::TEvRequest(Args.ReadPrio, req, SelfId()));
-                        ForwardedSharedRequests = true;
-                    } else {
-                        SendToOwner(new NSharedCache::TEvRequest(Args.ReadPrio, req, Owner), true);
-                    }
+                    Send(MakeSharedPageCacheId(), new NSharedCache::TEvRequest(Args.ReadPrio, req, SelfId()));
                 }
 
                 if (ready == NTable::EReady::Page)
@@ -574,7 +568,6 @@ namespace NOps {
                 MakeSharedPageCacheId(),
                 new NSharedCache::TEvRequest(Args.ReadPrio, std::move(msg->Request), SelfId()),
                 ev->Flags, ev->Cookie);
-            ForwardedSharedRequests = true;
         }
 
         void Handle(NBlockIO::TEvStat::TPtr& ev) noexcept
@@ -596,13 +589,6 @@ namespace NOps {
             auto* partStore = partView.As<TPartStore>();
             Y_ABORT_UNLESS(partStore);
 
-            for (auto& cache : partStore->PageCollections) {
-                PrivateCollections.insert(cache->Id);
-            }
-            if (auto& cache = partStore->Pseudo) {
-                PrivateCollections.insert(cache->Id);
-            }
-
             Cache->AddCold(partView);
 
             if (MayProgress()) {
@@ -699,10 +685,7 @@ namespace NOps {
                 Send(pr.second, new TEvents::TEvPoison);
             }
 
-            if (ForwardedSharedRequests) {
-                Send(MakeSharedPageCacheId(), new NSharedCache::TEvUnregister);
-            }
-
+            Send(MakeSharedPageCacheId(), new NSharedCache::TEvUnregister);
             PassAway();
         }
 
@@ -738,13 +721,11 @@ namespace NOps {
 
         THashMap<TLogoBlobID, TActorId> ColdPartLoaders;
         THashMap<TLogoBlobID, TPartView> ColdPartLoaded;
-        THashSet<TLogoBlobID> PrivateCollections;
 
         TLoadBlobQueue BlobQueue;
         TDeque<TBlobQueueRequest> BlobQueueRequests;
         ui64 BlobQueueRequestsOffset = 0;
 
-        bool ForwardedSharedRequests = false;
         bool ContinueInFly = false;
 
         const NHPTimer::STime MaxCyclesPerIteration;