Merge bebab98 into 5ef387d

Author: kunga

.gitignore

@@ -7,6 +7,8 @@
 !*/
 # Unignore all files inside canondata dir
 !**/canondata/**
+# Allow docker files
+!Dockerfile
 
 /canonization_show_res.log
 
@@ -43,6 +45,7 @@ __pycache__/
 .idea/
 .vscode/
 .clangd
+.antlr/
 
 # KDevelop IDE
 *.kdev4
@@ -82,3 +85,6 @@ list_result.log
 bin/config.json
 
 .vs/
+
+# handy for local junk, which is not intended to appear in the repo
+junk/

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

@@ -1173,6 +1173,8 @@ void TSharedCacheInitializer::InitializeServices(
 
     config->TotalAsyncQueueInFlyLimit = cfg.GetAsyncQueueInFlyLimit();
     config->TotalScanQueueInFlyLimit = cfg.GetScanQueueInFlyLimit();
+    config->ReplacementPolicy = cfg.GetReplacementPolicy();
+    config->LimitBytes = cfg.GetMemoryLimit();
 
     if (cfg.HasActivePagesReservationPercent()) {
         config->ActivePagesReservationPercent = cfg.GetActivePagesReservationPercent();
@@ -1184,10 +1186,6 @@ void TSharedCacheInitializer::InitializeServices(
     TIntrusivePtr<::NMonitoring::TDynamicCounters> tabletGroup = GetServiceCounters(appData->Counters, "tablets");
     TIntrusivePtr<::NMonitoring::TDynamicCounters> sausageGroup = tabletGroup->GetSubgroup("type", "S_CACHE");
 
-    config->CacheConfig = new TCacheCacheConfig(cfg.GetMemoryLimit(),
-            sausageGroup->GetCounter("fresh"),
-            sausageGroup->GetCounter("staging"),
-            sausageGroup->GetCounter("warm"));
     config->Counters = new TSharedPageCacheCounters(sausageGroup);
 
     setup->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>(MakeSharedPageCacheId(0),

ydb/core/protos/shared_cache.proto

@@ -1,10 +1,18 @@
 package NKikimrSharedCache;
 option java_package = "ru.yandex.kikimr.proto";
 
+enum TReplacementPolicy {
+    ThreeLeveledLRU = 0;
+    S3FIFO = 1;
+    ClockPro = 2;
+}
+
 message TSharedCacheConfig {
     optional uint64 MemoryLimit = 1 [default = 536870912];
     optional uint64 ScanQueueInFlyLimit = 2 [default = 536870912];
     optional uint64 AsyncQueueInFlyLimit = 3 [default = 536870912];
     optional uint32 ActivePagesReservationPercent = 4;
     optional uint32 MemTableReservationPercent = 5;
+    optional TReplacementPolicy ReplacementPolicy = 6 [default = ThreeLeveledLRU];
+    reserved 7;
 }

ydb/core/protos/ya.make

@@ -149,6 +149,7 @@ SRCS(
 
 GENERATE_ENUM_SERIALIZATION(blobstorage_pdisk_config.pb.h)
 GENERATE_ENUM_SERIALIZATION(datashard_load.pb.h)
+GENERATE_ENUM_SERIALIZATION(shared_cache.pb.h)
 
 PEERDIR(
     ydb/library/actors/protos