Skip to content

Commit 6e2af7f

Browse files
committed
tests: Set JSON tl heap for tests
Signed-off-by: Abhijat Malviya <[email protected]>
1 parent d0040af commit 6e2af7f

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

src/core/compact_object_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ static void InitThreadStructs() {
8888
SmallString::InitThreadLocal(tlh);
8989
thread_local MiMemoryResource mi_resource(tlh);
9090
CompactObj::InitThreadLocal(&mi_resource);
91+
InitJSONTLHeap(&mi_resource);
9192
};
9293

9394
static void CheckEverythingDeallocated() {

src/core/json/jsonpath_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class ScannerTest : public ::testing::Test {
9191
protected:
9292
ScannerTest() {
9393
driver_.lexer()->set_debug(1);
94+
InitJSONTLHeap(PMR_NS::get_default_resource());
9495
}
9596

9697
void SetInput(const std::string& str) {

src/core/page_usage_stats_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class PageUsageStatsTest : public ::testing::Test {
4545
}
4646

4747
PageUsageStatsTest() : m_(mi_heap_get_backing()) {
48+
InitJSONTLHeap(&m_);
4849
}
4950

5051
void SetUp() override {

src/server/cluster/cluster_config_test.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ MATCHER_P(NodeMatches, expected, "") {
2525
class ClusterConfigTest : public BaseFamilyTest {
2626
protected:
2727
const string kMyId = "my-id";
28+
29+
void SetUp() override {
30+
BaseFamilyTest::SetUp();
31+
InitJSONTLHeap(PMR_NS::get_default_resource());
32+
}
2833
};
2934

3035
inline string_view GetTag(string_view key) {

src/server/json_family_memory_test.cc

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "base/logging.h"
77
#include "facade/facade_test.h"
88
#include "server/command_registry.h"
9-
#include "server/json_family.h"
109
#include "server/test_utils.h"
1110

1211
using namespace testing;
@@ -19,25 +18,30 @@ namespace dfly {
1918

2019
class JsonFamilyMemoryTest : public BaseFamilyTest {
2120
public:
22-
static dfly::MiMemoryResource* GetMemoryResource() {
23-
static thread_local mi_heap_t* heap = mi_heap_new();
24-
static thread_local dfly::MiMemoryResource memory_resource{heap};
21+
static MiMemoryResource* GetMemoryResource() {
22+
thread_local mi_heap_t* heap = mi_heap_new();
23+
thread_local MiMemoryResource memory_resource{heap};
2524
return &memory_resource;
2625
}
2726

2827
protected:
28+
void SetUp() override {
29+
BaseFamilyTest::SetUp();
30+
InitJSONTLHeap(GetMemoryResource());
31+
}
32+
2933
auto GetJsonMemoryUsageFromDb(std::string_view key) {
3034
return Run({"MEMORY", "USAGE", key, "WITHOUTKEY"});
3135
}
3236
};
3337

3438
size_t GetMemoryUsage() {
35-
return static_cast<MiMemoryResource*>(JsonFamilyMemoryTest::GetMemoryResource())->used();
39+
return JsonFamilyMemoryTest::GetMemoryResource()->used();
3640
}
3741

3842
size_t GetJsonMemoryUsageFromString(std::string_view json_str) {
3943
size_t start = GetMemoryUsage();
40-
auto json = dfly::JsonFromString(json_str);
44+
auto json = JsonFromString(json_str);
4145
if (!json) {
4246
return 0;
4347
}
@@ -111,7 +115,7 @@ TEST_F(JsonFamilyMemoryTest, JsonConsDelTest) {
111115

112116
size_t start = GetMemoryUsage();
113117

114-
auto json = dfly::JsonFromString(start_json);
118+
auto json = JsonFromString(start_json);
115119
void* ptr =
116120
JsonFamilyMemoryTest::GetMemoryResource()->allocate(sizeof(JsonType), alignof(JsonType));
117121
JsonType* json_on_heap = new (ptr) JsonType(std::move(json).value());

0 commit comments

Comments
 (0)