mirror of
https://github.com/haiwen/seafile-server.git
synced 2025-09-18 16:35:42 +00:00
Revert "Return file_count when getting or listing repos."
This reverts commit f285dde083
.
This commit is contained in:
@@ -642,7 +642,6 @@ create_repo_fill_size (SeafDBRow *row, void *data)
|
|||||||
gint64 size = seaf_db_row_get_column_int64 (row, 1);
|
gint64 size = seaf_db_row_get_column_int64 (row, 1);
|
||||||
const char *commit_id = seaf_db_row_get_column_text (row, 2);
|
const char *commit_id = seaf_db_row_get_column_text (row, 2);
|
||||||
const char *vrepo_id = seaf_db_row_get_column_text (row, 3);
|
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);
|
*repo = seaf_repo_new (repo_id, NULL, NULL);
|
||||||
if (!*repo)
|
if (!*repo)
|
||||||
@@ -654,7 +653,6 @@ create_repo_fill_size (SeafDBRow *row, void *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
(*repo)->size = size;
|
(*repo)->size = size;
|
||||||
(*repo)->file_count = file_count;
|
|
||||||
head = seaf_branch_new ("master", repo_id, commit_id);
|
head = seaf_branch_new ("master", repo_id, commit_id);
|
||||||
(*repo)->head = head;
|
(*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)
|
if (seaf_db_type(mgr->seaf->db) != SEAF_DB_TYPE_PGSQL)
|
||||||
sql = "SELECT r.repo_id, s.size, b.commit_id, "
|
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 "
|
"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 RepoSize s ON r.repo_id = s.repo_id "
|
||||||
"LEFT JOIN VirtualRepo v ON r.repo_id = v.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'";
|
"WHERE r.repo_id = ? AND b.name = 'master'";
|
||||||
else
|
else
|
||||||
sql = "SELECT r.repo_id, s.\"size\", b.commit_id, "
|
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 "
|
"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 RepoSize s ON r.repo_id = s.repo_id "
|
||||||
"LEFT JOIN VirtualRepo v ON r.repo_id = v.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'";
|
"WHERE r.repo_id = ? AND b.name = 'master'";
|
||||||
|
|
||||||
int ret = seaf_db_statement_foreach_row (mgr->seaf->db, sql,
|
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);
|
int version = seaf_db_row_get_column_int (row, 5);
|
||||||
gboolean is_encrypted = seaf_db_row_get_column_int (row, 6) ? TRUE : FALSE;
|
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);
|
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);
|
repo = seaf_repo_new (repo_id, NULL, NULL);
|
||||||
if (!repo)
|
if (!repo)
|
||||||
@@ -2194,7 +2189,6 @@ collect_repos_fill_size_commit (SeafDBRow *row, void *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
repo->size = size;
|
repo->size = size;
|
||||||
repo->file_count = file_count;
|
|
||||||
head = seaf_branch_new ("master", repo_id, commit_id);
|
head = seaf_branch_new ("master", repo_id, commit_id);
|
||||||
repo->head = head;
|
repo->head = head;
|
||||||
if (repo_name) {
|
if (repo_name) {
|
||||||
@@ -2227,21 +2221,19 @@ seaf_repo_manager_get_repos_by_owner (SeafRepoManager *mgr,
|
|||||||
if (start == -1 && limit == -1) {
|
if (start == -1 && limit == -1) {
|
||||||
if (db_type != SEAF_DB_TYPE_PGSQL)
|
if (db_type != SEAF_DB_TYPE_PGSQL)
|
||||||
sql = "SELECT o.repo_id, s.size, b.commit_id, i.name, i.update_time, "
|
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 "
|
"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 Branch b ON o.repo_id = b.repo_id "
|
||||||
"LEFT JOIN RepoInfo i ON o.repo_id = i.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 "
|
"WHERE owner_id=? AND "
|
||||||
"o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) "
|
"o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) "
|
||||||
"ORDER BY i.update_time DESC, o.repo_id";
|
"ORDER BY i.update_time DESC, o.repo_id";
|
||||||
else
|
else
|
||||||
sql = "SELECT o.repo_id, s.\"size\", b.commit_id, i.name, i.update_time, "
|
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 "
|
"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 Branch b ON o.repo_id = b.repo_id "
|
||||||
"LEFT JOIN RepoInfo i ON o.repo_id = i.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 "
|
"WHERE owner_id=? AND "
|
||||||
"o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) "
|
"o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) "
|
||||||
"ORDER BY i.update_time DESC, o.repo_id";
|
"ORDER BY i.update_time DESC, o.repo_id";
|
||||||
@@ -2253,22 +2245,20 @@ seaf_repo_manager_get_repos_by_owner (SeafRepoManager *mgr,
|
|||||||
} else {
|
} else {
|
||||||
if (db_type != SEAF_DB_TYPE_PGSQL)
|
if (db_type != SEAF_DB_TYPE_PGSQL)
|
||||||
sql = "SELECT o.repo_id, s.size, b.commit_id, i.name, i.update_time, "
|
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 "
|
"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 Branch b ON o.repo_id = b.repo_id "
|
||||||
"LEFT JOIN RepoInfo i ON o.repo_id = i.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 "
|
"WHERE owner_id=? AND "
|
||||||
"o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) "
|
"o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) "
|
||||||
"ORDER BY i.update_time DESC, o.repo_id "
|
"ORDER BY i.update_time DESC, o.repo_id "
|
||||||
"LIMIT ? OFFSET ?";
|
"LIMIT ? OFFSET ?";
|
||||||
else
|
else
|
||||||
sql = "SELECT o.repo_id, s.\"size\", b.commit_id, i.name, i.update_time, "
|
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 "
|
"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 Branch b ON o.repo_id = b.repo_id "
|
||||||
"LEFT JOIN RepoInfo i ON o.repo_id = i.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 "
|
"WHERE owner_id=? AND "
|
||||||
"o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) "
|
"o.repo_id NOT IN (SELECT v.repo_id FROM VirtualRepo v) "
|
||||||
"ORDER BY i.update_time DESC, o.repo_id "
|
"ORDER BY i.update_time DESC, o.repo_id "
|
||||||
|
@@ -159,7 +159,6 @@ collect_repos (SeafDBRow *row, void *data)
|
|||||||
int version = seaf_db_row_get_column_int (row, 10);
|
int version = seaf_db_row_get_column_int (row, 10);
|
||||||
gboolean is_encrypted = seaf_db_row_get_column_int (row, 11) ? TRUE : FALSE;
|
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);
|
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);
|
char *email_l = g_ascii_strdown (email, -1);
|
||||||
|
|
||||||
@@ -172,7 +171,6 @@ collect_repos (SeafDBRow *row, void *data)
|
|||||||
"permission", permission,
|
"permission", permission,
|
||||||
"is_virtual", (vrepo_id != NULL),
|
"is_virtual", (vrepo_id != NULL),
|
||||||
"size", size,
|
"size", size,
|
||||||
"file_count", file_count,
|
|
||||||
NULL);
|
NULL);
|
||||||
g_free (email_l);
|
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, "
|
sql = "SELECT sh.repo_id, v.repo_id, "
|
||||||
"to_email, permission, commit_id, s.size, "
|
"to_email, permission, commit_id, s.size, "
|
||||||
"v.origin_repo, v.path, i.name, "
|
"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 "
|
"SharedRepo sh LEFT JOIN VirtualRepo v ON "
|
||||||
"sh.repo_id=v.repo_id "
|
"sh.repo_id=v.repo_id "
|
||||||
"LEFT JOIN RepoSize s ON sh.repo_id = s.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 RepoInfo i ON sh.repo_id = i.repo_id, Branch b "
|
||||||
"LEFT JOIN RepoFileCount fc ON sh.repo_id = fc.repo_id, "
|
|
||||||
"Branch b "
|
|
||||||
"WHERE from_email=? AND "
|
"WHERE from_email=? AND "
|
||||||
"sh.repo_id = b.repo_id AND "
|
"sh.repo_id = b.repo_id AND "
|
||||||
"b.name = 'master' "
|
"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, "
|
sql = "SELECT sh.repo_id, v.repo_id, "
|
||||||
"from_email, permission, commit_id, s.size, "
|
"from_email, permission, commit_id, s.size, "
|
||||||
"v.origin_repo, v.path, i.name, "
|
"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 "
|
"SharedRepo sh LEFT JOIN VirtualRepo v ON "
|
||||||
"sh.repo_id=v.repo_id "
|
"sh.repo_id=v.repo_id "
|
||||||
"LEFT JOIN RepoSize s ON sh.repo_id = s.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 RepoInfo i ON sh.repo_id = i.repo_id, Branch b "
|
||||||
"LEFT JOIN RepoFileCount fc ON sh.repo_id = fc.repo_id, "
|
|
||||||
"Branch b "
|
|
||||||
"WHERE to_email=? AND "
|
"WHERE to_email=? AND "
|
||||||
"sh.repo_id = b.repo_id AND "
|
"sh.repo_id = b.repo_id AND "
|
||||||
"b.name = 'master' "
|
"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, "
|
sql = "SELECT sh.repo_id, v.repo_id, "
|
||||||
"to_email, permission, commit_id, s.size, "
|
"to_email, permission, commit_id, s.size, "
|
||||||
"v.origin_repo, v.path, i.name, "
|
"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 "
|
"SharedRepo sh LEFT JOIN VirtualRepo v ON "
|
||||||
"sh.repo_id=v.repo_id "
|
"sh.repo_id=v.repo_id "
|
||||||
"LEFT JOIN RepoSize s ON sh.repo_id = s.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 RepoInfo i ON sh.repo_id = i.repo_id, Branch b "
|
||||||
"LEFT JOIN RepoFileCount fc ON sh.repo_id = fc.repo_id, "
|
"WHERE from_email=? "
|
||||||
"Branch b "
|
|
||||||
"WHERE from_email=? AND "
|
|
||||||
"sh.repo_id = b.repo_id AND "
|
"sh.repo_id = b.repo_id AND "
|
||||||
"b.name = 'master' "
|
"AND b.name = 'master' "
|
||||||
"ORDER BY i.update_time DESC, sh.repo_id "
|
"ORDER BY i.update_time DESC, sh.repo_id"
|
||||||
"LIMIT ? OFFSET ?";
|
"LIMIT ? OFFSET ?";
|
||||||
} else if (g_strcmp0 (type, "to_email") == 0) {
|
} else if (g_strcmp0 (type, "to_email") == 0) {
|
||||||
sql = "SELECT sh.repo_id, v.repo_id, "
|
sql = "SELECT sh.repo_id, v.repo_id, "
|
||||||
"from_email, permission, commit_id, s.size, "
|
"from_email, permission, commit_id, s.size, "
|
||||||
"v.origin_repo, v.path, i.name, "
|
"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 "
|
"SharedRepo sh LEFT JOIN VirtualRepo v ON "
|
||||||
"sh.repo_id=v.repo_id "
|
"sh.repo_id=v.repo_id "
|
||||||
"LEFT JOIN RepoSize s ON sh.repo_id = s.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 RepoInfo i ON sh.repo_id = i.repo_id, Branch b "
|
||||||
"LEFT JOIN RepoFileCount fc ON sh.repo_id = fc.repo_id, "
|
"WHERE to_email=? "
|
||||||
"Branch b "
|
|
||||||
"WHERE to_email=? AND "
|
|
||||||
"sh.repo_id = b.repo_id AND "
|
"sh.repo_id = b.repo_id AND "
|
||||||
"b.name = 'master' "
|
"AND b.name = 'master' "
|
||||||
"ORDER BY i.update_time DESC, sh.repo_id "
|
"ORDER BY i.update_time DESC, sh.repo_id"
|
||||||
"LIMIT ? OFFSET ?";
|
"LIMIT ? OFFSET ?";
|
||||||
} else {
|
} else {
|
||||||
/* should never reach here */
|
/* should never reach here */
|
||||||
|
Reference in New Issue
Block a user