Skip to content

Commit

Permalink
gvfs: allow "virtualizing" objects
Browse files Browse the repository at this point in the history
The idea is to allow blob objects to be missing from the local repository,
and to load them lazily on demand.

After discussing this idea on the mailing list, we will rename the feature
to "lazy clone" and work more on this.

Signed-off-by: Ben Peart <Ben.Peart@microsoft.com>
  • Loading branch information
Ben Peart authored and dscho committed Aug 16, 2023
1 parent d31f203 commit e491c47
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 0 deletions.
5 changes: 5 additions & 0 deletions config.c
Original file line number Diff line number Diff line change
Expand Up @@ -1807,6 +1807,11 @@ int git_default_core_config(const char *var, const char *value,
return 0;
}

if (!strcmp(var, "core.virtualizeobjects")) {
core_virtualize_objects = git_config_bool(var, value);
return 0;
}

/* Add other config variables here and to Documentation/config.txt. */
return platform_core_config(var, value, ctx, cb);
}
Expand Down
3 changes: 3 additions & 0 deletions connected.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "git-compat-util.h"
#include "environment.h"
#include "gettext.h"
#include "hex.h"
#include "gvfs.h"
Expand Down Expand Up @@ -50,6 +51,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
*/
if (gvfs_config_is_set(GVFS_FETCH_SKIP_REACHABILITY_AND_UPLOADPACK))
return 0;
if (core_virtualize_objects)
return 0;

if (!opt)
opt = &defaults;
Expand Down
1 change: 1 addition & 0 deletions environment.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ int core_gvfs;
int merge_log_config = -1;
int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
unsigned long pack_size_limit_cfg;
int core_virtualize_objects;
enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET;

#ifndef PROTECT_HFS_DEFAULT
Expand Down
2 changes: 2 additions & 0 deletions environment.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ struct strvec;
extern char comment_line_char;
extern int auto_comment_line_char;

extern int core_virtualize_objects;

/*
* Wrapper of getenv() that returns a strdup value. This value is kept
* in argv to be freed later.
Expand Down
23 changes: 23 additions & 0 deletions object-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
#include "setup.h"
#include "submodule.h"
#include "fsck.h"
#include "trace.h"
#include "hook.h"

/* The maximum size for an object header. */
#define MAX_HEADER_LEN 32
Expand Down Expand Up @@ -1552,6 +1554,20 @@ void disable_obj_read_lock(void)
pthread_mutex_destroy(&obj_read_mutex);
}

static int run_read_object_hook(const struct object_id *oid)
{
struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
int ret;
uint64_t start;

start = getnanotime();
strvec_push(&opt.args, oid_to_hex(oid));
ret = run_hooks_opt("read-object", &opt);
trace_performance_since(start, "run_read_object_hook");

return ret;
}

int fetch_if_missing = 1;

static int do_oid_object_info_extended(struct repository *r,
Expand All @@ -1564,6 +1580,7 @@ static int do_oid_object_info_extended(struct repository *r,
int rtype;
const struct object_id *real = oid;
int already_retried = 0;
int tried_hook = 0;


if (flags & OBJECT_INFO_LOOKUP_REPLACE)
Expand All @@ -1575,6 +1592,7 @@ static int do_oid_object_info_extended(struct repository *r,
if (!oi)
oi = &blank_oi;

retry:
co = find_cached_object(real);
if (co) {
if (oi->typep)
Expand Down Expand Up @@ -1606,6 +1624,11 @@ static int do_oid_object_info_extended(struct repository *r,
reprepare_packed_git(r);
if (find_pack_entry(r, real, &e))
break;
if (core_virtualize_objects && !tried_hook) {
tried_hook = 1;
if (!run_read_object_hook(oid))
goto retry;
}
}

/*
Expand Down

0 comments on commit e491c47

Please sign in to comment.