Skip to content

Remove unused KV read serialization #8303

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.

Sign up for GitHub

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

Merged
Amaury Chamayou (achamayou) merged 3 commits into from
Sep 7, 2026
+11 −38
Merged

Remove unused KV read serialization #8303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93d83c9
Remove unused KV read serialization
achamayou Sep 7, 2026
60be5a5
Remove redundant serialization compatibility test
achamayou Sep 7, 2026
f12037a
Merge branch 'main' into achamayou-remove-read-serialization-upstream
achamayou Sep 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/kv/committable_tx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ namespace ccf::kv
TxFlags flags = 0;
SerialisedEntryFlags entry_flags = 0;

void serialise_all_changes(
KvStoreSerialiser& serialiser, bool include_reads)
void serialise_all_changes(KvStoreSerialiser& serialiser)
{
// Process in security domain order
for (auto domain : {SecurityDomain::PUBLIC, SecurityDomain::PRIVATE})
Expand All @@ -77,7 +76,7 @@ namespace ccf::kv
const auto& changeset = it.second.changeset;
if (map->get_security_domain() == domain && changeset->has_writes())
{
map->serialise_changes(changeset.get(), serialiser, include_reads);
map->serialise_changes(changeset.get(), serialiser);
}
}
}
Expand All @@ -91,8 +90,7 @@ namespace ccf::kv
});
}

size_t projected_serialised_size(
const ccf::ClaimsDigest& claims_digest_, bool include_reads = false)
size_t projected_serialised_size(const ccf::ClaimsDigest& claims_digest_)
{
if (claims_digest_.empty())
{
Expand All @@ -115,7 +113,7 @@ namespace ccf::kv
ccf::crypto::Sha256Hash{},
claims_digest_);

serialise_all_changes(size_serialiser, include_reads);
serialise_all_changes(size_serialiser);

return size_serialiser.get_serialised_size();
}
Expand All @@ -124,8 +122,7 @@ namespace ccf::kv
ccf::crypto::Sha256Hash& commit_evidence_digest,
std::string& commit_evidence,
const ccf::ClaimsDigest& claims_digest_,
size_t max_transaction_size,
bool include_reads = false)
size_t max_transaction_size)
{
if (!committed)
{
Expand Down Expand Up @@ -173,7 +170,7 @@ namespace ccf::kv
false /* historical_hint */,
max_transaction_size);

serialise_all_changes(serialiser, include_reads);
serialise_all_changes(serialiser);
return serialiser.get_raw_data();
}

Expand Down
6 changes: 0 additions & 6 deletions src/kv/generic_serialise_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,6 @@ namespace ccf::kv
serialise_internal(ctr);
}

void serialise_read(const SerialisedKey& k, const Version& version) override
{
serialise_internal(k);
serialise_internal(version);
}

void serialise_write(
const SerialisedKey& k, const SerialisedValue& v) override
{
Expand Down
6 changes: 1 addition & 5 deletions src/kv/kv_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,6 @@ namespace ccf::kv
const std::vector<Version>& view_history) = 0;
virtual void serialise_entry_version(const Version& version) = 0;
virtual void serialise_count_header(uint64_t ctr) = 0;
virtual void serialise_read(
const SerialisedKey& k, const Version& version) = 0;
virtual void serialise_write(
const SerialisedKey& k, const SerialisedValue& v) = 0;
virtual void serialise_remove(const SerialisedKey& k) = 0;
Expand Down Expand Up @@ -641,9 +639,7 @@ namespace ccf::kv

virtual AbstractStore* get_store() = 0;
virtual void serialise_changes(
const AbstractChangeSet* changes,
KvStoreSerialiser& s,
bool include_reads) = 0;
const AbstractChangeSet* changes, KvStoreSerialiser& s) = 0;
virtual void compact(Version v) = 0;
virtual std::unique_ptr<Snapshot> snapshot(Version v) = 0;
virtual void post_compact() = 0;
Expand Down
22 changes: 4 additions & 18 deletions src/kv/untyped_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,7 @@ namespace ccf::kv::untyped
}

void serialise_changes(
const AbstractChangeSet* changes,
KvStoreSerialiser& s,
bool include_reads) override
const AbstractChangeSet* changes, KvStoreSerialiser& s) override
{
const auto* const non_abstract =
dynamic_cast<const ccf::kv::untyped::ChangeSet*>(changes);
Expand All @@ -342,21 +340,9 @@ namespace ccf::kv::untyped

s.start_map(name, security_domain);

if (include_reads)
{
s.serialise_entry_version(change_set.read_version);

s.serialise_count_header(change_set.reads.size());
for (const auto& [key, value] : change_set.reads)
{
s.serialise_read(key, std::get<0>(value));
}
}
else
{
s.serialise_entry_version(NoVersion);
s.serialise_count_header(0);
}
// Retain the legacy read-set headers for ledger compatibility.
s.serialise_entry_version(NoVersion);
s.serialise_count_header(0);

uint64_t write_ctr = 0;
uint64_t remove_ctr = 0;
Expand Down