From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, peff@peff.net, mhagger@alum.mit.edu,
pclouds@gmail.com
Cc: Ronnie Sahlberg <sahlberg@google.com>,
David Turner <dturner@twopensource.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v7 06/33] refs: add a backend method structure with transaction functions
Date: Mon, 29 Feb 2016 19:52:39 -0500 [thread overview]
Message-ID: <1456793586-22082-7-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1456793586-22082-1-git-send-email-dturner@twopensource.com>
From: Ronnie Sahlberg <sahlberg@google.com>
Add a ref structure for storage backend methods. Start by adding a
method pointer for the transaction commit function.
Add a function set_refs_backend to switch between storage
backends. The files based storage backend is the default.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jeff King <peff@peff.net>
---
refs.c | 40 ++++++++++++++++++++++++++++++++++++++++
refs.h | 7 +++++++
refs/files-backend.c | 10 ++++++++--
refs/refs-internal.h | 12 ++++++++++++
4 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index 15aabc6..2e8efa9 100644
--- a/refs.c
+++ b/refs.c
@@ -10,6 +10,38 @@
#include "tag.h"
/*
+ * We always have a files backend and it is the default.
+ */
+static struct ref_storage_be *the_refs_backend = &refs_be_files;
+/*
+ * List of all available backends
+ */
+static struct ref_storage_be *refs_backends = &refs_be_files;
+
+static struct ref_storage_be *find_ref_storage_backend(const char *name)
+{
+ struct ref_storage_be *be;
+ for (be = refs_backends; be; be = be->next)
+ if (!strcmp(be->name, name))
+ return be;
+ return NULL;
+}
+
+int set_ref_storage_backend(const char *name)
+{
+ struct ref_storage_be *be = find_ref_storage_backend(name);
+ if (!be)
+ return -1;
+ the_refs_backend = be;
+ return 0;
+}
+
+int ref_storage_backend_exists(const char *name)
+{
+ return find_ref_storage_backend(name) != NULL;
+}
+
+/*
* How to handle various characters in refnames:
* 0: An acceptable character for refs
* 1: End-of-component
@@ -1161,6 +1193,7 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
return do_for_each_ref(NULL, "", fn, 0,
DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
}
+
/* This function needs to return a meaningful errno on failure */
static const char *resolve_ref_1(const char *refname,
int resolve_flags,
@@ -1265,3 +1298,10 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
strbuf_release(&sb_path);
return ret;
}
+
+/* backend functions */
+int ref_transaction_commit(struct ref_transaction *transaction,
+ struct strbuf *err)
+{
+ return the_refs_backend->transaction_commit(transaction, err);
+}
diff --git a/refs.h b/refs.h
index 31a2fa6..3405842 100644
--- a/refs.h
+++ b/refs.h
@@ -509,4 +509,11 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data);
+/*
+ * Switch to an alternate ref storage backend.
+ */
+int set_ref_storage_backend(const char *name);
+
+int ref_storage_backend_exists(const char *name);
+
#endif /* REFS_H */
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 2fb7714..a509240 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3003,8 +3003,8 @@ static int ref_update_reject_duplicates(struct string_list *refnames,
return 0;
}
-int ref_transaction_commit(struct ref_transaction *transaction,
- struct strbuf *err)
+static int files_transaction_commit(struct ref_transaction *transaction,
+ struct strbuf *err)
{
int ret = 0, i;
int n = transaction->nr;
@@ -3390,3 +3390,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
unlock_ref(lock);
return -1;
}
+
+struct ref_storage_be refs_be_files = {
+ NULL,
+ "files",
+ files_transaction_commit,
+};
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 979a136..62ba0c0 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -212,4 +212,16 @@ int do_for_each_ref(const char *submodule, const char *base,
int read_raw_ref(const char *refname, unsigned char *sha1,
struct strbuf *symref, struct strbuf *sb_path,
unsigned int *flags);
+
+/* refs backends */
+typedef int ref_transaction_commit_fn(struct ref_transaction *transaction,
+ struct strbuf *err);
+
+struct ref_storage_be {
+ struct ref_storage_be *next;
+ const char *name;
+ ref_transaction_commit_fn *transaction_commit;
+};
+
+extern struct ref_storage_be refs_be_files;
#endif /* REFS_REFS_INTERNAL_H */
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-03-01 0:55 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 0:52 [PATCH v7 00/33] refs backend David Turner
2016-03-01 0:52 ` [PATCH v7 01/33] setup: call setup_git_directory_gently before accessing refs David Turner
2016-03-01 8:35 ` Jeff King
2016-03-01 23:47 ` David Turner
2016-03-02 0:33 ` David Turner
2016-03-02 2:45 ` Jeff King
2016-03-01 0:52 ` [PATCH v7 02/33] refs: move head_ref{,_submodule} to the common code David Turner
2016-03-01 0:52 ` [PATCH v7 03/33] refs: move for_each_*ref* functions into " David Turner
2016-03-01 0:52 ` [PATCH v7 04/33] files-backend: break out ref reading David Turner
2016-03-20 5:03 ` Michael Haggerty
2016-03-22 8:33 ` Michael Haggerty
2016-03-23 10:19 ` Michael Haggerty
2016-03-01 0:52 ` [PATCH v7 05/33] refs: move resolve_ref_unsafe into common code David Turner
2016-03-01 0:52 ` David Turner [this message]
2016-03-01 0:52 ` [PATCH v7 07/33] refs: add methods for misc ref operations David Turner
2016-03-01 0:52 ` [PATCH v7 08/33] refs: add method for do_for_each_ref David Turner
2016-03-01 0:52 ` [PATCH v7 09/33] refs: reduce the visibility of do_for_each_ref() David Turner
2016-03-24 7:07 ` Michael Haggerty
2016-03-24 18:56 ` David Turner
2016-03-01 0:52 ` [PATCH v7 10/33] refs: add do_for_each_per_worktree_ref David Turner
2016-03-01 0:52 ` [PATCH v7 11/33] refs: add methods for reflog David Turner
2016-03-01 0:52 ` [PATCH v7 12/33] refs: add method for initial ref transaction commit David Turner
2016-03-01 0:52 ` [PATCH v7 13/33] refs: add method for delete_refs David Turner
2016-03-01 0:52 ` [PATCH v7 14/33] refs: add methods to init refs db David Turner
2016-03-24 7:28 ` Michael Haggerty
2016-03-24 18:04 ` David Turner
2016-03-01 0:52 ` [PATCH v7 15/33] refs: add method to rename refs David Turner
2016-03-01 0:52 ` [PATCH v7 16/33] refs: handle non-normal ref renames David Turner
2016-03-01 0:52 ` [PATCH v7 17/33] refs: make lock generic David Turner
2016-03-24 19:45 ` Michael Haggerty
2016-03-01 0:52 ` [PATCH v7 18/33] refs: move duplicate check to common code David Turner
2016-03-01 0:52 ` [PATCH v7 19/33] refs: allow log-only updates David Turner
2016-04-21 14:17 ` Michael Haggerty
2016-04-25 16:46 ` David Turner
2016-03-01 0:52 ` [PATCH v7 20/33] refs: don't dereference on rename David Turner
2016-03-01 0:52 ` [PATCH v7 21/33] refs: on symref reflog expire, lock symref not referrent David Turner
2016-03-01 0:52 ` [PATCH v7 22/33] refs: resolve symbolic refs first David Turner
2016-03-01 0:52 ` [PATCH v7 23/33] refs: always handle non-normal refs in files backend David Turner
2016-03-01 0:52 ` [PATCH v7 24/33] init: allow alternate ref strorage to be set for new repos David Turner
2016-03-01 0:52 ` [PATCH v7 25/33] refs: check submodules' ref storage config David Turner
2016-03-01 0:52 ` [PATCH v7 26/33] clone: allow ref storage backend to be set for clone David Turner
2016-03-01 0:53 ` [PATCH v7 27/33] svn: learn ref-storage argument David Turner
2016-03-01 0:53 ` [PATCH v7 28/33] refs: register ref storage backends David Turner
2016-03-01 0:53 ` [PATCH v7 29/33] setup: configure ref storage on setup David Turner
2016-03-01 8:48 ` Jeff King
2016-03-01 14:50 ` Jeff King
2016-03-01 17:18 ` Ramsay Jones
2016-03-01 19:16 ` David Turner
2016-03-01 0:53 ` [PATCH v7 30/33] refs: break out resolve_ref_unsafe_submodule David Turner
2016-03-01 17:21 ` Ramsay Jones
2016-03-01 19:17 ` David Turner
2016-03-01 0:53 ` [PATCH v7 31/33] refs: add LMDB refs storage backend David Turner
2016-03-01 1:31 ` Duy Nguyen
2016-03-01 1:35 ` David Turner
2016-03-01 1:45 ` Duy Nguyen
2016-03-01 0:53 ` [PATCH v7 32/33] refs: tests for lmdb backend David Turner
2016-03-01 0:53 ` [PATCH v7 33/33] tests: add ref-storage argument David Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456793586-22082-7-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sahlberg@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).