From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 6BE3F1F62E for ; Sat, 30 Jun 2018 08:36:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933856AbeF3IgN (ORCPT ); Sat, 30 Jun 2018 04:36:13 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36003 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752665AbeF3IgF (ORCPT ); Sat, 30 Jun 2018 04:36:05 -0400 Received: by mail-wm0-f68.google.com with SMTP id u18-v6so4160147wmc.1 for ; Sat, 30 Jun 2018 01:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iYMt2VHuu6OucyZ1nZQEk2ekzIRVEX0pOa8duezqXzE=; b=SIQ6xCDdRoDPK2rsgkYRaABeBnYhmSEp5xNbxgsl/M8osrlCS5bavF69QV4Zir0/m/ /CsuGxxdk/5Jxri4oMwtPAh5MftI/pZz84C0Oyjq1rB9JFCHe0T5yIdWqqSR/lQCQtci 7DnWKlhVFWQJZbPki8LGxy8RYwfvO2RXSMqvSJsDgsogOETEN3bAj9Qj0CM/mf3eJc7z b33B13wbNFX38NxWosiLlKXuQhC9ap8OxxNwZH4zphv7Q/O98u5SPJarQlfMQraDVMQk tdLJ8VmrE3TJMb0nhET7XVc2DaY0XE64SVy4sqa17DuDzcPnTa4JlkWYu+iLLNMFHXaC YtSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iYMt2VHuu6OucyZ1nZQEk2ekzIRVEX0pOa8duezqXzE=; b=Fiue+RoS8Jc7AhnSeJwwlBJ9j4BrgmgzQgYWZYQvIvNz2+P8CDhNlH/V+utSltR/Cs KRaY0vUgL8r7HChppwTgY3K1E5Ux2AeLOza7+6hT8k+RwV8LaUDMbWfKwfXaE+SJpbVw PzhZM+aQcdFw1G7QcRAKvD+luAdKJ7V3pRzeqd2DrwUORATQx57XSQRE18x0CB7GyNx+ uyhKJeWqzXTn/zRPQKzQDw7wb5vBuMo9Si9pHcNWRNkYPDo+EjiDOx5d5aLWnNov4Ff+ uadXHkP52AJmfS5d3wqaT9evzRrWYBmBI95BLhuX1VjXa83zXXQTyy0iz8cqWPlq0C+4 npHg== X-Gm-Message-State: APt69E01EdRNGt+ZHvSuDmblNH5SPvG1t9pDZsseL9AaNufk8atI4Woa A6+1TIYNNaGYd3uer+T4LxSnUmcR X-Google-Smtp-Source: AAOMgpcYD7+IGpRwYxXBKNPPN1G3qbzs2LJZiXCzuh1H0u/6WGoPzHF5kY9IM9xr9gblK8tViabulA== X-Received: by 2002:a1c:574b:: with SMTP id l72-v6mr3909330wmb.56.1530347763464; Sat, 30 Jun 2018 01:36:03 -0700 (PDT) Received: from localhost.localdomain (89-95-107-230.abo.bbox.fr. [89.95.107.230]) by smtp.gmail.com with ESMTPSA id u70-v6sm5338356wmd.3.2018.06.30.01.36.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jun 2018 01:36:02 -0700 (PDT) From: Christian Couder X-Google-Original-From: Christian Couder To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Ben Peart , Jonathan Tan , Nguyen Thai Ngoc Duy , Mike Hommey , Lars Schneider , Eric Wong , Christian Couder , Jeff Hostetler , Eric Sunshine Subject: [PATCH v2 2/9] Add initial remote odb support Date: Sat, 30 Jun 2018 10:35:35 +0200 Message-Id: <20180630083542.20347-3-chriscool@tuxfamily.org> X-Mailer: git-send-email 2.18.0.138.g8117677157 In-Reply-To: <20180630083542.20347-1-chriscool@tuxfamily.org> References: <20180630083542.20347-1-chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The remote-odb.{c,h} files will contain the functions that are called by the rest of Git mostly from "sha1-file.c" to access the objects managed by the remote odbs. The odb-helper.{c,h} files will contain the functions to actually implement communication with either the internal functions or the external scripts or processes that will manage and provide remote git objects. For now only infrastructure to create helpers from the config and to check if there are remote odbs and odb helpers is implemented. We expect that there will not be a lot of helpers, so it is ok to use a simple linked list to manage them. Helped-by: Jeff King Signed-off-by: Christian Couder --- Makefile | 2 ++ odb-helper.c | 16 +++++++++ odb-helper.h | 19 +++++++++++ remote-odb.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ remote-odb.h | 7 ++++ 5 files changed, 137 insertions(+) create mode 100644 odb-helper.c create mode 100644 odb-helper.h create mode 100644 remote-odb.c create mode 100644 remote-odb.h diff --git a/Makefile b/Makefile index 0cb6590f24..5af048ddd5 100644 --- a/Makefile +++ b/Makefile @@ -896,6 +896,8 @@ LIB_OBJS += notes-cache.o LIB_OBJS += notes-merge.o LIB_OBJS += notes-utils.o LIB_OBJS += object.o +LIB_OBJS += odb-helper.o +LIB_OBJS += remote-odb.o LIB_OBJS += oidmap.o LIB_OBJS += oidset.o LIB_OBJS += packfile.o diff --git a/odb-helper.c b/odb-helper.c new file mode 100644 index 0000000000..b4d403ffa9 --- /dev/null +++ b/odb-helper.c @@ -0,0 +1,16 @@ +#include "cache.h" +#include "object.h" +#include "argv-array.h" +#include "odb-helper.h" +#include "run-command.h" +#include "sha1-lookup.h" + +struct odb_helper *odb_helper_new(const char *name, int namelen) +{ + struct odb_helper *o; + + o = xcalloc(1, sizeof(*o)); + o->name = xmemdupz(name, namelen); + + return o; +} diff --git a/odb-helper.h b/odb-helper.h new file mode 100644 index 0000000000..4b792a3896 --- /dev/null +++ b/odb-helper.h @@ -0,0 +1,19 @@ +#ifndef ODB_HELPER_H +#define ODB_HELPER_H + +/* + * An odb helper is a way to access a remote odb. + * + * Information in its fields comes from the config file [odb "NAME"] + * entries. + */ +struct odb_helper { + const char *name; /* odb..* */ + const char *remote; /* odb..promisorRemote */ + + struct odb_helper *next; +}; + +extern struct odb_helper *odb_helper_new(const char *name, int namelen); + +#endif /* ODB_HELPER_H */ diff --git a/remote-odb.c b/remote-odb.c new file mode 100644 index 0000000000..7156855155 --- /dev/null +++ b/remote-odb.c @@ -0,0 +1,93 @@ +#include "cache.h" +#include "remote-odb.h" +#include "odb-helper.h" +#include "config.h" + +static struct odb_helper *helpers; +static struct odb_helper **helpers_tail = &helpers; + +static struct odb_helper *find_or_create_helper(const char *name, int len) +{ + struct odb_helper *o; + + for (o = helpers; o; o = o->next) + if (!strncmp(o->name, name, len) && !o->name[len]) + return o; + + o = odb_helper_new(name, len); + *helpers_tail = o; + helpers_tail = &o->next; + + return o; +} + +static struct odb_helper *do_find_odb_helper(const char *remote) +{ + struct odb_helper *o; + + for (o = helpers; o; o = o->next) + if (o->remote && !strcmp(o->remote, remote)) + return o; + + return NULL; +} + +static int remote_odb_config(const char *var, const char *value, void *data) +{ + struct odb_helper *o; + const char *name; + int namelen; + const char *subkey; + + if (parse_config_key(var, "odb", &name, &namelen, &subkey) < 0) + return 0; + + o = find_or_create_helper(name, namelen); + + if (!strcmp(subkey, "promisorremote")) { + const char *remote; + int res = git_config_string(&remote, var, value); + + if (res) + return res; + + if (do_find_odb_helper(remote)) + return error(_("when parsing config key '%s' " + "helper for remote '%s' already exists"), + var, remote); + + o->remote = remote; + + return 0; + } + + return 0; +} + +static void remote_odb_init(void) +{ + static int initialized; + + if (initialized) + return; + initialized = 1; + + git_config(remote_odb_config, NULL); +} + +struct odb_helper *find_odb_helper(const char *remote) +{ + struct odb_helper *o; + + remote_odb_init(); + + if (!remote) + return helpers; + + return do_find_odb_helper(remote); +} + +int has_remote_odb(void) +{ + return !!find_odb_helper(NULL); +} diff --git a/remote-odb.h b/remote-odb.h new file mode 100644 index 0000000000..4c7b13695f --- /dev/null +++ b/remote-odb.h @@ -0,0 +1,7 @@ +#ifndef REMOTE_ODB_H +#define REMOTE_ODB_H + +extern struct odb_helper *find_odb_helper(const char *remote); +extern int has_remote_odb(void); + +#endif /* REMOTE_ODB_H */ -- 2.18.0.138.gac082779dc