mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
prune: factor out loose-object directory traversal
Prune has to walk $GIT_DIR/objects/?? in order to find the set of loose objects to prune. Other parts of the code (e.g., count-objects) want to do the same. Let's factor it out into a reusable for_each-style function. Note that this is not quite a straight code movement. The original code had strange behavior when it found a file of the form "[0-9a-f]{2}/.{38}" that did _not_ contain all hex digits. It executed a "break" from the loop, meaning that we stopped pruning in that directory (but still pruned other directories!). This was probably a bug; we do not want to process the file as an object, but we should keep going otherwise (and that is how the new code handles it). We are also a little more careful with loose object directories which fail to open. The original code silently ignored any failures, but the new code will complain about any problems besides ENOENT. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
718ccc9731
commit
27e1e22d5e
3 changed files with 143 additions and 61 deletions
|
@ -31,11 +31,23 @@ static int prune_tmp_file(const char *fullpath)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int prune_object(const char *fullpath, const unsigned char *sha1)
|
||||
static int prune_object(const unsigned char *sha1, const char *fullpath,
|
||||
void *data)
|
||||
{
|
||||
struct stat st;
|
||||
if (lstat(fullpath, &st))
|
||||
return error("Could not stat '%s'", fullpath);
|
||||
|
||||
/*
|
||||
* Do we know about this object?
|
||||
* It must have been reachable
|
||||
*/
|
||||
if (lookup_object(sha1))
|
||||
return 0;
|
||||
|
||||
if (lstat(fullpath, &st)) {
|
||||
/* report errors, but do not stop pruning */
|
||||
error("Could not stat '%s'", fullpath);
|
||||
return 0;
|
||||
}
|
||||
if (st.st_mtime > expire)
|
||||
return 0;
|
||||
if (show_only || verbose) {
|
||||
|
@ -48,68 +60,20 @@ static int prune_object(const char *fullpath, const unsigned char *sha1)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int prune_dir(int i, struct strbuf *path)
|
||||
static int prune_cruft(const char *basename, const char *path, void *data)
|
||||
{
|
||||
size_t baselen = path->len;
|
||||
DIR *dir = opendir(path->buf);
|
||||
struct dirent *de;
|
||||
|
||||
if (!dir)
|
||||
return 0;
|
||||
|
||||
while ((de = readdir(dir)) != NULL) {
|
||||
char name[100];
|
||||
unsigned char sha1[20];
|
||||
|
||||
if (is_dot_or_dotdot(de->d_name))
|
||||
continue;
|
||||
if (strlen(de->d_name) == 38) {
|
||||
sprintf(name, "%02x", i);
|
||||
memcpy(name+2, de->d_name, 39);
|
||||
if (get_sha1_hex(name, sha1) < 0)
|
||||
break;
|
||||
|
||||
/*
|
||||
* Do we know about this object?
|
||||
* It must have been reachable
|
||||
*/
|
||||
if (lookup_object(sha1))
|
||||
continue;
|
||||
|
||||
strbuf_addf(path, "/%s", de->d_name);
|
||||
prune_object(path->buf, sha1);
|
||||
strbuf_setlen(path, baselen);
|
||||
continue;
|
||||
}
|
||||
if (starts_with(de->d_name, "tmp_obj_")) {
|
||||
strbuf_addf(path, "/%s", de->d_name);
|
||||
prune_tmp_file(path->buf);
|
||||
strbuf_setlen(path, baselen);
|
||||
continue;
|
||||
}
|
||||
fprintf(stderr, "bad sha1 file: %s/%s\n", path->buf, de->d_name);
|
||||
}
|
||||
closedir(dir);
|
||||
if (!show_only)
|
||||
rmdir(path->buf);
|
||||
if (starts_with(basename, "tmp_obj_"))
|
||||
prune_tmp_file(path);
|
||||
else
|
||||
fprintf(stderr, "bad sha1 file: %s\n", path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void prune_object_dir(const char *path)
|
||||
static int prune_subdir(int nr, const char *path, void *data)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
size_t baselen;
|
||||
int i;
|
||||
|
||||
strbuf_addstr(&buf, path);
|
||||
strbuf_addch(&buf, '/');
|
||||
baselen = buf.len;
|
||||
|
||||
for (i = 0; i < 256; i++) {
|
||||
strbuf_addf(&buf, "%02x", i);
|
||||
prune_dir(i, &buf);
|
||||
strbuf_setlen(&buf, baselen);
|
||||
}
|
||||
if (!show_only)
|
||||
rmdir(path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -173,7 +137,8 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
|
|||
|
||||
mark_reachable_objects(&revs, 1, progress);
|
||||
stop_progress(&progress);
|
||||
prune_object_dir(get_object_directory());
|
||||
for_each_loose_file_in_objdir(get_object_directory(), prune_object,
|
||||
prune_cruft, prune_subdir, NULL);
|
||||
|
||||
prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0);
|
||||
remove_temporary_files(get_object_directory());
|
||||
|
|
33
cache.h
33
cache.h
|
@ -1239,6 +1239,39 @@ extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsig
|
|||
extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
|
||||
extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
|
||||
|
||||
/*
|
||||
* Iterate over the files in the loose-object parts of the object
|
||||
* directory "path", triggering the following callbacks:
|
||||
*
|
||||
* - loose_object is called for each loose object we find.
|
||||
*
|
||||
* - loose_cruft is called for any files that do not appear to be
|
||||
* loose objects. Note that we only look in the loose object
|
||||
* directories "objects/[0-9a-f]{2}/", so we will not report
|
||||
* "objects/foobar" as cruft.
|
||||
*
|
||||
* - loose_subdir is called for each top-level hashed subdirectory
|
||||
* of the object directory (e.g., "$OBJDIR/f0"). It is called
|
||||
* after the objects in the directory are processed.
|
||||
*
|
||||
* Any callback that is NULL will be ignored. Callbacks returning non-zero
|
||||
* will end the iteration.
|
||||
*/
|
||||
typedef int each_loose_object_fn(const unsigned char *sha1,
|
||||
const char *path,
|
||||
void *data);
|
||||
typedef int each_loose_cruft_fn(const char *basename,
|
||||
const char *path,
|
||||
void *data);
|
||||
typedef int each_loose_subdir_fn(int nr,
|
||||
const char *path,
|
||||
void *data);
|
||||
int for_each_loose_file_in_objdir(const char *path,
|
||||
each_loose_object_fn obj_cb,
|
||||
each_loose_cruft_fn cruft_cb,
|
||||
each_loose_subdir_fn subdir_cb,
|
||||
void *data);
|
||||
|
||||
struct object_info {
|
||||
/* Request */
|
||||
enum object_type *typep;
|
||||
|
|
84
sha1_file.c
84
sha1_file.c
|
@ -3264,3 +3264,87 @@ void assert_sha1_type(const unsigned char *sha1, enum object_type expect)
|
|||
die("%s is not a valid '%s' object", sha1_to_hex(sha1),
|
||||
typename(expect));
|
||||
}
|
||||
|
||||
static int for_each_file_in_obj_subdir(int subdir_nr,
|
||||
struct strbuf *path,
|
||||
each_loose_object_fn obj_cb,
|
||||
each_loose_cruft_fn cruft_cb,
|
||||
each_loose_subdir_fn subdir_cb,
|
||||
void *data)
|
||||
{
|
||||
size_t baselen = path->len;
|
||||
DIR *dir = opendir(path->buf);
|
||||
struct dirent *de;
|
||||
int r = 0;
|
||||
|
||||
if (!dir) {
|
||||
if (errno == ENOENT)
|
||||
return 0;
|
||||
return error("unable to open %s: %s", path->buf, strerror(errno));
|
||||
}
|
||||
|
||||
while ((de = readdir(dir))) {
|
||||
if (is_dot_or_dotdot(de->d_name))
|
||||
continue;
|
||||
|
||||
strbuf_setlen(path, baselen);
|
||||
strbuf_addf(path, "/%s", de->d_name);
|
||||
|
||||
if (strlen(de->d_name) == 38) {
|
||||
char hex[41];
|
||||
unsigned char sha1[20];
|
||||
|
||||
snprintf(hex, sizeof(hex), "%02x%s",
|
||||
subdir_nr, de->d_name);
|
||||
if (!get_sha1_hex(hex, sha1)) {
|
||||
if (obj_cb) {
|
||||
r = obj_cb(sha1, path->buf, data);
|
||||
if (r)
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (cruft_cb) {
|
||||
r = cruft_cb(de->d_name, path->buf, data);
|
||||
if (r)
|
||||
break;
|
||||
}
|
||||
}
|
||||
strbuf_setlen(path, baselen);
|
||||
|
||||
if (!r && subdir_cb)
|
||||
r = subdir_cb(subdir_nr, path->buf, data);
|
||||
|
||||
closedir(dir);
|
||||
return r;
|
||||
}
|
||||
|
||||
int for_each_loose_file_in_objdir(const char *path,
|
||||
each_loose_object_fn obj_cb,
|
||||
each_loose_cruft_fn cruft_cb,
|
||||
each_loose_subdir_fn subdir_cb,
|
||||
void *data)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
size_t baselen;
|
||||
int r = 0;
|
||||
int i;
|
||||
|
||||
strbuf_addstr(&buf, path);
|
||||
strbuf_addch(&buf, '/');
|
||||
baselen = buf.len;
|
||||
|
||||
for (i = 0; i < 256; i++) {
|
||||
strbuf_addf(&buf, "%02x", i);
|
||||
r = for_each_file_in_obj_subdir(i, &buf, obj_cb, cruft_cb,
|
||||
subdir_cb, data);
|
||||
strbuf_setlen(&buf, baselen);
|
||||
if (r)
|
||||
break;
|
||||
}
|
||||
|
||||
strbuf_release(&buf);
|
||||
return r;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue