From f2e23ed95fcaca6e77365fd79144c41fac48b76b Mon Sep 17 00:00:00 2001 From: Alex Happy <1223408988@qq.com> Date: Tue, 14 Apr 2026 18:13:19 +0800 Subject: [PATCH 1/3] only stats bases not in trash --- dtable_events/tasks/big_data_storage_stats_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dtable_events/tasks/big_data_storage_stats_worker.py b/dtable_events/tasks/big_data_storage_stats_worker.py index 39f1428f..382bc92d 100644 --- a/dtable_events/tasks/big_data_storage_stats_worker.py +++ b/dtable_events/tasks/big_data_storage_stats_worker.py @@ -22,7 +22,7 @@ def update_big_data_storage_stats(db_session, bases): uuid_org_id_map = dict() get_org_id_sql = """SELECT uuid, org_id FROM dtables d JOIN workspaces w ON d.workspace_id=w.id - WHERE uuid IN :uuid_list""" + WHERE uuid IN :uuid_list AND d.deleted=0""" results = db_session.execute(text(get_org_id_sql), {'uuid_list': [uuid.UUID(base.get('id')).hex for base in bases]}).fetchall() for result in results: From fdbff6f308a91db4c6c3d8a9b5573abd7aa86447 Mon Sep 17 00:00:00 2001 From: Alex Happy <1223408988@qq.com> Date: Tue, 14 Apr 2026 18:26:33 +0800 Subject: [PATCH 2/3] update --- dtable_events/tasks/big_data_storage_stats_worker.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dtable_events/tasks/big_data_storage_stats_worker.py b/dtable_events/tasks/big_data_storage_stats_worker.py index 382bc92d..0c2ac065 100644 --- a/dtable_events/tasks/big_data_storage_stats_worker.py +++ b/dtable_events/tasks/big_data_storage_stats_worker.py @@ -36,8 +36,10 @@ def update_big_data_storage_stats(db_session, bases): def update_org_big_data_storage_stats(db_session): - get_stats_sql = """SELECT org_id, SUM(total_rows) AS total_rows, SUM(total_storage) AS total_storage - FROM big_data_storage_stats WHERE org_id != -1 GROUP BY org_id""" + get_stats_sql = """SELECT bdss.org_id, SUM(bdss.total_rows) AS total_rows, SUM(bdss.total_storage) AS total_storage + FROM big_data_storage_stats bdss + JOIN dtables d ON REPLACE(bdss.dtable_uuid, '-', '')=d.uuid + WHERE bdss.org_id != -1 AND d.deleted=0 GROUP BY bdss.org_id""" results = db_session.execute(text(get_stats_sql)).fetchall() if results: From a95956b5a3a4a607912790047af76bcd81b63fc7 Mon Sep 17 00:00:00 2001 From: Alex Happy <1223408988@qq.com> Date: Thu, 16 Apr 2026 23:41:08 +0800 Subject: [PATCH 3/3] only stats the big data of bases not in trash --- dtable_events/tasks/big_data_storage_stats_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dtable_events/tasks/big_data_storage_stats_worker.py b/dtable_events/tasks/big_data_storage_stats_worker.py index 0c2ac065..0c38c158 100644 --- a/dtable_events/tasks/big_data_storage_stats_worker.py +++ b/dtable_events/tasks/big_data_storage_stats_worker.py @@ -22,7 +22,7 @@ def update_big_data_storage_stats(db_session, bases): uuid_org_id_map = dict() get_org_id_sql = """SELECT uuid, org_id FROM dtables d JOIN workspaces w ON d.workspace_id=w.id - WHERE uuid IN :uuid_list AND d.deleted=0""" + WHERE uuid IN :uuid_list""" results = db_session.execute(text(get_org_id_sql), {'uuid_list': [uuid.UUID(base.get('id')).hex for base in bases]}).fetchall() for result in results: