From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: Ronnie Sahlberg <sahlberg@google.com>,
David Turner <dturner@twitter.com>
Subject: [PATCH 18/43] refs-be-files.c: add a backend method structure with transaction functions
Date: Wed, 2 Sep 2015 21:54:48 -0400 [thread overview]
Message-ID: <1441245313-11907-19-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1441245313-11907-1-git-send-email-dturner@twopensource.com>
From: Ronnie Sahlberg <sahlberg@google.com>
Add a ref structure for backend methods. Start by adding method pointers
for the transaction functions.
Add a function set_refs_backend to switch between backends. The files
based backend is the default.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: David Turner <dturner@twitter.com>
---
refs-be-files.c | 62 ++++++++++++++++++++++++++++-------------------
refs.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
refs.h | 36 +++++++++++++++++++++++++++
3 files changed, 148 insertions(+), 25 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 21b38cf..e86f1d9 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -3307,14 +3307,14 @@ struct ref_transaction {
enum ref_transaction_state state;
};
-struct ref_transaction *ref_transaction_begin(struct strbuf *err)
+static struct ref_transaction *files_transaction_begin(struct strbuf *err)
{
assert(err);
return xcalloc(1, sizeof(struct ref_transaction));
}
-void ref_transaction_free(struct ref_transaction *transaction)
+static void files_transaction_free(struct ref_transaction *transaction)
{
int i;
@@ -3341,12 +3341,12 @@ static struct ref_update *add_update(struct ref_transaction *transaction,
return update;
}
-int ref_transaction_update(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
- unsigned int flags, const char *msg,
- struct strbuf *err)
+static int files_transaction_update(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ const unsigned char *old_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
{
struct ref_update *update;
@@ -3377,11 +3377,11 @@ int ref_transaction_update(struct ref_transaction *transaction,
return 0;
}
-int ref_transaction_create(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *new_sha1,
- unsigned int flags, const char *msg,
- struct strbuf *err)
+static int files_transaction_create(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *new_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
{
if (!new_sha1 || is_null_sha1(new_sha1))
die("BUG: create called without valid new_sha1");
@@ -3389,11 +3389,11 @@ int ref_transaction_create(struct ref_transaction *transaction,
null_sha1, flags, msg, err);
}
-int ref_transaction_delete(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *old_sha1,
- unsigned int flags, const char *msg,
- struct strbuf *err)
+static int files_transaction_delete(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *old_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
{
if (old_sha1 && is_null_sha1(old_sha1))
die("BUG: delete called with old_sha1 set to zeros");
@@ -3402,11 +3402,11 @@ int ref_transaction_delete(struct ref_transaction *transaction,
flags, msg, err);
}
-int ref_transaction_verify(struct ref_transaction *transaction,
- const char *refname,
- const unsigned char *old_sha1,
- unsigned int flags,
- struct strbuf *err)
+int files_transaction_verify(struct ref_transaction *transaction,
+ const char *refname,
+ const unsigned char *old_sha1,
+ unsigned int flags,
+ struct strbuf *err)
{
if (!old_sha1)
die("BUG: verify called with old_sha1 set to NULL");
@@ -3432,8 +3432,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;
@@ -3819,3 +3819,15 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
unlock_ref(lock);
return -1;
}
+
+struct ref_be refs_be_files = {
+ NULL,
+ "files",
+ files_transaction_begin,
+ files_transaction_update,
+ files_transaction_create,
+ files_transaction_delete,
+ files_transaction_verify,
+ files_transaction_commit,
+ files_transaction_free,
+};
diff --git a/refs.c b/refs.c
index 0f4e19a..63cd001 100644
--- a/refs.c
+++ b/refs.c
@@ -4,6 +4,29 @@
#include "cache.h"
#include "refs.h"
#include "lockfile.h"
+/*
+ * We always have a files backend and it is the default.
+ */
+struct ref_be *the_refs_backend = &refs_be_files;
+/*
+ * List of all available backends
+ */
+struct ref_be *refs_backends = &refs_be_files;
+
+/*
+ * This function is used to switch to an alternate backend.
+ */
+int set_refs_backend(const char *name)
+{
+ struct ref_be *be;
+
+ for (be = refs_backends; be; be = be->next)
+ if (!strcmp(be->name, name)) {
+ the_refs_backend = be;
+ return 0;
+ }
+ return 1;
+}
static int is_per_worktree_ref(const char *refname)
{
@@ -877,3 +900,55 @@ int head_ref_namespaced(each_ref_fn fn, void *cb_data)
return ret;
}
+
+
+/* backend functions */
+struct ref_transaction *ref_transaction_begin(struct strbuf *err)
+{
+ return the_refs_backend->transaction_begin(err);
+}
+
+
+int ref_transaction_update(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ const unsigned char *old_sha1, unsigned int flags,
+ const char *msg, struct strbuf *err)
+{
+ return the_refs_backend->transaction_update(transaction,
+ refname, new_sha1, old_sha1, flags, msg, err);
+}
+
+int ref_transaction_create(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ unsigned int flags, const char *msg, struct strbuf *err)
+{
+ return the_refs_backend->transaction_create(transaction,
+ refname, new_sha1, flags, msg, err);
+}
+int ref_transaction_delete(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ unsigned int flags, const char *msg,
+ struct strbuf *err)
+{
+ return the_refs_backend->transaction_delete(transaction,
+ refname, old_sha1, flags, msg, err);
+}
+
+int ref_transaction_verify(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ unsigned int flags,
+ struct strbuf *err)
+{
+ return the_refs_backend->transaction_verify(transaction,
+ refname, old_sha1, flags, err);
+}
+
+int ref_transaction_commit(struct ref_transaction *transaction, struct strbuf *err)
+{
+ return the_refs_backend->transaction_commit(transaction, err);
+}
+
+void ref_transaction_free(struct ref_transaction *transaction)
+{
+ return the_refs_backend->transaction_free(transaction);
+}
diff --git a/refs.h b/refs.h
index e0c6ea1..ba52c8e 100644
--- a/refs.h
+++ b/refs.h
@@ -530,4 +530,40 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data);
+/* refs backends */
+typedef struct ref_transaction *(*ref_transaction_begin_fn)(struct strbuf *err);
+typedef int (*ref_transaction_update_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ const unsigned char *old_sha1, unsigned int flags,
+ const char *msg, struct strbuf *err);
+typedef int (*ref_transaction_create_fn)(
+ struct ref_transaction *transaction,
+ const char *refname, const unsigned char *new_sha1,
+ unsigned int flags, const char *msg, struct strbuf *err);
+typedef int (*ref_transaction_delete_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ unsigned int flags, const char *msg, struct strbuf *err);
+typedef int (*ref_transaction_verify_fn)(struct ref_transaction *transaction,
+ const char *refname, const unsigned char *old_sha1,
+ unsigned int flags, struct strbuf *err);
+typedef int (*ref_transaction_commit_fn)(struct ref_transaction *transaction,
+ struct strbuf *err);
+typedef void (*ref_transaction_free_fn)(struct ref_transaction *transaction);
+
+struct ref_be {
+ struct ref_be *next;
+ const char *name;
+ ref_transaction_begin_fn transaction_begin;
+ ref_transaction_update_fn transaction_update;
+ ref_transaction_create_fn transaction_create;
+ ref_transaction_delete_fn transaction_delete;
+ ref_transaction_verify_fn transaction_verify;
+ ref_transaction_commit_fn transaction_commit;
+ ref_transaction_free_fn transaction_free;
+};
+
+
+extern struct ref_be refs_be_files;
+int set_refs_backend(const char *name);
+
#endif /* REFS_H */
--
2.0.4.315.gad8727a-twtrsrc
next prev parent reply other threads:[~2015-09-03 1:55 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-03 1:54 [PATCH 00/43] refs lmdb backend David Turner
2015-09-03 1:54 ` [PATCH 01/43] refs.c: create a public version of verify_refname_available David Turner
2015-09-03 23:08 ` Junio C Hamano
2015-09-04 15:45 ` David Turner
2015-09-03 1:54 ` [PATCH 02/43] refs: make repack_without_refs and is_branch public David Turner
2015-09-03 1:54 ` [PATCH 04/43] refs.c: add a new refs.c file to hold all common refs code David Turner
2015-09-03 1:54 ` [PATCH 05/43] refs.c: move update_ref to refs.c David Turner
2015-09-03 1:54 ` [PATCH 06/43] refs.c: move delete_ref and delete_refs to the common code David Turner
2015-09-03 1:54 ` [PATCH 07/43] refs.c: move read_ref_at to the common refs file David Turner
2015-09-03 1:54 ` [PATCH 08/43] refs.c: move the hidden refs functions to the common code David Turner
2015-09-03 1:54 ` [PATCH 09/43] refs.c: move dwim and friend functions to the common refs code David Turner
2015-09-03 1:54 ` [PATCH 10/43] refs.c: move warn_if_dangling_symref* to the common code David Turner
2015-09-03 1:54 ` [PATCH 11/43] refs.c: move read_ref, read_ref_full and ref_exists " David Turner
2015-09-03 1:54 ` [PATCH 12/43] refs.c: move resolve_refdup to common David Turner
2015-09-03 1:54 ` [PATCH 13/43] refs.c: move check_refname_format to the common code David Turner
2015-09-03 1:54 ` [PATCH 14/43] refs.c: move is_branch " David Turner
2015-09-03 1:54 ` [PATCH 15/43] refs.c: move prettify_refname " David Turner
2015-09-03 1:54 ` [PATCH 16/43] refs.c: move ref iterators " David Turner
2015-09-03 1:54 ` [PATCH 17/43] refs.c: move head_ref_namespaced " David Turner
2015-09-03 1:54 ` David Turner [this message]
2015-09-03 1:54 ` [PATCH 19/43] refs-be-files.c: add methods for misc ref operations David Turner
2015-09-03 1:54 ` [PATCH 20/43] refs-be-files.c: add methods for the ref iterators David Turner
2015-09-25 20:54 ` Junio C Hamano
2015-09-25 21:28 ` David Turner
2015-09-25 21:33 ` Junio C Hamano
2015-09-03 1:54 ` [PATCH 21/43] refs-be-files.c: add method for for_each_reftype_ David Turner
2015-09-03 1:54 ` [PATCH 22/43] refs-be-files.c: add do_for_each_per_worktree_ref David Turner
2015-09-03 1:54 ` [PATCH 23/43] refs.c: move refname_is_safe to the common code David Turner
2015-09-03 1:54 ` [PATCH 24/43] refs.h: document make refname_is_safe and add it to header David Turner
2015-09-03 2:06 ` David Turner
2015-09-03 1:54 ` [PATCH 25/43] refs.c: move copy_msg to the common code David Turner
2015-09-03 1:54 ` [PATCH 26/43] refs.c: move peel_object " David Turner
2015-09-03 1:54 ` [PATCH 27/43] refs.c: move should_autocreate_reflog to " David Turner
2015-09-03 1:54 ` [PATCH 28/43] refs.c: add ref backend init function David Turner
2015-09-03 1:54 ` [PATCH 29/43] refs.c: add methods for reflog David Turner
2015-09-03 1:55 ` [PATCH 30/43] refs.c: add method for initial ref transaction commit David Turner
2015-09-03 1:55 ` [PATCH 31/43] initdb: move safe_create_dir into common code David Turner
2015-09-03 1:55 ` [PATCH 32/43] refs.c: add method for initializing refs db David Turner
2015-09-03 1:55 ` [PATCH 33/43] refs.c: make struct ref_transaction generic David Turner
2015-09-03 1:55 ` [PATCH 34/43] refs-be-files.c: add method to rename refs David Turner
2015-09-03 1:55 ` [PATCH 35/43] refs-be-files.c: add method to expire reflogs David Turner
2015-09-03 1:55 ` [PATCH 36/43] run-command: track total number of commands run David Turner
2015-09-03 1:55 ` [PATCH 37/43] refs: move some defines from refs-be-files.c to refs.h David Turner
2015-09-03 1:55 ` [PATCH 38/43] refs: make some files backend functions public David Turner
2015-09-03 1:55 ` [PATCH 39/43] refs: break out a ref conflict check David Turner
2015-09-03 1:55 ` [PATCH 40/43] refs: allow ref backend to be set for clone David Turner
2015-09-03 1:55 ` [PATCH 41/43] refs: add register_refs_backend David Turner
2015-09-03 1:55 ` [PATCH 42/43] refs: add LMDB refs backend David Turner
2015-09-03 23:16 ` Junio C Hamano
2015-09-03 1:55 ` [PATCH 43/43] refs: tests for db backend David Turner
2015-09-03 23:10 ` [PATCH 00/43] refs lmdb backend Junio C Hamano
2015-09-04 16:01 ` David Turner
2015-09-17 0:09 ` David Turner
2015-09-17 16:33 ` Junio C Hamano
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=1441245313-11907-19-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=dturner@twitter.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.