This patch keeps the tree entries of a tree_content in
order, sorted by entry name. The lookup in find_tree_entry
now performs a binary search instead of a linear search.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
fast-import.c | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index ac14a5a..4cd01ee 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -594,13 +594,47 @@ static struct tree_content *grow_tree_content(
return r;
}
+static int find_tree_entry_bsearch(struct tree_content *t,
+ struct atom_str *s,
+ int *found)
+{
+ int high, low, mid=0, cmp=-1;
+ low = 0;
+ high = t->entry_count - 1;
+ while (low <= high) {
+ mid = low + ((high - low) / 2);
+ cmp = strcmp(s->str_dat, t->entries[mid]->name->str_dat);
+ if (cmp < 0)
+ high = mid - 1;
+ else if (cmp > 0)
+ low = mid + 1;
+ else {
+ *found = 1;
+ return mid;
+ }
+ }
+ *found = 0;
+ return cmp < 0 ? mid : mid + 1;
+}
+
static int find_tree_entry(struct tree_content *t, struct atom_str *s)
{
- int i;
- for (i = 0; i < t->entry_count; i++)
- if (!strcmp(t->entries[i]->name->str_dat, s->str_dat))
- return i;
- return -1;
+ int i, found;
+ i = find_tree_entry_bsearch(t, s, &found);
+ return found ? i : -1;
+}
+
+static void insert_tree_content(struct tree_content *t, struct tree_entry *e)
+{
+ int i, found;
+
+ i = find_tree_entry_bsearch(t, e->name, &found);
+ if (found)
+ die("BUG: duplicate tree content");
+ memmove(t->entries + i + 1, t->entries + i,
+ sizeof(t->entries[0]) * (t->entry_count - i));
+ t->entries[i] = e;
+ t->entry_count++;
}
static struct tree_entry *new_tree_entry(void)
@@ -1080,7 +1114,7 @@ static void load_tree(struct tree_entry *root)
hashcpy(e->versions[1].sha1, (unsigned char*)c);
c += 20;
- t->entries[t->entry_count++] = e;
+ insert_tree_content(t, e);
}
free(buf);
}
@@ -1241,7 +1275,7 @@ static int tree_content_set(
e->name = name;
e->versions[0].mode = 0;
hashclr(e->versions[0].sha1);
- t->entries[t->entry_count++] = e;
+ insert_tree_content(t, e);
if (slash1) {
e->tree = new_tree_content(8);
e->versions[1].mode = S_IFDIR;
--
1.5.0.3.931.g55c05
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html