From d28aa497c597e52e332036efb72e5e843b9967de Mon Sep 17 00:00:00 2001 From: pa Date: Mon, 23 Mar 2026 10:29:53 +0900 Subject: [PATCH] clean up sql --- src/services/database/activityV2.js | 51 ----------------------------- src/services/database/index.js | 11 ------- src/stores/activity.js | 20 ----------- 3 files changed, 82 deletions(-) diff --git a/src/services/database/activityV2.js b/src/services/database/activityV2.js index 8ae4d829..3aab4d13 100644 --- a/src/services/database/activityV2.js +++ b/src/services/database/activityV2.js @@ -7,11 +7,6 @@ const ACTIVITY_VIEW_KIND = { OVERLAP: 'overlap' }; -const ACTIVITY_RANGE_CACHE_KIND = { - SESSIONS: 0, - TOP_WORLDS: 1 -}; - function syncStateTable() { return `${dbVars.userPrefix}_activity_sync_state_v2`; } @@ -20,10 +15,6 @@ function sessionsTable() { return `${dbVars.userPrefix}_activity_sessions_v2`; } -function rangeCacheTable() { - return `${dbVars.userPrefix}_activity_range_cache_v2`; -} - function bucketCacheTable() { return `${dbVars.userPrefix}_activity_bucket_cache_v2`; } @@ -45,7 +36,6 @@ function parseJson(value, fallback) { */ const activityV2 = { ACTIVITY_VIEW_KIND, - ACTIVITY_RANGE_CACHE_KIND, async getActivitySourceSliceV2({ userId, isSelf, fromDays, toDays = 0 }) { const fromDateIso = new Date( @@ -311,47 +301,6 @@ const activityV2 = { } }, - async getActivityRangeCacheV2(userId, rangeDays, cacheKind) { - let row = null; - await sqliteService.execute( - (dbRow) => { - row = { - userId: dbRow[0], - rangeDays: dbRow[1], - cacheKind: dbRow[2], - isComplete: Boolean(dbRow[3]), - builtFromCursor: dbRow[4] || '', - builtAt: dbRow[5] || '' - }; - }, - `SELECT user_id, range_days, cache_kind, is_complete, built_from_cursor, built_at - FROM ${rangeCacheTable()} - WHERE user_id = @userId AND range_days = @rangeDays AND cache_kind = @cacheKind`, - { - '@userId': userId, - '@rangeDays': rangeDays, - '@cacheKind': cacheKind - } - ); - return row; - }, - - async upsertActivityRangeCacheV2(entry) { - await sqliteService.executeNonQuery( - `INSERT OR REPLACE INTO ${rangeCacheTable()} - (user_id, range_days, cache_kind, is_complete, built_from_cursor, built_at) - VALUES (@userId, @rangeDays, @cacheKind, @isComplete, @builtFromCursor, @builtAt)`, - { - '@userId': entry.userId, - '@rangeDays': entry.rangeDays, - '@cacheKind': entry.cacheKind, - '@isComplete': entry.isComplete ? 1 : 0, - '@builtFromCursor': entry.builtFromCursor || '', - '@builtAt': entry.builtAt || '' - } - ); - }, - async getActivityBucketCacheV2({ ownerUserId, targetUserId = '', diff --git a/src/services/database/index.js b/src/services/database/index.js index cea00552..7c70642b 100644 --- a/src/services/database/index.js +++ b/src/services/database/index.js @@ -101,17 +101,6 @@ const database = { await sqliteService.executeNonQuery( `CREATE INDEX IF NOT EXISTS ${dbVars.userPrefix}_activity_sessions_v2_user_end_idx ON ${dbVars.userPrefix}_activity_sessions_v2 (user_id, end_at)` ); - await sqliteService.executeNonQuery( - `CREATE TABLE IF NOT EXISTS ${dbVars.userPrefix}_activity_range_cache_v2 ( - user_id TEXT NOT NULL, - range_days INTEGER NOT NULL, - cache_kind INTEGER NOT NULL, - is_complete INTEGER NOT NULL DEFAULT 0, - built_from_cursor TEXT NOT NULL DEFAULT '', - built_at TEXT NOT NULL DEFAULT '', - PRIMARY KEY (user_id, range_days, cache_kind) - )` - ); await sqliteService.executeNonQuery( `CREATE TABLE IF NOT EXISTS ${dbVars.userPrefix}_activity_bucket_cache_v2 ( user_id TEXT NOT NULL, diff --git a/src/stores/activity.js b/src/stores/activity.js index a98fc005..6ef961a3 100644 --- a/src/stores/activity.js +++ b/src/stores/activity.js @@ -492,16 +492,6 @@ async function fullRefresh(snapshot, rangeDays) { database.replaceActivitySessionsV2(snapshot.userId, snapshot.sessions) ); deferWrite(() => database.upsertActivitySyncStateV2(snapshot.sync)); - deferWrite(() => - database.upsertActivityRangeCacheV2({ - userId: snapshot.userId, - rangeDays, - cacheKind: database.ACTIVITY_RANGE_CACHE_KIND.SESSIONS, - isComplete: true, - builtFromCursor: snapshot.sync.sourceLastCreatedAt, - builtAt: snapshot.sync.updatedAt - }) - ); } async function incrementalRefresh(snapshot) { @@ -598,16 +588,6 @@ async function expandRange(snapshot, rangeDays) { clearDerivedViews(snapshot); deferWrite(() => database.upsertActivitySyncStateV2(snapshot.sync)); - deferWrite(() => - database.upsertActivityRangeCacheV2({ - userId: snapshot.userId, - rangeDays, - cacheKind: database.ACTIVITY_RANGE_CACHE_KIND.SESSIONS, - isComplete: true, - builtFromCursor: snapshot.sync.sourceLastCreatedAt, - builtAt: snapshot.sync.updatedAt - }) - ); } function pickActivityNormalizeConfig(isSelf, rangeDays) {