From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Turner Subject: [PATCH v7 06/33] refs: add a backend method structure with transaction functions Date: Mon, 29 Feb 2016 19:52:39 -0500 Message-ID: <1456793586-22082-7-git-send-email-dturner@twopensource.com> References: <1456793586-22082-1-git-send-email-dturner@twopensource.com> Cc: Ronnie Sahlberg , David Turner , Junio C Hamano To: git@vger.kernel.org, peff@peff.net, mhagger@alum.mit.edu, pclouds@gmail.com X-From: git-owner@vger.kernel.org Tue Mar 01 01:55:07 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aaYaf-0007oU-Sm for gcvg-git-2@plane.gmane.org; Tue, 01 Mar 2016 01:55:06 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754109AbcCAAy7 (ORCPT ); Mon, 29 Feb 2016 19:54:59 -0500 Received: from mail-qg0-f54.google.com ([209.85.192.54]:34422 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750819AbcCAAxd (ORCPT ); Mon, 29 Feb 2016 19:53:33 -0500 Received: by mail-qg0-f54.google.com with SMTP id b67so130614735qgb.1 for ; Mon, 29 Feb 2016 16:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=twopensource-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3MjW4kwuv7ffNyUFjpcxfNfl7ceGl3d4tbjxCawAqU4=; b=poq08nNh2jIqCGnUWVlB1BHbVFKx3s+kHSXAeNz6BXBNhskUptRLaE0aAQ5b/49ib7 onkh3dGLKI+pj8OPCIjO3gZnYS+YfNGbbSHLxI/u3IRX1oiVWZ72zzBYosH5hZDTuJC/ kEb+jvOT9FiU9q4t1lXqbBphrzG0wX4dXkGn4AHosnDTnVlr6IWRMed67tguMoMZ78oT LgBGUnFWYCowHyvpp1KoBiI+J87/ZqO/1h6ko5Zle6HSukQh4aCPBGFSDsIlwotFoqTB C8qhpJLu/p0Ck5iyjo7wLaGntxur0OfBUpV+yzdUmVOCEkbMC8jB5CN5F/TgsNq1dPpP 2hOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3MjW4kwuv7ffNyUFjpcxfNfl7ceGl3d4tbjxCawAqU4=; b=cGXl8OS0uZ/LHFnacnROtQTuxT7u/fuiKJQLH4wTKx+Er2bfFZVK3Bs4lP0nr1D0Cm UDDeUVMD0db9FsGSfIP6mJ/yAIpL2HMzyvA1AvfIlINhTxr0BlwJnYby6h8ysn1ptS1w EWbIhT5vJkxXF3wX90BqwmbSvSW9WGzy8KiOV/p8MLS5ew2wT25yYa/ataMjmVmsbjRN aGniek04eBig95fYhImHSgJXvajnYRFjC7uqJDP5U+0KELlWwS4+wy7+6NVSmpnzJalv EcQ7HYGSYvWaVHzey0Pi3lywjPn4ABzDFGSgp/Txo1zWg3+1GuZ70DpSUN8KlotrT2SG UYVA== X-Gm-Message-State: AD7BkJKbYPI6PGycDhFqaJDStqKJNcRJ3r6t2j6AMC+v+5GPVmJyglo2joF3gdJ+TWJFJQ== X-Received: by 10.140.152.78 with SMTP id 75mr23404371qhy.22.1456793612274; Mon, 29 Feb 2016 16:53:32 -0800 (PST) Received: from ubuntu.twitter.biz ([192.133.79.145]) by smtp.gmail.com with ESMTPSA id z62sm12094715qka.26.2016.02.29.16.53.30 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Feb 2016 16:53:30 -0800 (PST) X-Mailer: git-send-email 2.4.2.767.g62658d5-twtrsrc In-Reply-To: <1456793586-22082-1-git-send-email-dturner@twopensource.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Ronnie Sahlberg 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 Signed-off-by: David Turner Signed-off-by: Junio C Hamano Signed-off-by: Jeff King --- 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