fix

tavplubix · tavplubix · commit 82a5496f2856 · 2024-06-13T15:28:04.000+02:00
diff --git a/src/Core/ServerUUID.cpp b/src/Core/ServerUUID.cpp
@@ -68,4 +68,9 @@ UUID loadServerUUID(const fs::path & server_uuid_file, Poco::Logger * log)
     }
 }
 
+void ServerUUID::setRandomForUnitTests()
+{
+    server_uuid = UUIDHelpers::generateV4();
+}
+
 }
diff --git a/src/Core/ServerUUID.h b/src/Core/ServerUUID.h
@@ -19,6 +19,8 @@ class ServerUUID
 
     /// Loads server UUID from file or creates new one. Should be called on daemon startup.
     static void load(const fs::path & server_uuid_file, Poco::Logger * log);
+
+    static void setRandomForUnitTests();
 };
 
 UUID loadServerUUID(const fs::path & server_uuid_file, Poco::Logger * log);
diff --git a/src/Interpreters/tests/gtest_filecache.cpp b/src/Interpreters/tests/gtest_filecache.cpp
@@ -8,6 +8,7 @@
 #include <numeric>
 #include <thread>
 
+#include <Core/ServerUUID.h>
 #include <Common/iota.h>
 #include <Common/randomSeed.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -333,6 +334,7 @@ class FileCacheTest : public ::testing::Test
 
 TEST_F(FileCacheTest, LRUPolicy)
 {
+    ServerUUID::setRandomForUnitTests();
     DB::ThreadStatus thread_status;
 
     /// To work with cache need query_id and query context.
@@ -807,6 +809,7 @@ TEST_F(FileCacheTest, LRUPolicy)
 
 TEST_F(FileCacheTest, writeBuffer)
 {
+    ServerUUID::setRandomForUnitTests();
     FileCacheSettings settings;
     settings.max_size = 100;
     settings.max_elements = 5;
@@ -938,6 +941,7 @@ static size_t readAllTemporaryData(TemporaryFileStream & stream)
 
 TEST_F(FileCacheTest, temporaryData)
 {
+    ServerUUID::setRandomForUnitTests();
     DB::FileCacheSettings settings;
     settings.max_size = 10_KiB;
     settings.max_file_segment_size = 1_KiB;
@@ -1044,6 +1048,7 @@ TEST_F(FileCacheTest, temporaryData)
 
 TEST_F(FileCacheTest, CachedReadBuffer)
 {
+    ServerUUID::setRandomForUnitTests();
     DB::ThreadStatus thread_status;
 
     /// To work with cache need query_id and query context.
@@ -1120,6 +1125,7 @@ TEST_F(FileCacheTest, CachedReadBuffer)
 
 TEST_F(FileCacheTest, TemporaryDataReadBufferSize)
 {
+    ServerUUID::setRandomForUnitTests();
     /// Temporary data stored in cache
     {
         DB::FileCacheSettings settings;
@@ -1167,6 +1173,7 @@ TEST_F(FileCacheTest, TemporaryDataReadBufferSize)
 
 TEST_F(FileCacheTest, SLRUPolicy)
 {
+    ServerUUID::setRandomForUnitTests();
     DB::ThreadStatus thread_status;
     std::string query_id = "query_id"; /// To work with cache need query_id and query context.
 

Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,9 @@ UUID loadServerUUID(const fs::path & server_uuid_file, Poco::Logger * log)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
	`71`	`+void ServerUUID::setRandomForUnitTests()`
	`72`	`+{`
	`73`	`+ server_uuid = UUIDHelpers::generateV4();`
	`74`	`+}`
	`75`	`+`
`71`	`76`	`}`