Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate std::pmr memory tracking for class ArraySchema. #4696

Merged
merged 16 commits into from
Feb 23, 2024
16 changes: 8 additions & 8 deletions test/src/unit-ReadCellSlabIter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ TEST_CASE_METHOD(
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
array_->array_->array_schema_latest_ptr(),
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tiledb::test::create_test_memory_tracker(),
true);
fragments.emplace_back(std::move(fragment));

Expand Down Expand Up @@ -331,10 +331,10 @@ TEST_CASE_METHOD(
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
array_->array_->array_schema_latest_ptr(),
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tiledb::test::create_test_memory_tracker(),
true);
fragments.emplace_back(std::move(fragment));

Expand Down Expand Up @@ -409,10 +409,10 @@ TEST_CASE_METHOD(
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
array_->array_->array_schema_latest_ptr(),
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tiledb::test::create_test_memory_tracker(),
true);
fragments.emplace_back(std::move(fragment));
}
Expand Down Expand Up @@ -492,10 +492,10 @@ TEST_CASE_METHOD(
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
array_->array_->array_schema_latest_ptr(),
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tiledb::test::create_test_memory_tracker(),
true);
fragments.emplace_back(std::move(fragment));
}
Expand Down Expand Up @@ -712,10 +712,10 @@ TEST_CASE_METHOD(
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
array_->array_->array_schema_latest_ptr(),
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tiledb::test::create_test_memory_tracker(),
true);
fragments.emplace_back(std::move(fragment));

Expand Down Expand Up @@ -898,10 +898,10 @@ TEST_CASE_METHOD(
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
array_->array_->array_schema_latest_ptr(),
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tiledb::test::create_test_memory_tracker(),
true);
fragments.emplace_back(std::move(fragment));

Expand Down Expand Up @@ -1097,10 +1097,10 @@ TEST_CASE_METHOD(
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
array_->array_->array_schema_latest_ptr(),
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tiledb::test::create_test_memory_tracker(),
true);
fragments.emplace_back(std::move(fragment));

Expand Down Expand Up @@ -1343,10 +1343,10 @@ TEST_CASE_METHOD(
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
array_->array_->array_schema_latest_ptr(),
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tiledb::test::create_test_memory_tracker(),
true);
fragments.emplace_back(std::move(fragment));
}
Expand Down
6 changes: 4 additions & 2 deletions test/src/unit-Reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
*/

#include "test/support/src/helpers.h"
#include "test/support/src/mem_helpers.h"
#include "test/support/src/vfs_helpers.h"
#include "tiledb/common/common.h"
#include "tiledb/common/dynamic_memory/dynamic_memory.h"
#include "tiledb/common/heap_memory.h"
#include "tiledb/common/logger.h"
#include "tiledb/common/memory_tracker.h"
#include "tiledb/sm/c_api/tiledb_struct_def.h"
#include "tiledb/sm/enums/array_type.h"
#include "tiledb/sm/enums/encryption_type.h"
#include "tiledb/sm/misc/types.h"
#include "tiledb/sm/query/legacy/reader.h"
Expand Down Expand Up @@ -250,18 +252,18 @@ TEST_CASE_METHOD(
CHECK(dom->add_dimension(d1).ok());
CHECK(dom->add_dimension(d2).ok());

auto schema = make_shared<ArraySchema>(HERE());
auto schema = make_shared<ArraySchema>(HERE(), ArrayType::DENSE, tracker_);
CHECK(schema->set_domain(dom).ok());

std::vector<shared_ptr<FragmentMetadata>> fragments;
for (uint64_t i = 0; i < frag_tile_domains.size() + 1; i++) {
shared_ptr<FragmentMetadata> fragment = make_shared<FragmentMetadata>(
HERE(),
nullptr,
create_test_memory_tracker(),
schema,
URI(),
std::make_pair<uint64_t, uint64_t>(0, 0),
tracker_,
true);
fragments.emplace_back(std::move(fragment));
}
Expand Down
4 changes: 3 additions & 1 deletion test/src/unit-capi-array.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2586,11 +2586,13 @@ TEST_CASE_METHOD(
1,
&buff);
REQUIRE(rc == TILEDB_OK);
auto memory_tracker = ctx_->resources().create_memory_tracker();
auto st = tiledb::sm::serialization::array_deserialize(
array->array_.get(),
tiledb::sm::SerializationType::CAPNP,
buff->buffer(),
ctx_->storage_manager());
ctx_->storage_manager(),
memory_tracker);
REQUIRE(st.ok());

// 6. Server: Close array and clean up
Expand Down
5 changes: 4 additions & 1 deletion test/src/unit-cppapi-schema-evolution.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
*/

#include <test/support/tdb_catch.h>
#include "test/support/src/mem_helpers.h"
#include "tiledb/sm/array_schema/array_schema.h"
#include "tiledb/sm/array_schema/array_schema_evolution.h"
#include "tiledb/sm/array_schema/attribute.h"
Expand Down Expand Up @@ -808,7 +809,9 @@ TEST_CASE(
ase->set_timestamp_range(std::make_pair(1, 1));

auto schema = make_shared<tiledb::sm::ArraySchema>(
HERE(), tiledb::sm::ArrayType::SPARSE);
HERE(),
tiledb::sm::ArrayType::SPARSE,
tiledb::test::create_test_memory_tracker());
auto dim = make_shared<tiledb::sm::Dimension>(
HERE(), "dim1", tiledb::sm::Datatype::INT32);
int range[2] = {0, 1000};
Expand Down