delete needless instance drive columns

7 files changed, 13 insertions, 30 deletions

diff --git a/packages/backend/migration/1646655454495-remove-instance-drive-columns.js b/packages/backend/migration/1646655454495-remove-instance-drive-columns.js
new file mode 100644
index 0000000000..a0ee1b2c43
--- /dev/null
+++ b/packages/backend/migration/1646655454495-remove-instance-drive-columns.js
@@ -0,0 +1,13 @@
+export class removeInstanceDriveColumns1646655454495 {
+    name = 'removeInstanceDriveColumns1646655454495'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "driveUsage"`);
+        await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "driveFiles"`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "instance" ADD "driveFiles" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "instance" ADD "driveUsage" bigint NOT NULL DEFAULT '0'`);
+    }
+}
diff --git a/packages/backend/src/models/entities/instance.ts b/packages/backend/src/models/entities/instance.ts
index c15c80ff43..bb24d6b30f 100644
--- a/packages/backend/src/models/entities/instance.ts
+++ b/packages/backend/src/models/entities/instance.ts
@@ -60,22 +60,6 @@ export class Instance {
 	public followersCount: number;
 
 	/**
-	 * ドライブ使用量
-	 */
-	@Column('bigint', {
-		default: 0,
-	})
-	public driveUsage: number;
-
-	/**
-	 * ドライブのファイル数
-	 */
-	@Column('integer', {
-		default: 0,
-	})
-	public driveFiles: number;
-
-	/**
 	 * 直近のリクエスト送信日時
 	 */
 	@Column('timestamp with time zone', {
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 70fef051ba..e272971763 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -55,10 +55,6 @@ export default define(meta, paramDef, async (ps, me) => {
 		case '-caughtAt': query.orderBy('instance.caughtAt', 'ASC'); break;
 		case '+lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'DESC'); break;
 		case '-lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'ASC'); break;
-		case '+driveUsage': query.orderBy('instance.driveUsage', 'DESC'); break;
-		case '-driveUsage': query.orderBy('instance.driveUsage', 'ASC'); break;
-		case '+driveFiles': query.orderBy('instance.driveFiles', 'DESC'); break;
-		case '-driveFiles': query.orderBy('instance.driveFiles', 'ASC'); break;
 
 		default: query.orderBy('instance.id', 'DESC'); break;
 	}
diff --git a/packages/backend/src/services/chart/charts/instance.ts b/packages/backend/src/services/chart/charts/instance.ts
index 593430f281..f1257fdf14 100644
--- a/packages/backend/src/services/chart/charts/instance.ts
+++ b/packages/backend/src/services/chart/charts/instance.ts
@@ -21,14 +21,12 @@ export default class InstanceChart extends Chart<typeof schema> {
 			followingCount,
 			followersCount,
 			driveFiles,
-			//driveUsage,
 		] = await Promise.all([
 			Notes.count({ userHost: group }),
 			Users.count({ host: group }),
 			Followings.count({ followerHost: group }),
 			Followings.count({ followeeHost: group }),
 			DriveFiles.count({ userHost: group }),
-			//DriveFiles.calcDriveUsageOfHost(group),
 		]);
 
 		return {
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 9f1980bff1..8397945668 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -484,8 +484,6 @@ export async function addFile({
 	perUserDriveChart.update(file, true);
 	if (file.userHost !== null) {
 		instanceChart.updateDrive(file, true);
-		Instances.increment({ host: file.userHost }, 'driveUsage', file.size);
-		Instances.increment({ host: file.userHost }, 'driveFiles', 1);
 	}
 
 	return file;
diff --git a/packages/backend/src/services/drive/delete-file.ts b/packages/backend/src/services/drive/delete-file.ts
index 18f1dc970b..4816a3a31b 100644
--- a/packages/backend/src/services/drive/delete-file.ts
+++ b/packages/backend/src/services/drive/delete-file.ts
@@ -86,8 +86,6 @@ async function postProcess(file: DriveFile, isExpired = false) {
 	perUserDriveChart.update(file, false);
 	if (file.userHost !== null) {
 		instanceChart.updateDrive(file, false);
-		Instances.decrement({ host: file.userHost }, 'driveUsage', file.size);
-		Instances.decrement({ host: file.userHost }, 'driveFiles', 1);
 	}
 }
 
diff --git a/packages/client/src/pages/federation.vue b/packages/client/src/pages/federation.vue
index 3c5050cdb8..5add2b5324 100644
--- a/packages/client/src/pages/federation.vue
+++ b/packages/client/src/pages/federation.vue
@@ -33,10 +33,6 @@
 					<option value="-caughtAt">{{ $ts.registeredAt }} ({{ $ts.ascendingOrder }})</option>
 					<option value="+lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.descendingOrder }})</option>
 					<option value="-lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.ascendingOrder }})</option>
-					<option value="+driveUsage">{{ $ts.driveUsage }} ({{ $ts.descendingOrder }})</option>
-					<option value="-driveUsage">{{ $ts.driveUsage }} ({{ $ts.ascendingOrder }})</option>
-					<option value="+driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.descendingOrder }})</option>
-					<option value="-driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.ascendingOrder }})</option>
 				</MkSelect>
 			</FormSplit>
 		</div>