packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Store filenames in sorted order 

I believe GHashTable order was stable for a given set of names, but
this will make it more explicit, and also allow for binary searching.
This commit is contained in:
Colin Walters 2011-11-07 12:26:47 -05:00
parent b2429445e4
commit e03ffa269b
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libostree/ostree-repo.c
View File

@ -1177,6 +1177,8 @@ import_parsed_tree (OstreeRepo *self,
GVariantBuilder files_builder; GVariantBuilder files_builder;
GVariantBuilder dirs_builder; GVariantBuilder dirs_builder;
GHashTableIter hash_iter; GHashTableIter hash_iter;
GSList *sorted_filenames = NULL;
GSList *iter;
gpointer key, value; gpointer key, value;
g_variant_builder_init (&files_builder, G_VARIANT_TYPE ("a(ss)")); g_variant_builder_init (&files_builder, G_VARIANT_TYPE ("a(ss)"));
@ -1187,17 +1189,39 @@ import_parsed_tree (OstreeRepo *self,
while (g_hash_table_iter_next (&hash_iter, &key, &value)) while (g_hash_table_iter_next (&hash_iter, &key, &value))
{ {
const char *name = key; const char *name = key;
const char *checksum = value; sorted_filenames = g_slist_prepend (sorted_filenames, (char*)name);
g_variant_builder_add (&files_builder, "(ss)", name, checksum);
} }
sorted_filenames = g_slist_sort (sorted_filenames, (GCompareFunc)strcmp);
for (iter = sorted_filenames; iter; iter = iter->next)
{
const char *name = iter->data;
const char *value;
value = g_hash_table_lookup (tree->files, name);
g_variant_builder_add (&files_builder, "(ss)", name, value);
}
g_slist_free (sorted_filenames);
sorted_filenames = NULL;
g_hash_table_iter_init (&hash_iter, tree->directories); g_hash_table_iter_init (&hash_iter, tree->directories);
while (g_hash_table_iter_next (&hash_iter, &key, &value)) while (g_hash_table_iter_next (&hash_iter, &key, &value))
{ {
const char *name = key; const char *name = key;
sorted_filenames = g_slist_prepend (sorted_filenames, (char*)name);
}
sorted_filenames = g_slist_sort (sorted_filenames, (GCompareFunc)strcmp);
for (iter = sorted_filenames; iter; iter = iter->next)
{
const char *name = iter->data;
GChecksum *dir_checksum = NULL; GChecksum *dir_checksum = NULL;
ParsedDirectoryData *dir = value; ParsedDirectoryData *dir;
dir = g_hash_table_lookup (tree->directories, name);
if (!import_parsed_tree (self, dir->tree_data, &dir_checksum, error)) if (!import_parsed_tree (self, dir->tree_data, &dir_checksum, error))
goto out; goto out;
@ -1207,6 +1231,9 @@ import_parsed_tree (OstreeRepo *self,
g_checksum_free (dir_checksum); g_checksum_free (dir_checksum);
} }
g_slist_free (sorted_filenames);
sorted_filenames = NULL;
serialized_tree = g_variant_new ("(u@a{sv}@a(ss)@a(sss))", serialized_tree = g_variant_new ("(u@a{sv}@a(ss)@a(sss))",
GUINT32_TO_BE (0), GUINT32_TO_BE (0),
create_empty_gvariant_dict (), create_empty_gvariant_dict (),
@ -1219,6 +1246,7 @@ import_parsed_tree (OstreeRepo *self,
ret = TRUE; ret = TRUE;
out: out:
g_slist_free (sorted_filenames);
if (builders_initialized) if (builders_initialized)
{ {
g_variant_builder_clear (&files_builder); g_variant_builder_clear (&files_builder);