[PATCH v5 34/40] external-odb: use 'odb=magic' attribute to mark odb blobs
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Aug 3, 2017, 09:19 UTC
- Message-ID
- <20170803091926.1755-35-chriscool@tuxfamily.org>
- In-Reply-To
- <20170803091926.1755-1-chriscool@tuxfamily.org>
To tell which blobs should be sent to the "magic" external odb, let's require that the blobs be marked using the 'odb=magic' attribute.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- external-odb.c | 22 ++++++++++++++++++++-- external-odb.h | 3 ++- sha1_file.c | 20 +++++++++++++++----- t/t0400-external-odb.sh | 3 +++ t/t0410-transfer-e-odb.sh | 3 +++ t/t0420-transfer-http-e-odb.sh | 3 +++ t/t0470-read-object-http-e-odb.sh | 3 +++ t/t0480-read-object-have-http-e-odb.sh | 3 +++ 8 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/external-odb.c b/external-odb.c index 084cd32e0b..e103514a46 100644 --- a/external-odb.c +++ b/external-odb.c @@ -1,6 +1,7 @@ #include "cache.h" #include "external-odb.h" #include "odb-helper.h" +#include "attr.h" static struct odb_helper *helpers; static struct odb_helper **helpers_tail = &helpers; @@ -155,8 +156,23 @@ int external_odb_get_object(const unsigned char *sha1) return external_odb_do_get_object(sha1); } +static int has_odb_attrs(struct odb_helper *o, const char *path) +{ + static struct attr_check *check; + + if (!check) + check = attr_check_initl("odb", NULL); + + if (!git_check_attr(path, check)) { + const char *value = check->items[0].value; + return value ? !strcmp(o->name, value) : 0; + } + return 0; +} + int external_odb_put_object(const void *buf, size_t len, - const char *type, unsigned char *sha1) + const char *type, unsigned char *sha1, + const char *path) { struct odb_helper *o; @@ -164,12 +180,14 @@ int external_odb_put_object(const void *buf, size_t len, return 1; /* For now accept only blobs */ - if (strcmp(type, "blob")) + if (!path || strcmp(type, "blob")) return 1; external_odb_init(); for (o = helpers; o; o = o->next) { + if (!has_odb_attrs(o, path)) + continue; int r = odb_helper_put_object(o, buf, len, type, sha1); if (r <= 0) return r; diff --git a/external-odb.h b/external-odb.h index 247b131fd5..9bd7856b60 100644 --- a/external-odb.h +++ b/external-odb.h @@ -6,6 +6,7 @@ int external_odb_has_object(const unsigned char *sha1); int external_odb_get_object(const unsigned char *sha1); int external_odb_get_direct(const unsigned char *sha1); int external_odb_put_object(const void *buf, size_t len, - const char *type, unsigned char *sha1); + const char *type, unsigned char *sha1, + const char *path); #endif /* EXTERNAL_ODB_H */ diff --git a/sha1_file.c b/sha1_file.c index fb34f0b18d..75188850da 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -3487,7 +3487,9 @@ static int freshen_packed_object(const unsigned char *sha1) return 1; } -int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1) +static int write_sha1_file_with_path(const void *buf, unsigned long len, + const char *type, unsigned char *sha1, + const char *path) { char hdr[32]; int hdrlen = sizeof(hdr); @@ -3496,13 +3498,19 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign * it out into .git/objects/??/?{38} file. */ write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen); - if (!external_odb_put_object(buf, len, type, sha1)) + if (!external_odb_put_object(buf, len, type, sha1, path)) return 0; if (freshen_packed_object(sha1) || freshen_loose_object(sha1)) return 0; return write_loose_object(sha1, hdr, hdrlen, buf, len, 0); } +int write_sha1_file(const void *buf, unsigned long len, + const char *type, unsigned char *sha1) +{ + write_sha1_file_with_path(buf, len, type, sha1, NULL); +} + int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags) { @@ -3637,7 +3645,8 @@ static int index_mem(unsigned char *sha1, void *buf, size_t size, } if (write_object) - ret = write_sha1_file(buf, size, typename(type), sha1); + ret = write_sha1_file_with_path(buf, size, typename(type), + sha1, path); else ret = hash_sha1_file(buf, size, typename(type), sha1); if (re_allocated) @@ -3659,8 +3668,9 @@ static int index_stream_convert_blob(unsigned char *sha1, int fd, write_object ? safe_crlf : SAFE_CRLF_FALSE); if (write_object) - ret = write_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB), - sha1); + ret = write_sha1_file_with_path(sbuf.buf, sbuf.len, + typename(OBJ_BLOB), + sha1, path); else ret = hash_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB), sha1); diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh index fa355bd7bb..f2c45a625c 100755 --- a/t/t0400-external-odb.sh +++ b/t/t0400-external-odb.sh @@ -73,6 +73,9 @@ test_expect_success 'helper can add objects to alt repo' ' test_expect_success 'commit adds objects to alt repo' ' test_config odb.magic.scriptCommand "$HELPER" && + echo "* odb=magic" >.gitattributes && + GIT_NO_EXTERNAL_ODB=1 git add .gitattributes && + GIT_NO_EXTERNAL_ODB=1 git commit -m "Add .gitattributes" && test_commit three && hash3=$(git ls-tree HEAD | grep three.t | cut -f1 | cut -d\ -f3) && content=$(cd alt-repo && git show "$hash3") && diff --git a/t/t0410-transfer-e-odb.sh b/t/t0410-transfer-e-odb.sh index 065ec7d759..fd3e37918c 100755 --- a/t/t0410-transfer-e-odb.sh +++ b/t/t0410-transfer-e-odb.sh @@ -111,6 +111,9 @@ test_expect_success 'setup other repo and its alternate repo' ' ' test_expect_success 'new blobs are put in first object store' ' + echo "* odb=magic" >.gitattributes && + GIT_NO_EXTERNAL_ODB=1 git add .gitattributes && + GIT_NO_EXTERNAL_ODB=1 git commit -m "Add .gitattributes" && test_commit one && hash1=$(git ls-tree HEAD | grep one.t | cut -f1 | cut -d\ -f3) && content=$(cd alt-repo1 && git show "$hash1") && diff --git a/t/t0420-transfer-http-e-odb.sh b/t/t0420-transfer-http-e-odb.sh index f84fe950ec..d307af0457 100755 --- a/t/t0420-transfer-http-e-odb.sh +++ b/t/t0420-transfer-http-e-odb.sh @@ -94,6 +94,9 @@ test_expect_success 'can delete uploaded files' ' FILES_DIR="httpd/www/files" test_expect_success 'new blobs are transfered to the http server' ' + echo "* odb=magic" >.gitattributes && + GIT_NO_EXTERNAL_ODB=1 git add .gitattributes && + GIT_NO_EXTERNAL_ODB=1 git commit -m "Add .gitattributes" && test_commit one && hash1=$(git ls-tree HEAD | grep one.t | cut -f1 | cut -d\ -f3) && echo "$hash1-4-blob" >expected && diff --git a/t/t0470-read-object-http-e-odb.sh b/t/t0470-read-object-http-e-odb.sh index 774528c04f..d814a43d59 100755 --- a/t/t0470-read-object-http-e-odb.sh +++ b/t/t0470-read-object-http-e-odb.sh @@ -62,6 +62,9 @@ test_expect_success 'can delete uploaded files' ' FILES_DIR="httpd/www/files" test_expect_success 'new blobs are transfered to the http server' ' + echo "* odb=magic" >.gitattributes && + GIT_NO_EXTERNAL_ODB=1 git add .gitattributes && + GIT_NO_EXTERNAL_ODB=1 git commit -m "Add .gitattributes" && test_commit one && hash1=$(git ls-tree HEAD | grep one.t | cut -f1 | cut -d\ -f3) && echo "$hash1-4-blob" >expected && diff --git a/t/t0480-read-object-have-http-e-odb.sh b/t/t0480-read-object-have-http-e-odb.sh index 056a40f2bb..fe1fac5ef3 100755 --- a/t/t0480-read-object-have-http-e-odb.sh +++ b/t/t0480-read-object-have-http-e-odb.sh @@ -62,6 +62,9 @@ test_expect_success 'can delete uploaded files' ' FILES_DIR="httpd/www/files" test_expect_success 'new blobs are transfered to the http server' ' + echo "* odb=magic" >.gitattributes && + GIT_NO_EXTERNAL_ODB=1 git add .gitattributes && + GIT_NO_EXTERNAL_ODB=1 git commit -m "Add .gitattributes" && test_commit one && hash1=$(git ls-tree HEAD | grep one.t | cut -f1 | cut -d\ -f3) && echo "$hash1-4-blob" >expected &&
-- 2.14.0.rc1.52.gf02fb0ddac.dirty