From: Junio C Hamano <gitster@pobox.com>
To: Johan Herland <johan@herland.net>
Cc: gitster@pobox.com, git@vger.kernel.org,
Johannes.Schindelin@gmx.de, trast@student.ethz.ch,
tavestbo@trolltech.com, git@drmicha.warpmail.net,
chriscool@tuxfamily.org, spearce@spearce.org
Subject: Re: [PATCHv6 13/14] Allow flexible organization of notes trees, using both commit date and SHA1
Date: Sat, 12 Sep 2009 11:41:23 -0700 [thread overview]
Message-ID: <7viqfof1kc.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1252771728-27206-14-git-send-email-johan@herland.net> (Johan Herland's message of "Sat\, 12 Sep 2009 18\:08\:47 +0200")
Johan Herland <johan@herland.net> writes:
> This is a major expansion of the notes lookup code to allow for variations
> in the notes tree organization. The variations allowed include mixing fanout
> schemes based on the commit dates of the annotated commits (aka. date-based
> fanout) with fanout schemes based on the SHA1 of the annotated commits (aka.
> SHA1-based fanout).
Will squash this in.
-- >8 --
From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 12 Sep 2009 11:36:42 -0700
Subject: [PATCH] notes.[ch] fixup: avoid unnamed struct members
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
notes.c | 82 +++++++++++++++++++++++++++++++-------------------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/notes.c b/notes.c
index c573ffa..9a92853 100644
--- a/notes.c
+++ b/notes.c
@@ -118,8 +118,8 @@ struct int_node {
struct int_node *parent;
unsigned char tree_sha1[20];
char period[11]; /* Enough to hold "YYYY-MM-DD" */
- };
- };
+ } s;
+ } u;
};
/*
@@ -182,7 +182,7 @@ static struct leaf_node *note_tree_find(struct int_node *tree, unsigned char n,
{
struct leaf_node *l;
unsigned char i = GET_NIBBLE(n, key_sha1);
- void *p = tree->a[i];
+ void *p = tree->u.a[i];
switch(GET_PTR_TYPE(p)) {
case PTR_TYPE_INTERNAL:
@@ -199,7 +199,7 @@ static struct leaf_node *note_tree_find(struct int_node *tree, unsigned char n,
l = (struct leaf_node *) CLR_PTR_TYPE(p);
if (!SUBTREE_SHA1_PREFIXCMP(key_sha1, l->key_sha1)) {
/* unpack tree and resume search */
- tree->a[i] = NULL;
+ tree->u.a[i] = NULL;
load_subtree(l->val_sha1, l->key_sha1, l->key_sha1[19],
tree, NULL, (int) n);
free(l);
@@ -214,16 +214,16 @@ static struct leaf_node *note_tree_find(struct int_node *tree, unsigned char n,
/*
* Did not find key at this (or any lower) level.
- * Check if there's a matching subtree entry in tree->a[0].
+ * Check if there's a matching subtree entry in tree->u.a[0].
* If so, unpack tree and resume search.
*/
- p = tree->a[0];
+ p = tree->u.a[0];
if (GET_PTR_TYPE(p) != PTR_TYPE_SUBTREE)
return NULL;
l = (struct leaf_node *) CLR_PTR_TYPE(p);
if (!SUBTREE_SHA1_PREFIXCMP(key_sha1, l->key_sha1)) {
/* unpack tree and resume search */
- tree->a[0] = NULL;
+ tree->u.a[0] = NULL;
load_subtree(l->val_sha1, l->key_sha1, l->key_sha1[19], tree,
NULL, (int) n);
free(l);
@@ -250,12 +250,12 @@ static int note_tree_insert(struct int_node *tree, unsigned char n,
const struct leaf_node *l;
int ret;
unsigned char i = GET_NIBBLE(n, entry->key_sha1);
- void *p = tree->a[i];
+ void *p = tree->u.a[i];
assert(GET_PTR_TYPE(entry) == PTR_TYPE_NULL);
switch(GET_PTR_TYPE(p)) {
case PTR_TYPE_NULL:
assert(!p);
- tree->a[i] = SET_PTR_TYPE(entry, type);
+ tree->u.a[i] = SET_PTR_TYPE(entry, type);
return 0;
case PTR_TYPE_INTERNAL:
return note_tree_insert(CLR_PTR_TYPE(p), n + 1, entry, type);
@@ -273,7 +273,7 @@ static int note_tree_insert(struct int_node *tree, unsigned char n,
free(new_node);
return -1;
}
- tree->a[i] = SET_PTR_TYPE(new_node, PTR_TYPE_INTERNAL);
+ tree->u.a[i] = SET_PTR_TYPE(new_node, PTR_TYPE_INTERNAL);
return note_tree_insert(new_node, n + 1, entry, type);
}
}
@@ -281,20 +281,20 @@ static int note_tree_insert(struct int_node *tree, unsigned char n,
/* Free the entire notes data contained in the given tree */
static void note_tree_free(struct int_node *tree)
{
- if (tree->magic == (void *) ~0) {
- if (tree->prev) {
- note_tree_free(tree->prev);
- free(tree->prev);
+ if (tree->u.s.magic == (void *) ~0) {
+ if (tree->u.s.prev) {
+ note_tree_free(tree->u.s.prev);
+ free(tree->u.s.prev);
}
- if (tree->child) {
- note_tree_free(tree->child);
- free(tree->child);
+ if (tree->u.s.magic) {
+ note_tree_free(tree->u.s.magic);
+ free(tree->u.s.magic);
}
}
else {
unsigned int i;
for (i = 0; i < 16; i++) {
- void *p = tree->a[i];
+ void *p = tree->u.a[i];
switch(GET_PTR_TYPE(p)) {
case PTR_TYPE_INTERNAL:
note_tree_free(CLR_PTR_TYPE(p));
@@ -439,12 +439,12 @@ static void load_date_subtree(struct tree_desc *tree_desc,
else /* this is the last entry, store directly into node */
new_node = node;
- new_node->magic = (void *) ~0;
- new_node->child = NULL;
- new_node->prev = cur_node;
- new_node->parent = parent;
- hashcpy(new_node->tree_sha1, entry.sha1);
- strcpy(new_node->period, period);
+ new_node->u.s.magic = (void *) ~0;
+ new_node->u.s.magic = NULL;
+ new_node->u.s.prev = cur_node;
+ new_node->u.s.parent = parent;
+ hashcpy(new_node->u.s.tree_sha1, entry.sha1);
+ strcpy(new_node->u.s.period, period);
cur_node = new_node;
}
assert(!cur_node || cur_node == node);
@@ -552,38 +552,38 @@ static unsigned char *lookup_notes(const struct commit *commit)
/* Convert commit->date to YYYY-MM-DD format */
short_date = show_date(commit->date, 0, DATE_SHORT);
- while (node->magic == (void *) ~0) { /* date-based node */
- int cmp = SUBTREE_DATE_PREFIXCMP(short_date, node->period);
+ while (node->u.s.magic == (void *) ~0) { /* date-based node */
+ int cmp = SUBTREE_DATE_PREFIXCMP(short_date, node->u.s.period);
if (cmp == 0) {
/* Search inside child node */
- if (!node->child) {
+ if (!node->u.s.magic) {
/* Must unpack child node first */
- node->child = (struct int_node *)
+ node->u.s.magic = (struct int_node *)
xcalloc(sizeof(struct int_node), 1);
- load_subtree(node->tree_sha1,
- (const unsigned char *) node->period,
- strlen(node->period), node->child,
+ load_subtree(node->u.s.tree_sha1,
+ (const unsigned char *) node->u.s.period,
+ strlen(node->u.s.period), node->u.s.magic,
node, -1);
}
seen_node = node;
- node = node->child;
+ node = node->u.s.magic;
}
else if (cmp > 0) {
/* Search in past node */
- if (node->prev)
- node = node->prev;
+ if (node->u.s.prev)
+ node = node->u.s.prev;
else
- node = node->parent;
+ node = node->u.s.parent;
}
else {
/* Search in future node */
- if (!node->parent) {
+ if (!node->u.s.parent) {
/* Restart from root_node */
seen_node = node;
node = &root_node;
}
else
- node = node->parent;
+ node = node->u.s.parent;
}
if (!node || node == seen_node) {
/* We've been here before, give up search */
@@ -591,15 +591,15 @@ static unsigned char *lookup_notes(const struct commit *commit)
}
}
while (cur_node &&
- SUBTREE_DATE_PREFIXCMP(cur_node->period, seen_node->period) < 0)
+ SUBTREE_DATE_PREFIXCMP(cur_node->u.s.period, seen_node->u.s.period) < 0)
{
/*
* We're about to move cur_node backwards in history. We are
* unlikely to need this cur_node in the future, so free() it.
*/
- note_tree_free(cur_node->child);
- cur_node->child = NULL;
- cur_node = cur_node->parent;
+ note_tree_free(cur_node->u.s.magic);
+ cur_node->u.s.magic = NULL;
+ cur_node = cur_node->u.s.parent;
}
cur_node = seen_node;
--
1.6.5.rc0.82.g1c5d9
next prev parent reply other threads:[~2009-09-12 18:41 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-08 2:26 [PATCHv5 00/14] git notes Johan Herland
2009-09-08 2:26 ` [PATCHv5 01/14] Introduce commit notes Johan Herland
2009-09-08 2:26 ` [PATCHv5 02/14] Add a script to edit/inspect notes Johan Herland
2009-09-08 2:26 ` [PATCHv5 03/14] Speed up git notes lookup Johan Herland
2009-09-08 2:26 ` [PATCHv5 04/14] Add an expensive test for git-notes Johan Herland
2009-09-08 2:26 ` [PATCHv5 05/14] Teach "-m <msg>" and "-F <file>" to "git notes edit" Johan Herland
2009-09-08 2:26 ` [PATCHv5 06/14] fast-import: Add support for importing commit notes Johan Herland
2009-09-08 2:26 ` [PATCHv5 07/14] t3302-notes-index-expensive: Speed up create_repo() Johan Herland
2009-09-08 2:26 ` [PATCHv5 08/14] Add flags to get_commit_notes() to control the format of the note string Johan Herland
2009-09-08 2:26 ` [PATCHv5 09/14] Add '%N'-format for pretty-printing commit notes Johan Herland
2009-09-08 2:26 ` [PATCHv5 10/14] Teach notes code to free its internal data structures on request Johan Herland
2009-09-08 2:26 ` [PATCHv5 11/14] Teach the notes lookup code to parse notes trees with various fanout schemes Johan Herland
2009-09-08 2:27 ` [PATCHv5 12/14] Selftests verifying semantics when loading notes trees with various fanouts Johan Herland
2009-09-08 2:27 ` [PATCHv5 13/14] Allow flexible organization of notes trees, using both commit date and SHA1 Johan Herland
2009-09-08 2:27 ` [PATCHv5 14/14] Add test cases for date-based fanouts Johan Herland
2009-09-08 3:12 ` [PATCHv5 00/14] git notes Johan Herland
2009-09-08 4:16 ` Junio C Hamano
2009-09-08 8:54 ` Johan Herland
2009-09-08 9:32 ` Johannes Schindelin
2009-09-08 12:36 ` Johan Herland
2009-09-08 15:53 ` Johannes Schindelin
2009-09-08 22:46 ` Johan Herland
2009-09-10 6:23 ` Stephen R. van den Berg
2009-09-10 9:25 ` Johan Herland
2009-09-08 20:31 ` Junio C Hamano
2009-09-08 21:10 ` Shawn O. Pearce
2009-09-08 21:36 ` Sverre Rabbelier
2009-09-08 21:39 ` Shawn O. Pearce
2009-09-08 21:57 ` Sverre Rabbelier
2009-09-08 21:40 ` Johan Herland
2009-09-12 15:50 ` Johan Herland
2009-09-12 18:11 ` Shawn O. Pearce
2009-09-12 18:35 ` Johan Herland
2009-09-10 14:00 ` Geert Bosch
2009-09-10 14:09 ` Michael J Gruber
2009-09-10 14:12 ` Geert Bosch
2009-09-12 0:11 ` Junio C Hamano
2009-09-12 15:52 ` Johan Herland
2009-09-12 16:08 ` [PATCHv6 " Johan Herland
2009-09-12 16:08 ` [PATCHv6 01/14] Introduce commit notes Johan Herland
2009-09-12 16:08 ` [PATCHv6 02/14] Add a script to edit/inspect notes Johan Herland
2009-09-12 16:08 ` [PATCHv6 03/14] Speed up git notes lookup Johan Herland
2009-09-12 16:08 ` [PATCHv6 04/14] Add an expensive test for git-notes Johan Herland
2009-09-12 16:08 ` [PATCHv6 05/14] Teach "-m <msg>" and "-F <file>" to "git notes edit" Johan Herland
2009-09-12 16:08 ` [PATCHv6 06/14] fast-import: Add support for importing commit notes Johan Herland
2009-09-12 16:08 ` [PATCHv6 07/14] t3302-notes-index-expensive: Speed up create_repo() Johan Herland
2009-09-12 16:08 ` [PATCHv6 08/14] Add flags to get_commit_notes() to control the format of the note string Johan Herland
2009-09-12 16:08 ` [PATCHv6 09/14] Add '%N'-format for pretty-printing commit notes Johan Herland
2009-09-12 16:08 ` [PATCHv6 10/14] Teach notes code to free its internal data structures on request Johan Herland
2009-09-12 18:40 ` Junio C Hamano
2009-09-12 22:21 ` Johan Herland
2009-09-12 16:08 ` [PATCHv6 11/14] Teach the notes lookup code to parse notes trees with various fanout schemes Johan Herland
2009-09-12 16:08 ` [PATCHv6 12/14] Selftests verifying semantics when loading notes trees with various fanouts Johan Herland
2009-09-12 16:08 ` [PATCHv6 13/14] Allow flexible organization of notes trees, using both commit date and SHA1 Johan Herland
2009-09-12 18:41 ` Junio C Hamano [this message]
2009-09-12 22:33 ` Johan Herland
2009-09-12 23:37 ` Junio C Hamano
2009-09-12 16:08 ` [PATCHv6 14/14] Add test cases for various date-based fanouts Johan Herland
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=7viqfof1kc.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=spearce@spearce.org \
--cc=tavestbo@trolltech.com \
--cc=trast@student.ethz.ch \
/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.