WindyMadman/seafile
1
0
Fork 0
mirror of https://github.com/haiwen/seafile.git synced 2025-01-09 04:17:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[client] Don't send or get duplicated fs objects.

Browse Source
This commit is contained in:
Jiaqiang Xu 2014-08-11 19:54:40 +08:00
parent 13695f5b05
commit 631fd43be9
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon/processors/getfs-v2-proc.c
View File

@ -276,10 +276,20 @@ calculate_needed_object_list (void *data)
TransferTask *task = proc->tx_task;
GList *ptr;
char *obj_id;
GHashTable *checked_objs;
int dummy;
checked_objs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
for (ptr = priv->recv_objs; ptr; ptr = ptr->next) {
obj_id = ptr->data;
if (g_hash_table_lookup (checked_objs, obj_id)) {
g_free (obj_id);
continue;
}
g_hash_table_insert (checked_objs, g_strdup(obj_id), &dummy);
if (!seaf_obj_store_obj_exists (seaf->fs_mgr->obj_store,
task->repo_id, task->repo_version,
obj_id))
@ -288,6 +298,7 @@ calculate_needed_object_list (void *data)
g_free (obj_id);
}
g_hash_table_destroy (checked_objs);
g_list_free (priv->recv_objs);
priv->recv_objs = NULL;

49
daemon/processors/sendfs-v2-proc.c
View File

@ -133,6 +133,11 @@ start (CcnetProcessor *processor, int argc, char **argv)
/* Calculate send object list */
typedef struct {
GList **pret;
GHashTable *checked_objs;
} CalcData;
inline static gboolean
dirent_same (SeafDirent *denta, SeafDirent *dentb)
{
@ -140,30 +145,48 @@ dirent_same (SeafDirent *denta, SeafDirent *dentb)
}
static int
collect_file_ids (int n, const char *basedir, SeafDirent *files[], void *data)
collect_file_ids (int n, const char *basedir, SeafDirent *files[], void *vdata)
{
SeafDirent *file1 = files[0];
SeafDirent *file2 = files[1];
GList **pret = data;
CalcData *data = vdata;
GList **pret = data->pret;
int dummy;
if (file1 && (!file2 || !dirent_same (file1, file2)) &&
strcmp (file1->id, EMPTY_SHA1) != 0)
if (!file1 || strcmp (file1->id, EMPTY_SHA1) == 0)
return 0;
if (g_hash_table_lookup (data->checked_objs, file1->id))
return 0;
if (!file2 || !dirent_same (file1, file2)) {
*pret = g_list_prepend (*pret, g_strdup(file1->id));
g_hash_table_insert (data->checked_objs, g_strdup(file1->id), &dummy);
}
return 0;
}
static int
collect_dir_ids (int n, const char *basedir, SeafDirent *dirs[], void *data,
collect_dir_ids (int n, const char *basedir, SeafDirent *dirs[], void *vdata,
gboolean *recurse)
{
SeafDirent *dir1 = dirs[0];
SeafDirent *dir2 = dirs[1];
GList **pret = data;
CalcData *data = vdata;
GList **pret = data->pret;
int dummy;
if (dir1 && (!dir2 || !dirent_same (dir1, dir2)) &&
strcmp (dir1->id, EMPTY_SHA1) != 0)
if (!dir1 || strcmp (dir1->id, EMPTY_SHA1) == 0)
return 0;
if (g_hash_table_lookup (data->checked_objs, dir1->id))
return 0;
if (!dir2 || !dirent_same (dir1, dir2)) {
*pret = g_list_prepend (*pret, g_strdup(dir1->id));
g_hash_table_insert (data->checked_objs, g_strdup(dir1->id), &dummy);
}
return 0;
}
@ -215,13 +238,18 @@ calculate_send_object_list (void *vdata)
priv->send_obj_list = g_list_prepend (priv->send_obj_list,
g_strdup(local_head->root_id));
CalcData *data = g_new0(CalcData, 1);
data->pret = &priv->send_obj_list;
data->checked_objs = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, NULL);
DiffOptions opts;
memset (&opts, 0, sizeof(opts));
memcpy (opts.store_id, task->repo_id, 36);
opts.version = task->repo_version;
opts.file_cb = collect_file_ids;
opts.dir_cb = collect_dir_ids;
opts.data = &priv->send_obj_list;
opts.data = data;
const char *trees[2];
trees[0] = local_head->root_id;
@ -232,6 +260,9 @@ calculate_send_object_list (void *vdata)
priv->calc_success = FALSE;
}
g_hash_table_destroy (data->checked_objs);
g_free (data);
priv->calc_success = TRUE;
out: