Skip to content

Commit

Permalink
introduce notes-cache interface
Browse files Browse the repository at this point in the history
Notes provide a fast lookup mechanism for data keyed by
sha1. This is ideal for caching certain operations, like
textconv filters.

This patch builds some infrastructure to make it simpler to
use notes trees as caches. In particular, caches:

  1. don't have arbitrary commit messages. They store a
     cache validity string in the commit, and clear the tree
     when the cache validity string changes.

  2. don't keep any commit history. The accumulated history
     of a a cache is just useless cruft.

  3. use a looser form of locking for ref updates. If two
     processes try to write to the cache simultaneously, it
     is OK if one overwrites the other, losing some changes.
     It's just a cache, so we will just end up with an extra
     miss.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
peff authored and gitster committed Apr 2, 2010
1 parent 40d52ff commit a941d5e
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Makefile
Expand Up @@ -486,6 +486,7 @@ LIB_H += log-tree.h
LIB_H += mailmap.h
LIB_H += merge-recursive.h
LIB_H += notes.h
LIB_H += notes-cache.h
LIB_H += object.h
LIB_H += pack.h
LIB_H += pack-refs.h
Expand Down Expand Up @@ -575,6 +576,7 @@ LIB_OBJS += merge-file.o
LIB_OBJS += merge-recursive.o
LIB_OBJS += name-hash.o
LIB_OBJS += notes.o
LIB_OBJS += notes-cache.o
LIB_OBJS += object.o
LIB_OBJS += pack-check.o
LIB_OBJS += pack-refs.o
Expand Down
94 changes: 94 additions & 0 deletions notes-cache.c
@@ -0,0 +1,94 @@
#include "cache.h"
#include "notes-cache.h"
#include "commit.h"
#include "refs.h"

static int notes_cache_match_validity(const char *ref, const char *validity)
{
unsigned char sha1[20];
struct commit *commit;
struct pretty_print_context pretty_ctx;
struct strbuf msg = STRBUF_INIT;
int ret;

if (read_ref(ref, sha1) < 0)
return 0;

commit = lookup_commit_reference_gently(sha1, 1);
if (!commit)
return 0;

memset(&pretty_ctx, 0, sizeof(pretty_ctx));
format_commit_message(commit, "%s", &msg, &pretty_ctx);
strbuf_trim(&msg);

ret = !strcmp(msg.buf, validity);
strbuf_release(&msg);

return ret;
}

void notes_cache_init(struct notes_cache *c, const char *name,
const char *validity)
{
struct strbuf ref = STRBUF_INIT;
int flags = 0;

memset(c, 0, sizeof(*c));
c->validity = xstrdup(validity);

strbuf_addf(&ref, "refs/notes/%s", name);
if (!notes_cache_match_validity(ref.buf, validity))
flags = NOTES_INIT_EMPTY;
init_notes(&c->tree, ref.buf, combine_notes_overwrite, flags);
strbuf_release(&ref);
}

int notes_cache_write(struct notes_cache *c)
{
unsigned char tree_sha1[20];
unsigned char commit_sha1[20];

if (!c || !c->tree.initialized || !c->tree.ref || !*c->tree.ref)
return -1;
if (!c->tree.dirty)
return 0;

if (write_notes_tree(&c->tree, tree_sha1))
return -1;
if (commit_tree(c->validity, tree_sha1, NULL, commit_sha1, NULL) < 0)
return -1;
if (update_ref("update notes cache", c->tree.ref, commit_sha1, NULL,
0, QUIET_ON_ERR) < 0)
return -1;

return 0;
}

char *notes_cache_get(struct notes_cache *c, unsigned char key_sha1[20],
size_t *outsize)
{
const unsigned char *value_sha1;
enum object_type type;
char *value;
unsigned long size;

value_sha1 = get_note(&c->tree, key_sha1);
if (!value_sha1)
return NULL;
value = read_sha1_file(value_sha1, &type, &size);

*outsize = size;
return value;
}

int notes_cache_put(struct notes_cache *c, unsigned char key_sha1[20],
const char *data, size_t size)
{
unsigned char value_sha1[20];

if (write_sha1_file(data, size, "blob", value_sha1) < 0)
return -1;
add_note(&c->tree, key_sha1, value_sha1, NULL);
return 0;
}
20 changes: 20 additions & 0 deletions notes-cache.h
@@ -0,0 +1,20 @@
#ifndef NOTES_CACHE_H
#define NOTES_CACHE_H

#include "notes.h"

struct notes_cache {
struct notes_tree tree;
char *validity;
};

void notes_cache_init(struct notes_cache *c, const char *name,
const char *validity);
int notes_cache_write(struct notes_cache *c);

char *notes_cache_get(struct notes_cache *c, unsigned char sha1[20], size_t
*outsize);
int notes_cache_put(struct notes_cache *c, unsigned char sha1[20],
const char *data, size_t size);

#endif /* NOTES_CACHE_H */

0 comments on commit a941d5e

Please sign in to comment.