Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support matching chunks using uncompressed digests in zck_delta_size and zckdl #112

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

Open
mrdis wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support matching chunks using uncompressed digests in zck_delta_size and zckdl #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58ab07c
Add comparison for uncompressed digests in index_read.c
mrdis Oct 17, 2025
fc0ffef
Add comparison for uncompressed digests in dl.c
mrdis Oct 17, 2025
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
21 changes: 14 additions & 7 deletions src/lib/dl/dl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,16 @@ bool ZCK_PUBLIC_API zck_copy_chunks(zckCtx *src, zckCtx *tgt) {
}
zckChunk *f = NULL;

HASH_FIND(hh, src_info->ht, tgt_idx->digest, tgt_idx->digest_size, f);
if(f && f->length == tgt_idx->length &&
f->comp_length == tgt_idx->comp_length)
/* If both archives has uncompressed data digests, check them instead of the compressed ones */
Copy link
Member

@jdieter jdieter Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think my preference here is to first check that the compression types are identical, and, if so, run HASH_FIND. If f is still NULL (either because the compression types weren't identical or because HASH_FIND didn't find a matching hash), then check if both have uncompressed sources, and if so, run HASH_FIND on the uncompressed sources. This ensures that matching compressed hashes are checked first, and we then only check for matching uncompressed sources if no matches were found.

if(src->has_uncompressed_source && tgt->has_uncompressed_source){
HASH_FIND(hhuncomp, src_info->htuncomp, tgt_idx->digest_uncompressed, tgt_idx->digest_size, f);
}else{
HASH_FIND(hh, src_info->ht, tgt_idx->digest, tgt_idx->digest_size, f);
}

if(f && f->length == tgt_idx->length)
write_and_verify_chunk(src, tgt, f, tgt_idx);

tgt_idx = tgt_idx->next;
}
return true;
Expand Down Expand Up @@ -279,13 +285,14 @@ bool ZCK_PUBLIC_API zck_find_matching_chunks(zckCtx *src, zckCtx *tgt) {
}

/*
* Compare digest for compressed data if the same compressor
Copy link
Member

@jdieter jdieter Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you make the above change, is this full change necessary? Maybe it's better to just duplicate the logic I suggested above?

* Compare digest for uncompressed data if both archives support it,
* otherwise compare digest for compressed data if the same compressor
* was iused
*/
if (src->comp.type == tgt->comp.type) {
HASH_FIND(hh, src_info->ht, tgt_idx->digest, tgt_idx->digest_size, f);
} else if (src->has_uncompressed_source && tgt->has_uncompressed_source) {
if (src->has_uncompressed_source && tgt->has_uncompressed_source) {
HASH_FIND(hhuncomp, src_info->htuncomp, tgt_idx->digest_uncompressed, tgt_idx->digest_size, f);
}else if (src->comp.type == tgt->comp.type) {
HASH_FIND(hh, src_info->ht, tgt_idx->digest, tgt_idx->digest_size, f);
} else {

}
Expand Down
14 changes: 11 additions & 3 deletions src/lib/index/index_read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,19 @@ bool ZCK_PUBLIC_API zck_compare_chunk_digest(zckChunk *a, zckChunk *b) {
} else {
ALLOCD_BOOL(NULL, b);
}

Copy link
Member

@jdieter jdieter Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer not to have spaces/tabs in empty lines.

if(a->digest_size != b->digest_size)
return false;
if(memcmp(a->digest, b->digest, a->digest_size) != 0)
return false;

if(a->zck->has_uncompressed_source && b->zck->has_uncompressed_source){
/* If both archives has uncompressed digest, compare them instead */
if(memcmp(a->digest_uncompressed, b->digest_uncompressed, a->digest_size) != 0)
return false;
}else {
if(memcmp(a->digest, b->digest, a->digest_size) != 0)
return false;
}

return true;
}

Expand Down
Loading