Skip to content

Commit

Permalink
Merge pull request #6 from eosnetworkfoundation/bdj__storage3
Browse files Browse the repository at this point in the history 
Covering last minute Pull Request changes for tracked_storage.
  • Loading branch information
@brianjohnson5972
brianjohnson5972 authored Mar 16, 2022
2 parents f61ea25 + a4de798 commit 5134c1a
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 30 deletions.
32 changes: 18 additions & 14 deletions include/fc/container/tracked_storage.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace fc {
template <typename ContainerType>
class tracked_storage {
private:
size_t _size = 0;
size_t _memory_size = 0;
ContainerType _index;
public:
typedef typename ContainerType::template nth_index<0>::type primary_index_type;
Expand All @@ -37,7 +37,7 @@ namespace fc {
auto container_size = _index.size();
fc::raw::unpack(ds, container_size);
for (size_t i = 0; i < container_size; ++i) {
if (size() >= max_memory) {
if (memory_size() >= max_memory) {
return false;
}
typename ContainerType::value_type v;
Expand All @@ -51,17 +51,20 @@ namespace fc {
void write(fc::cfile& dat_content) const {
const auto container_size = _index.size();
dat_content.write( reinterpret_cast<const char*>(&container_size), sizeof(container_size) );
const primary_index_type& primary_idx = _index.template get<0>();

for (auto itr = primary_idx.cbegin(); itr != primary_idx.cend(); ++itr) {
auto data = fc::raw::pack(*itr);
for (const auto& item : _index) {
auto data = fc::raw::pack(item);
dat_content.write(data.data(), data.size());
}
}

void insert(typename ContainerType::value_type obj) {
_size += obj.size();
_index.insert(std::move(obj));
std::pair<typename primary_index_type::iterator, bool> insert(typename ContainerType::value_type obj) {
const auto size = obj.size();
auto result = _index.insert(std::move(obj));
if (result.second) {
_memory_size += size;
}
return result;
}

template<typename Key>
Expand All @@ -78,9 +81,10 @@ namespace fc {

template<typename Lam>
void modify(typename primary_index_type::iterator itr, Lam lam) {
const auto orig_size = itr->size();
_index.modify( itr, std::move(lam));
_size += itr->size() - orig_size;
_memory_size -= itr->size();
if (_index.modify( itr, std::move(lam))) {
_memory_size += itr->size();
}
}

template<typename Key>
Expand All @@ -89,12 +93,12 @@ namespace fc {
if (itr == _index.end())
return;

_size -= itr->size();
_memory_size -= itr->size();
_index.erase(itr);
}

size_t size() const {
return _size;
size_t memory_size() const {
return _memory_size;
}

const ContainerType& index() const {
Expand Down
39 changes: 23 additions & 16 deletions test/io/test_tracked_storage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,26 +57,33 @@ BOOST_AUTO_TEST_SUITE(tracked_storage_tests)

BOOST_AUTO_TEST_CASE(track_storage_test) {
fc::tracked_storage<test_size_container> storage;
storage.insert(test_size{ 0, 5 });
BOOST_CHECK_EQUAL( storage.size(), 5);
storage.insert(test_size{ 1, 4 });
BOOST_CHECK_EQUAL( storage.size(), 9);
storage.insert(test_size{ 2, 15 });
BOOST_CHECK_EQUAL( storage.size(), 24);
BOOST_CHECK(storage.insert(test_size{ 0, 5 }).second);
BOOST_CHECK_EQUAL( storage.memory_size(), 5);
BOOST_CHECK_EQUAL( storage.index().size(), 1);
BOOST_CHECK(storage.insert(test_size{ 1, 4 }).second);
BOOST_CHECK_EQUAL( storage.memory_size(), 9);
BOOST_CHECK_EQUAL( storage.index().size(), 2);
BOOST_CHECK(storage.insert(test_size{ 2, 15 }).second);
BOOST_CHECK_EQUAL( storage.memory_size(), 24);
BOOST_CHECK_EQUAL( storage.index().size(), 3);
auto to_mod = storage.find(1);
storage.modify(to_mod, [](test_size& ts) { ts.s = 14; });
BOOST_CHECK_EQUAL( storage.size(), 34);
BOOST_CHECK_EQUAL( storage.memory_size(), 34);
BOOST_CHECK_EQUAL( storage.index().size(), 3);
storage.modify(to_mod, [](test_size& ts) { ts.s = 0; });
BOOST_CHECK_EQUAL( storage.size(), 20);
BOOST_CHECK_EQUAL( storage.memory_size(), 20);
BOOST_CHECK(!storage.insert(test_size{ 1, 100 }).second);
BOOST_CHECK_EQUAL( storage.memory_size(), 20);
BOOST_CHECK_EQUAL( storage.index().size(), 3);
storage.erase(2);
BOOST_CHECK_EQUAL( storage.size(), 5);
BOOST_CHECK_EQUAL( storage.memory_size(), 5);
BOOST_CHECK_NO_THROW(storage.erase(2));
}

BOOST_AUTO_TEST_CASE(simple_write_read_file_storage_test) {
using tracked_storage1 = fc::tracked_storage<test_size_container>;
tracked_storage1 storage1_1;
BOOST_CHECK_EQUAL( storage1_1.size(), 0);
BOOST_CHECK_EQUAL( storage1_1.memory_size(), 0);
BOOST_CHECK_EQUAL( storage1_1.index().size(), 0);

fc::temp_directory td;
Expand All @@ -93,7 +100,7 @@ BOOST_AUTO_TEST_CASE(simple_write_read_file_storage_test) {
tracked_storage1 storage1_2;
BOOST_CHECK(storage1_2.read(ds, 500));
BOOST_CHECK_EQUAL( storage1_2.index().size(), 0);
BOOST_CHECK_EQUAL( storage1_2.size(), 0);
BOOST_CHECK_EQUAL( storage1_2.memory_size(), 0);

const auto tellp = content.tellp();
content.seek_end(0);
Expand All @@ -104,7 +111,7 @@ BOOST_AUTO_TEST_CASE(single_write_read_file_storage_test) { try {
using tracked_storage1 = fc::tracked_storage<test_size_container>;
tracked_storage1 storage1_1;
storage1_1.insert(test_size{ 0, 6 });
BOOST_CHECK_EQUAL( storage1_1.size(), 6);
BOOST_CHECK_EQUAL( storage1_1.memory_size(), 6);
BOOST_CHECK_EQUAL( storage1_1.index().size(), 1);
fc::temp_directory td;
auto out = fc::persistence_util::open_cfile_for_write(td.path(), "temp.dat");
Expand All @@ -124,7 +131,7 @@ BOOST_AUTO_TEST_CASE(single_write_read_file_storage_test) { try {
auto itr2 = primary_idx2.cbegin();
BOOST_CHECK_EQUAL( itr2->key, 0);
BOOST_CHECK_EQUAL( itr2->s, 6);
BOOST_CHECK_EQUAL( storage1_2.size(), 6);
BOOST_CHECK_EQUAL( storage1_2.memory_size(), 6);

const auto tellp = content.tellp();
content.seek_end(0);
Expand All @@ -142,7 +149,7 @@ BOOST_AUTO_TEST_CASE(write_read_file_storage_test) {
storage1_1.insert(test_size{ 16, 4 });
storage1_1.insert(test_size{ 19, 3 });
storage1_1.insert(test_size{ 25, 7 });
BOOST_CHECK_EQUAL( storage1_1.size(), 40);
BOOST_CHECK_EQUAL( storage1_1.memory_size(), 40);
BOOST_CHECK_EQUAL( storage1_1.index().size(), 8);

fc::temp_directory td;
Expand All @@ -154,7 +161,7 @@ BOOST_AUTO_TEST_CASE(write_read_file_storage_test) {
tracked_storage2 storage2_1;
const auto now = fc::time_point::now();
storage2_1.insert(test_size2{ 3, now, 7 });
BOOST_CHECK_EQUAL( storage2_1.size(), 7);
BOOST_CHECK_EQUAL( storage2_1.memory_size(), 7);
BOOST_CHECK_EQUAL( storage2_1.index().size(), 1);

storage2_1.write(out);
Expand Down Expand Up @@ -187,7 +194,7 @@ BOOST_AUTO_TEST_CASE(write_read_file_storage_test) {
BOOST_CHECK_EQUAL( itr2->s, 3);
BOOST_CHECK_EQUAL( (++itr2)->key, 25);
BOOST_CHECK_EQUAL( itr2->s, 7);
BOOST_CHECK_EQUAL( storage1_2.size(), 40);
BOOST_CHECK_EQUAL( storage1_2.memory_size(), 40);

tracked_storage2 storage2_2;
BOOST_CHECK(storage2_2.read(ds, 500));
Expand Down

0 comments on commit 5134c1a

Please sign in to comment.