Skip to content

fixup! multi-pack-index: implement 'expire' verb #106

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

Closed
derrickstolee wants to merge 1 commit into from
Closed

fixup! multi-pack-index: implement 'expire' verb #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 37 additions & 4 deletions midx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
struct pack_midx_entry *entries = NULL;
int large_offsets_needed = 0;
int result = 0;
uint32_t *expire_int_ids = NULL;

midx_name = get_midx_filename(object_dir);
if (safe_create_leading_directories(midx_name)) {
Expand All @@ -792,6 +793,9 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
ALLOC_ARRAY(packs.names, packs.alloc_names);
ALLOC_ARRAY(packs.perm, packs.alloc_perm);

if (packs_to_drop && packs_to_drop->nr)
expire_int_ids = xcalloc(packs_to_drop->nr, sizeof(uint32_t));

if (packs.m) {
int drop_index = 0, missing_drops = 0;
for (i = 0; i < packs.m->num_packs; i++) {
Expand All @@ -800,8 +804,8 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
packs_to_drop->items[drop_index].string);

if (!cmp) {
expire_int_ids[drop_index] = i;
Copy link

@jeffhostetler jeffhostetler Jan 4, 2019

Choose a reason for hiding this comment

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

GH won't let me make a comment on a non delta line, so this is the closest line.

https://github.com/Microsoft/git/pull/106/files#diff-4d791aa648626485aa1adb43d8972a33R812

On line 812 below, incrementing drop_index will leave a zero cell in expire_int_ids[].
Can't tell yet if that is a good thing or a bad thing.

Copy link

@jeffhostetler jeffhostetler Jan 4, 2019

Choose a reason for hiding this comment

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

Never mind. looks like you throw an error at 830 when that happens.

drop_index++;
continue;
} else if (cmp > 0) {
error(_("did not see pack-file %s to drop"),
packs_to_drop->items[drop_index].string);
Expand Down Expand Up @@ -832,15 +836,43 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *

for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs);

if (packs.m && packs.nr == packs.m->num_packs)
if (packs.m && packs.nr == packs.m->num_packs && !packs_to_drop)
goto cleanup;

sort_packs_by_name(packs.names, packs.nr, packs.perm);

if (packs_to_drop && packs_to_drop->nr) {
int drop_index = 0;
int j;

/* truncate the list of packs */
Copy link

@jeffhostetler jeffhostetler Jan 4, 2019

Choose a reason for hiding this comment

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

nit: the word "truncate" is misleading here. to me that says to lop of the end. but you're collapsing the newly created holes.

for (i = 0; i < packs.nr; i++) {
if (drop_index < packs_to_drop->nr &&
!strcmp(packs.names[i], packs_to_drop->items[drop_index].string)) {
packs.pack_name_concat_len -= strlen(packs_to_drop->items[drop_index].string) + 1;
drop_index++;
} else {
packs.list[i - drop_index] = packs.list[i];
packs.names[i - drop_index] = packs.names[i];
}
}

for (j = packs_to_drop->nr - 1; j >= 0; j--) {
int expired_int_id = packs.perm[expire_int_ids[j]];
Copy link

@jeffhostetler jeffhostetler Jan 4, 2019

Choose a reason for hiding this comment

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

nit: maybe "int permuted_int_id" ?


for (i = 0; i < packs.nr; i++) {
if (packs.perm[i] > expired_int_id)
packs.perm[i] = packs.perm[i] - 1;
}
}

packs.nr = packs.nr - packs_to_drop->nr;
}

if (packs.pack_name_concat_len % MIDX_CHUNK_ALIGNMENT)
packs.pack_name_concat_len += MIDX_CHUNK_ALIGNMENT -
(packs.pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);

sort_packs_by_name(packs.names, packs.nr, packs.perm);

entries = get_sorted_entries(packs.m, packs.list, packs.perm, packs.nr, &nr_entries);

for (i = 0; i < nr_entries; i++) {
Expand Down Expand Up @@ -962,6 +994,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
free(packs.perm);
free(entries);
free(midx_name);
free(expire_int_ids);
return result;
}

Expand Down
28 changes: 28 additions & 0 deletions t/t5319-multi-pack-index.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,4 +446,32 @@ test_expect_success 'expire removes repacked packs' '
)
'

test_expect_success 'expire works when adding new packs' '
(
cd dup &&
git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
refs/heads/A
^refs/heads/B
EOF
git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
refs/heads/B
^refs/heads/C
EOF
git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
refs/heads/C
^refs/heads/D
EOF
git multi-pack-index write &&
git pack-objects --revs .git/objects/pack/pack-a <<-EOF &&
refs/heads/D
^refs/heads/E
EOF
git multi-pack-index write &&
git pack-objects --revs .git/objects/pack/pack-z <<-EOF &&
refs/heads/E
EOF
git multi-pack-index expire &&
git multi-pack-index verify
)
'
test_done