Commit 652b2703b30168d3a56716fd7bb2b1a4d9392069
2018-06-22T20:43:22
only search one pack file while resolving deltas
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139
diff --git a/lib/pack.c b/lib/pack.c
index a191b9a..9a0723f 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -708,7 +708,8 @@ parse_offset_delta(off_t *base_offset, int fd, off_t offset)
static const struct got_error *
resolve_delta_chain(struct got_delta_chain *, struct got_repository *,
- int, size_t, const char *, off_t, size_t, int, size_t, unsigned int);
+ struct got_packidx *, int, size_t, const char *, off_t, size_t, int,
+ size_t, unsigned int);
static const struct got_error *
add_delta(struct got_delta_chain *deltas, const char *path_packfile,
@@ -730,9 +731,9 @@ add_delta(struct got_delta_chain *deltas, const char *path_packfile,
static const struct got_error *
resolve_offset_delta(struct got_delta_chain *deltas,
- struct got_repository *repo, int fd, size_t packfile_size,
- const char *path_packfile, off_t delta_offset, size_t tslen,
- int delta_type, size_t delta_size, unsigned int recursion)
+ struct got_repository *repo, struct got_packidx *packidx, int fd,
+ size_t packfile_size, const char *path_packfile, off_t delta_offset,
+ size_t tslen, int delta_type, size_t delta_size, unsigned int recursion)
{
const struct got_error *err;
@@ -772,19 +773,19 @@ resolve_offset_delta(struct got_delta_chain *deltas,
if (err)
return err;
- return resolve_delta_chain(deltas, repo, fd, packfile_size,
+ return resolve_delta_chain(deltas, repo, packidx, fd, packfile_size,
path_packfile, base_offset, base_tslen, base_type, base_size,
recursion - 1);
}
static const struct got_error *
resolve_ref_delta(struct got_delta_chain *deltas, struct got_repository *repo,
- int fd, const char *path_packfile, off_t delta_offset,
- size_t tslen, int delta_type, size_t delta_size, unsigned int recursion)
+ struct got_packidx *packidx, int fd, const char *path_packfile,
+ off_t delta_offset, size_t tslen, int delta_type, size_t delta_size,
+ unsigned int recursion)
{
const struct got_error *err;
struct got_object_id id;
- struct got_packidx *packidx;
int idx;
off_t base_offset;
uint8_t base_type;
@@ -816,9 +817,10 @@ resolve_ref_delta(struct got_delta_chain *deltas, struct got_repository *repo,
if (err)
return err;
- err = search_packidx(&packidx, &idx, repo, &id);
- if (err)
- return err;
+ /* Delta base must be in the same pack file. */
+ idx = get_object_idx(packidx, &id, repo);
+ if (idx == -1)
+ return got_error(GOT_ERR_BAD_PACKFILE);
base_offset = get_object_offset(packidx, idx);
if (base_offset == (uint64_t)-1) {
@@ -850,7 +852,7 @@ resolve_ref_delta(struct got_delta_chain *deltas, struct got_repository *repo,
if (err)
goto done;
- err = resolve_delta_chain(deltas, repo, base_pack->fd,
+ err = resolve_delta_chain(deltas, repo, packidx, base_pack->fd,
base_pack->filesize, path_base_packfile, base_offset,
base_tslen, base_type, base_size, recursion - 1);
done:
@@ -860,8 +862,9 @@ done:
static const struct got_error *
resolve_delta_chain(struct got_delta_chain *deltas, struct got_repository *repo,
- int fd, size_t packfile_size, const char *path_packfile, off_t delta_offset,
- size_t tslen, int delta_type, size_t delta_size, unsigned int recursion)
+ struct got_packidx *packidx, int fd, size_t packfile_size,
+ const char *path_packfile, off_t delta_offset, size_t tslen,
+ int delta_type, size_t delta_size, unsigned int recursion)
{
const struct got_error *err = NULL;
@@ -878,13 +881,14 @@ resolve_delta_chain(struct got_delta_chain *deltas, struct got_repository *repo,
delta_type, delta_size, 0, NULL, 0);
break;
case GOT_OBJ_TYPE_OFFSET_DELTA:
- err = resolve_offset_delta(deltas, repo, fd, packfile_size,
- path_packfile, delta_offset, tslen, delta_type, delta_size,
- recursion - 1);
+ err = resolve_offset_delta(deltas, repo, packidx, fd,
+ packfile_size, path_packfile, delta_offset, tslen,
+ delta_type, delta_size, recursion - 1);
break;
case GOT_OBJ_TYPE_REF_DELTA:
- err = resolve_ref_delta(deltas, repo, fd, path_packfile,
- delta_offset, tslen, delta_type, delta_size, recursion - 1);
+ err = resolve_ref_delta(deltas, repo, packidx, fd,
+ path_packfile, delta_offset, tslen, delta_type,
+ delta_size, recursion - 1);
break;
default:
return got_error(GOT_ERR_OBJ_TYPE);
@@ -895,8 +899,8 @@ resolve_delta_chain(struct got_delta_chain *deltas, struct got_repository *repo,
static const struct got_error *
open_delta_object(struct got_object **obj, struct got_repository *repo,
- const char *path_packfile, int fd, size_t packfile_size,
- struct got_object_id *id, off_t offset, size_t tslen,
+ struct got_packidx *packidx, const char *path_packfile, int fd,
+ size_t packfile_size, struct got_object_id *id, off_t offset, size_t tslen,
int delta_type, size_t delta_size)
{
const struct got_error *err = NULL;
@@ -922,8 +926,8 @@ open_delta_object(struct got_object **obj, struct got_repository *repo,
SIMPLEQ_INIT(&(*obj)->deltas.entries);
(*obj)->flags |= GOT_OBJ_FLAG_DELTIFIED;
- err = resolve_delta_chain(&(*obj)->deltas, repo, fd, packfile_size,
- path_packfile, offset, tslen, delta_type, delta_size,
+ err = resolve_delta_chain(&(*obj)->deltas, repo, packidx, fd,
+ packfile_size, path_packfile, offset, tslen, delta_type, delta_size,
GOT_DELTA_CHAIN_RECURSION_MAX);
if (err)
goto done;
@@ -994,8 +998,8 @@ open_packed_object(struct got_object **obj, struct got_repository *repo,
case GOT_OBJ_TYPE_OFFSET_DELTA:
case GOT_OBJ_TYPE_REF_DELTA:
- err = open_delta_object(obj, repo, path_packfile, pack->fd,
- pack->filesize, id, offset, tslen, type, size);
+ err = open_delta_object(obj, repo, packidx, path_packfile,
+ pack->fd, pack->filesize, id, offset, tslen, type, size);
break;
default: