Hash :
3315782c
Author :
Date :
2010-08-08T14:12:17
Redesigned the walking/object lookup interface The old 'git_revpool' object has been removed and split into two distinct objects with separate functionality, in order to have separate methods for object management and object walking. * A new object 'git_repository' does the high-level management of a repository's objects (commits, trees, tags, etc) on top of a 'git_odb'. Eventually, it will also manage other repository attributes (e.g. tag resolution, references, etc). See: src/git/repository.h * A new external method 'git_repository_lookup(repo, oid, type)' has been added to the 'git_repository' API. All object lookups (git_XXX_lookup()) are now wrappers to this method, and duplicated code has been removed. The method does automatic type checking and returns a generic 'git_revpool_object' that can be cast to any specific object. See: src/git/repository.h * The external methods for object parsing of repository objects (git_XXX_parse()) have been removed. Loading objects from the repository is now managed through the 'lookup' functions. These objects are loaded with minimal information, and the relevant parsing is done automatically when the user requests any of the parsed attributes through accessor methods. An attribute has been added to 'git_repository' in order to force the parsing of all the repository objects immediately after lookup. See: src/git/commit.h See: src/git/tag.h See: src/git/tree.h * The previous walking functionality of the revpool is now found in 'git_revwalk', which does the actual revision walking on a repository; the attributes when walking through commits in a database have been decoupled from the actual commit objects. This increases performance when accessing commits during the walk and allows to have several 'git_revwalk' instances working at the same time on top of the same repository, without having to load commits in memory several times. See: src/git/revwalk.h * The old 'git_revpool_table' has been renamed to 'git_hashtable' and now works as a generic hashtable with support for any kind of object and custom hash functions. See: src/hashtable.h * All the relevant unit tests have been updated, renamed and grouped accordingly. Signed-off-by: Vicent Marti <tanoku@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218
/*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2,
* as published by the Free Software Foundation.
*
* In addition to the permissions in the GNU General Public License,
* the authors give you unlimited permission to link the compiled
* version of this file into combinations with other programs,
* and to distribute those combinations without any restriction
* coming from the use of this file. (The General Public License
* restrictions do apply in other respects; for example, they cover
* modification of the file, and distribution when not linked into
* a combined executable.)
*
* This file is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "common.h"
#include "repository.h"
#include "commit.h"
static const int default_table_size = 32;
static const double max_load_factor = 0.65;
static void hashtable_resize(git_hashtable *table)
{
git_hashtable_node **new_nodes;
unsigned int new_size, i;
assert(table);
new_size = (table->size_mask + 1) * 2;
new_nodes = git__malloc(new_size * sizeof(git_hashtable_node *));
if (new_nodes == NULL)
return;
memset(new_nodes, 0x0, new_size * sizeof(git_hashtable_node *));
for (i = 0; i <= table->size_mask; ++i) {
git_hashtable_node *n;
unsigned int index;
while ((n = table->nodes[i]) != NULL) {
table->nodes[i] = n->next;
index = n->hash & (new_size - 1);
n->next = new_nodes[index];
new_nodes[index] = n;
}
}
free(table->nodes);
table->nodes = new_nodes;
table->size_mask = (new_size - 1);
table->max_count = (unsigned int)(new_size * max_load_factor);
}
git_hashtable *git_hashtable_alloc(unsigned int min_size,
git_hash_ptr hash,
git_hash_keyeq_ptr key_eq)
{
unsigned int i;
git_hashtable *table;
assert(hash && key_eq);
if ((table = git__malloc(sizeof(git_hashtable))) == NULL)
return NULL;
/* round up size to closest power of 2 */
min_size--;
min_size |= min_size >> 1;
min_size |= min_size >> 2;
min_size |= min_size >> 4;
min_size |= min_size >> 8;
min_size |= min_size >> 16;
table->size_mask = min_size;
table->count = 0;
table->max_count = (unsigned int)((min_size + 1) * max_load_factor);
table->hash = hash;
table->key_equal = key_eq;
table->nodes = git__malloc((min_size + 1) * sizeof(git_hashtable_node *));
if (table->nodes == NULL) {
free(table);
return NULL;
}
for (i = 0; i <= min_size; ++i)
table->nodes[i] = NULL;
return table;
}
void git_hashtable_clear(git_hashtable *table)
{
unsigned int index;
assert(table);
for (index = 0; index <= table->size_mask; ++index) {
git_hashtable_node *node, *next_node;
node = table->nodes[index];
while (node != NULL) {
next_node = node->next;
free(node);
node = next_node;
}
table->nodes[index] = NULL;
}
table->count = 0;
}
void git_hashtable_free(git_hashtable *table)
{
assert(table);
git_hashtable_clear(table);
free(table->nodes);
free(table);
}
int git_hashtable_insert(git_hashtable *table, const void *key, void *value)
{
git_hashtable_node *node;
uint32_t index, hash;
assert(table);
if (table->count + 1 > table->max_count)
hashtable_resize(table);
node = git__malloc(sizeof(git_hashtable_node));
if (node == NULL)
return GIT_ENOMEM;
hash = table->hash(key);
index = (hash & table->size_mask);
node->object = value;
node->hash = hash;
node->next = table->nodes[index];
table->nodes[index] = node;
table->count++;
return GIT_SUCCESS;
}
void *git_hashtable_lookup(git_hashtable *table, const void *key)
{
git_hashtable_node *node;
uint32_t index, hash;
assert(table);
hash = table->hash(key);
index = (hash & table->size_mask);
node = table->nodes[index];
while (node != NULL) {
if (node->hash == hash && table->key_equal(node->object, key))
return node->object;
node = node->next;
}
return NULL;
}
void git_hashtable_iterator_init(git_hashtable *table, git_hashtable_iterator *it)
{
assert(table && it);
memset(it, 0x0, sizeof(git_hashtable_iterator));
it->nodes = table->nodes;
it->current_node = NULL;
it->current_pos = 0;
it->size = table->size_mask + 1;
}
void *git_hashtable_iterator_next(git_hashtable_iterator *it)
{
git_hashtable_node *next = NULL;
assert(it);
while (it->current_node == NULL) {
if (it->current_pos >= it->size)
return NULL;
it->current_node = it->nodes[it->current_pos++];
}
next = it->current_node;
it->current_node = it->current_node->next;
return next->object;
}