mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-03 05:26:05 +02:00
clean up sql
This commit is contained in:
@@ -7,11 +7,6 @@ const ACTIVITY_VIEW_KIND = {
|
|||||||
OVERLAP: 'overlap'
|
OVERLAP: 'overlap'
|
||||||
};
|
};
|
||||||
|
|
||||||
const ACTIVITY_RANGE_CACHE_KIND = {
|
|
||||||
SESSIONS: 0,
|
|
||||||
TOP_WORLDS: 1
|
|
||||||
};
|
|
||||||
|
|
||||||
function syncStateTable() {
|
function syncStateTable() {
|
||||||
return `${dbVars.userPrefix}_activity_sync_state_v2`;
|
return `${dbVars.userPrefix}_activity_sync_state_v2`;
|
||||||
}
|
}
|
||||||
@@ -20,10 +15,6 @@ function sessionsTable() {
|
|||||||
return `${dbVars.userPrefix}_activity_sessions_v2`;
|
return `${dbVars.userPrefix}_activity_sessions_v2`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function rangeCacheTable() {
|
|
||||||
return `${dbVars.userPrefix}_activity_range_cache_v2`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function bucketCacheTable() {
|
function bucketCacheTable() {
|
||||||
return `${dbVars.userPrefix}_activity_bucket_cache_v2`;
|
return `${dbVars.userPrefix}_activity_bucket_cache_v2`;
|
||||||
}
|
}
|
||||||
@@ -45,7 +36,6 @@ function parseJson(value, fallback) {
|
|||||||
*/
|
*/
|
||||||
const activityV2 = {
|
const activityV2 = {
|
||||||
ACTIVITY_VIEW_KIND,
|
ACTIVITY_VIEW_KIND,
|
||||||
ACTIVITY_RANGE_CACHE_KIND,
|
|
||||||
|
|
||||||
async getActivitySourceSliceV2({ userId, isSelf, fromDays, toDays = 0 }) {
|
async getActivitySourceSliceV2({ userId, isSelf, fromDays, toDays = 0 }) {
|
||||||
const fromDateIso = new Date(
|
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({
|
async getActivityBucketCacheV2({
|
||||||
ownerUserId,
|
ownerUserId,
|
||||||
targetUserId = '',
|
targetUserId = '',
|
||||||
|
|||||||
@@ -101,17 +101,6 @@ const database = {
|
|||||||
await sqliteService.executeNonQuery(
|
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)`
|
`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(
|
await sqliteService.executeNonQuery(
|
||||||
`CREATE TABLE IF NOT EXISTS ${dbVars.userPrefix}_activity_bucket_cache_v2 (
|
`CREATE TABLE IF NOT EXISTS ${dbVars.userPrefix}_activity_bucket_cache_v2 (
|
||||||
user_id TEXT NOT NULL,
|
user_id TEXT NOT NULL,
|
||||||
|
|||||||
@@ -492,16 +492,6 @@ async function fullRefresh(snapshot, rangeDays) {
|
|||||||
database.replaceActivitySessionsV2(snapshot.userId, snapshot.sessions)
|
database.replaceActivitySessionsV2(snapshot.userId, snapshot.sessions)
|
||||||
);
|
);
|
||||||
deferWrite(() => database.upsertActivitySyncStateV2(snapshot.sync));
|
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) {
|
async function incrementalRefresh(snapshot) {
|
||||||
@@ -598,16 +588,6 @@ async function expandRange(snapshot, rangeDays) {
|
|||||||
clearDerivedViews(snapshot);
|
clearDerivedViews(snapshot);
|
||||||
|
|
||||||
deferWrite(() => database.upsertActivitySyncStateV2(snapshot.sync));
|
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) {
|
function pickActivityNormalizeConfig(isSelf, rangeDays) {
|
||||||
|
|||||||
Reference in New Issue
Block a user