Add runtime access to cache database. Let load tests reset cache for …

…cold / warm testing
CesiumGS · Sep 11, 2023 · a6a353b · a6a353b
1 parent 61feff1
commit a6a353b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/Source/CesiumRuntime/Private/CesiumRuntime.cpp b/Source/CesiumRuntime/Private/CesiumRuntime.cpp
@@ -100,20 +100,28 @@ std::string getCacheDatabaseName() {
 
 } // namespace
 
+std::shared_ptr<CesiumAsync::ICacheDatabase>& getCacheDatabase() {
+  static int MaxCacheItems =
+      GetDefault<UCesiumRuntimeSettings>()->MaxCacheItems;
+
+  static std::shared_ptr<CesiumAsync::ICacheDatabase> pCacheDatabase =
+      std::make_shared<CesiumAsync::SqliteCache>(
+          spdlog::default_logger(),
+          getCacheDatabaseName(),
+          MaxCacheItems);
+
+  return pCacheDatabase;
+}
+
 const std::shared_ptr<CesiumAsync::IAssetAccessor>& getAssetAccessor() {
   static int RequestsPerCachePrune =
       GetDefault<UCesiumRuntimeSettings>()->RequestsPerCachePrune;
-  static int MaxCacheItems =
-      GetDefault<UCesiumRuntimeSettings>()->MaxCacheItems;
   static std::shared_ptr<CesiumAsync::IAssetAccessor> pAssetAccessor =
       std::make_shared<CesiumAsync::GunzipAssetAccessor>(
           std::make_shared<CesiumAsync::CachingAssetAccessor>(
               spdlog::default_logger(),
               std::make_shared<UnrealAssetAccessor>(),
-              std::make_shared<CesiumAsync::SqliteCache>(
-                  spdlog::default_logger(),
-                  getCacheDatabaseName(),
-                  MaxCacheItems),
+              getCacheDatabase(),
               RequestsPerCachePrune));
   return pAssetAccessor;
 }
diff --git a/Source/CesiumRuntime/Private/Tests/CesiumLoadTest.cpp b/Source/CesiumRuntime/Private/Tests/CesiumLoadTest.cpp
@@ -6,6 +6,7 @@
 #include "Tests/AutomationCommon.h"
 #include "Tests/AutomationEditorCommon.h"
 
+#include "CesiumAsync/ICacheDatabase.h"
 #include "CesiumGltfComponent.h"
 #include "CesiumRuntime.h"
 #include "CesiumSceneGeneration.h"
@@ -178,8 +179,10 @@ bool RunLoadTest(
   return true;
 }
 
-void clearDiskCache(SceneGenerationContext& context) {
-  // TODO
+void clearCacheDb(SceneGenerationContext& context) {
+  std::shared_ptr<CesiumAsync::ICacheDatabase> pCacheDatabase =
+      getCacheDatabase();
+  pCacheDatabase->clearAll();
 }
 
 void refreshTilesets(SceneGenerationContext& context) {
@@ -189,7 +192,7 @@ void refreshTilesets(SceneGenerationContext& context) {
 bool FCesiumLoadTestDenver::RunTest(const FString& Parameters) {
 
   std::vector<TestPass> testPasses;
-  testPasses.push_back(TestPass{"Cold Cache", clearDiskCache, nullptr});
+  testPasses.push_back(TestPass{"Cold Cache", clearCacheDb, nullptr});
   testPasses.push_back(TestPass{"Warm Cache", refreshTilesets, nullptr});
 
   return RunLoadTest(GetTestName(), setupForDenver, testPasses);
@@ -198,7 +201,7 @@ bool FCesiumLoadTestDenver::RunTest(const FString& Parameters) {
 bool FCesiumLoadTestGoogleplex::RunTest(const FString& Parameters) {
 
   std::vector<TestPass> testPasses;
-  testPasses.push_back(TestPass{"Cold Cache", clearDiskCache, nullptr});
+  testPasses.push_back(TestPass{"Cold Cache", clearCacheDb, nullptr});
   testPasses.push_back(TestPass{"Warm Cache", refreshTilesets, nullptr});
 
   return RunLoadTest(GetTestName(), setupForGoogleTiles, testPasses);
@@ -245,7 +248,7 @@ bool FCesiumLoadTestMontrealPointCloud::RunTest(const FString& Parameters) {
   };
 
   std::vector<TestPass> testPasses;
-  testPasses.push_back(TestPass{"Cold Cache", clearDiskCache, nullptr});
+  testPasses.push_back(TestPass{"Cold Cache", clearCacheDb, nullptr});
   testPasses.push_back(TestPass{"Adjust", adjustCamera, verifyVisibleTiles});
 
   return RunLoadTest(GetTestName(), setupForMontrealPointCloud, testPasses);

diff --git a/Source/CesiumRuntime/Public/CesiumRuntime.h b/Source/CesiumRuntime/Public/CesiumRuntime.h
@@ -12,6 +12,7 @@ class UCesiumRasterOverlay;
 namespace CesiumAsync {
 class AsyncSystem;
 class IAssetAccessor;
+class ICacheDatabase;
 } // namespace CesiumAsync
 
 DECLARE_LOG_CATEGORY_EXTERN(LogCesium, Log, All);
@@ -48,3 +49,6 @@ CESIUMRUNTIME_API extern FCesiumRasterOverlayIonTroubleshooting
 CESIUMRUNTIME_API CesiumAsync::AsyncSystem& getAsyncSystem() noexcept;
 CESIUMRUNTIME_API const std::shared_ptr<CesiumAsync::IAssetAccessor>&
 getAssetAccessor();
+
+CESIUMRUNTIME_API std::shared_ptr<CesiumAsync::ICacheDatabase>&
+getCacheDatabase();