From 9d83fd9a0c3f42c5ef24d0d4f992102f63f0b8e8 Mon Sep 17 00:00:00 2001 From: Jonathan Xu Date: Tue, 27 Jun 2017 12:06:08 +0800 Subject: [PATCH] Revert "Return file_count when getting or listing repos." This reverts commit f285dde08340ad9fcf6577e4af328da178805064. --- server/repo-mgr.c | 22 ++++++---------------- server/share-mgr.c | 38 ++++++++++++++------------------------ 2 files changed, 20 insertions(+), 40 deletions(-) diff --git a/server/repo-mgr.c b/server/repo-mgr.c index 5cd6498..0359b13 100644 --- a/server/repo-mgr.c +++ b/server/repo-mgr.c @@ -642,7 +642,6 @@ create_repo_fill_size (SeafDBRow *row, void *data) gint64 size = seaf_db_row_get_column_int64 (row, 1); const char *commit_id = seaf_db_row_get_column_text (row, 2); const char *vrepo_id = seaf_db_row_get_column_text (row, 3); - gint64 file_count = seaf_db_row_get_column_int64 (row, 7); *repo = seaf_repo_new (repo_id, NULL, NULL); if (!*repo) @@ -654,7 +653,6 @@ create_repo_fill_size (SeafDBRow *row, void *data) } (*repo)->size = size; - (*repo)->file_count = file_count; head = seaf_branch_new ("master", repo_id, commit_id); (*repo)->head = head; @@ -686,19 +684,17 @@ get_repo_from_db (SeafRepoManager *mgr, const char *id, gboolean *db_err) if (seaf_db_type(mgr->seaf->db) != SEAF_DB_TYPE_PGSQL) sql = "SELECT r.repo_id, s.size, b.commit_id, " - "v.repo_id, v.origin_repo, v.path, v.base_commit, fc.file_count FROM " + "v.repo_id, v.origin_repo, v.path, v.base_commit FROM " "Repo r LEFT JOIN Branch b ON r.repo_id = b.repo_id " "LEFT JOIN RepoSize s ON r.repo_id = s.repo_id " "LEFT JOIN VirtualRepo v ON r.repo_id = v.repo_id " - "LEFT JOIN RepoFileCount fc ON fc.repo_id = r.repo_id " "WHERE r.repo_id = ? AND b.name = 'master'"; else sql = "SELECT r.repo_id, s.\"size\", b.commit_id, " - "v.repo_id, v.origin_repo, v.path, v.base_commit, fc_file_count FROM " + "v.repo_id, v.origin_repo, v.path, v.base_commit FROM " "Repo r LEFT JOIN Branch b ON r.repo_id = b.repo_id " "LEFT JOIN RepoSize s ON r.repo_id = s.repo_id " "LEFT JOIN VirtualRepo v ON r.repo_id = v.repo_id " - "LEFT JOIN RepoFileCount fc ON fc.repo_id = r.repo_id " "WHERE r.repo_id = ? AND b.name = 'master'"; int ret = seaf_db_statement_foreach_row (mgr->seaf->db, sql, @@ -2182,7 +2178,6 @@ collect_repos_fill_size_commit (SeafDBRow *row, void *data) int version = seaf_db_row_get_column_int (row, 5); gboolean is_encrypted = seaf_db_row_get_column_int (row, 6) ? TRUE : FALSE; const char *last_modifier = seaf_db_row_get_column_text (row, 7); - gint64 file_count = seaf_db_row_get_column_int64 (row, 8); repo = seaf_repo_new (repo_id, NULL, NULL); if (!repo) @@ -2194,7 +2189,6 @@ collect_repos_fill_size_commit (SeafDBRow *row, void *data) } repo->size = size; - repo->file_count = file_count; head = seaf_branch_new ("master", repo_id, commit_id); repo->head = head; if (repo_name) { @@ -2227,21 +2221,19 @@ seaf_repo_manager_get_repos_by_owner (SeafRepoManager *mgr, if (start == -1 && limit == -1) { if (db_type != SEAF_DB_TYPE_PGSQL) sql = "SELECT o.repo_id, s.size, b.commit_id, i.name, i.update_time, " - "i.version, i.is_encrypted, i.last_modifier, fc.file_count FROM " + "i.version, i.is_encrypted, i.last_modifier FROM " "RepoOwner o LEFT JOIN RepoSize s ON o.repo_id = s.repo_id " "LEFT JOIN Branch b ON o.repo_id = b.repo_id " "LEFT JOIN RepoInfo i ON o.repo_id = i.repo_id " - "LEFT JOIN RepoFileCount fc ON o.repo_id = fc.repo_id " "WHERE owner_id=? AND " "o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) " "ORDER BY i.update_time DESC, o.repo_id"; else sql = "SELECT o.repo_id, s.\"size\", b.commit_id, i.name, i.update_time, " - "i.version, i.is_encrypted, i.last_modifier, fc.file_count FROM " + "i.version, i.is_encrypted, i.last_modifier FROM " "RepoOwner o LEFT JOIN RepoSize s ON o.repo_id = s.repo_id " "LEFT JOIN Branch b ON o.repo_id = b.repo_id " "LEFT JOIN RepoInfo i ON o.repo_id = i.repo_id " - "LEFT JOIN RepoFileCount fc ON o.repo_id = fc.repo_id " "WHERE owner_id=? AND " "o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) " "ORDER BY i.update_time DESC, o.repo_id"; @@ -2253,22 +2245,20 @@ seaf_repo_manager_get_repos_by_owner (SeafRepoManager *mgr, } else { if (db_type != SEAF_DB_TYPE_PGSQL) sql = "SELECT o.repo_id, s.size, b.commit_id, i.name, i.update_time, " - "i.version, i.is_encrypted, i.last_modifier, fc.file_count FROM " + "i.version, i.is_encrypted, i.last_modifier FROM " "RepoOwner o LEFT JOIN RepoSize s ON o.repo_id = s.repo_id " "LEFT JOIN Branch b ON o.repo_id = b.repo_id " "LEFT JOIN RepoInfo i ON o.repo_id = i.repo_id " - "LEFT JOIN RepoFileCount fc ON o.repo_id = fc.repo_id " "WHERE owner_id=? AND " "o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) " "ORDER BY i.update_time DESC, o.repo_id " "LIMIT ? OFFSET ?"; else sql = "SELECT o.repo_id, s.\"size\", b.commit_id, i.name, i.update_time, " - "i.version, i.is_encrypted, i.last_modifier, fc.file_count FROM " + "i.version, i.is_encrypted, i.last_modifier FROM " "RepoOwner o LEFT JOIN RepoSize s ON o.repo_id = s.repo_id " "LEFT JOIN Branch b ON o.repo_id = b.repo_id " "LEFT JOIN RepoInfo i ON o.repo_id = i.repo_id " - "LEFT JOIN RepoFileCount fc ON o.repo_id = fc.repo_id " "WHERE owner_id=? AND " "o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) " "ORDER BY i.update_time DESC, o.repo_id " diff --git a/server/share-mgr.c b/server/share-mgr.c index ac978b0..5beb13e 100644 --- a/server/share-mgr.c +++ b/server/share-mgr.c @@ -159,7 +159,6 @@ collect_repos (SeafDBRow *row, void *data) int version = seaf_db_row_get_column_int (row, 10); gboolean is_encrypted = seaf_db_row_get_column_int (row, 11) ? TRUE : FALSE; const char *last_modifier = seaf_db_row_get_column_text (row, 12); - gint64 file_count = seaf_db_row_get_column_int64 (row, 13); char *email_l = g_ascii_strdown (email, -1); @@ -172,7 +171,6 @@ collect_repos (SeafDBRow *row, void *data) "permission", permission, "is_virtual", (vrepo_id != NULL), "size", size, - "file_count", file_count, NULL); g_free (email_l); @@ -271,13 +269,11 @@ seaf_share_manager_list_share_repos (SeafShareManager *mgr, const char *email, sql = "SELECT sh.repo_id, v.repo_id, " "to_email, permission, commit_id, s.size, " "v.origin_repo, v.path, i.name, " - "i.update_time, i.version, i.is_encrypted, i.last_modifier, fc.file_count FROM " + "i.update_time, i.version, i.is_encrypted, i.last_modifier FROM " "SharedRepo sh LEFT JOIN VirtualRepo v ON " "sh.repo_id=v.repo_id " "LEFT JOIN RepoSize s ON sh.repo_id = s.repo_id " - "LEFT JOIN RepoInfo i ON sh.repo_id = i.repo_id " - "LEFT JOIN RepoFileCount fc ON sh.repo_id = fc.repo_id, " - "Branch b " + "LEFT JOIN RepoInfo i ON sh.repo_id = i.repo_id, Branch b " "WHERE from_email=? AND " "sh.repo_id = b.repo_id AND " "b.name = 'master' " @@ -286,13 +282,11 @@ seaf_share_manager_list_share_repos (SeafShareManager *mgr, const char *email, sql = "SELECT sh.repo_id, v.repo_id, " "from_email, permission, commit_id, s.size, " "v.origin_repo, v.path, i.name, " - "i.update_time, i.version, i.is_encrypted, i.last_modifier, fc.file_count FROM " + "i.update_time, i.version, i.is_encrypted, i.last_modifier FROM " "SharedRepo sh LEFT JOIN VirtualRepo v ON " "sh.repo_id=v.repo_id " "LEFT JOIN RepoSize s ON sh.repo_id = s.repo_id " - "LEFT JOIN RepoInfo i ON sh.repo_id = i.repo_id " - "LEFT JOIN RepoFileCount fc ON sh.repo_id = fc.repo_id, " - "Branch b " + "LEFT JOIN RepoInfo i ON sh.repo_id = i.repo_id, Branch b " "WHERE to_email=? AND " "sh.repo_id = b.repo_id AND " "b.name = 'master' " @@ -319,33 +313,29 @@ seaf_share_manager_list_share_repos (SeafShareManager *mgr, const char *email, sql = "SELECT sh.repo_id, v.repo_id, " "to_email, permission, commit_id, s.size, " "v.origin_repo, v.path, i.name, " - "i.update_time, i.version, i.is_encrypted, i.last_modifier, fc.file_count FROM " + "i.update_time, i.version, i.is_encrypted, i.last_modifier FROM " "SharedRepo sh LEFT JOIN VirtualRepo v ON " "sh.repo_id=v.repo_id " "LEFT JOIN RepoSize s ON sh.repo_id = s.repo_id " - "LEFT JOIN RepoInfo i ON sh.repo_id = i.repo_id " - "LEFT JOIN RepoFileCount fc ON sh.repo_id = fc.repo_id, " - "Branch b " - "WHERE from_email=? AND " + "LEFT JOIN RepoInfo i ON sh.repo_id = i.repo_id, Branch b " + "WHERE from_email=? " "sh.repo_id = b.repo_id AND " - "b.name = 'master' " - "ORDER BY i.update_time DESC, sh.repo_id " + "AND b.name = 'master' " + "ORDER BY i.update_time DESC, sh.repo_id" "LIMIT ? OFFSET ?"; } else if (g_strcmp0 (type, "to_email") == 0) { sql = "SELECT sh.repo_id, v.repo_id, " "from_email, permission, commit_id, s.size, " "v.origin_repo, v.path, i.name, " - "i.update_time, i.version, i.is_encrypted, i.last_modifier, fc.file_count FROM " + "i.update_time, i.version, i.is_encrypted, i.last_modifier FROM " "SharedRepo sh LEFT JOIN VirtualRepo v ON " "sh.repo_id=v.repo_id " "LEFT JOIN RepoSize s ON sh.repo_id = s.repo_id " - "LEFT JOIN RepoInfo i ON sh.repo_id = i.repo_id " - "LEFT JOIN RepoFileCount fc ON sh.repo_id = fc.repo_id, " - "Branch b " - "WHERE to_email=? AND " + "LEFT JOIN RepoInfo i ON sh.repo_id = i.repo_id, Branch b " + "WHERE to_email=? " "sh.repo_id = b.repo_id AND " - "b.name = 'master' " - "ORDER BY i.update_time DESC, sh.repo_id " + "AND b.name = 'master' " + "ORDER BY i.update_time DESC, sh.repo_id" "LIMIT ? OFFSET ?"; } else { /* should never reach here */