From 2539dfa412a2966ef922974f7413701dce4aeebf Mon Sep 17 00:00:00 2001 From: undefined Date: Sat, 17 Apr 2021 23:33:53 +0800 Subject: [PATCH] core: remove useless pidCounter --- packages/hydrooj/src/interface.ts | 1 - packages/hydrooj/src/model/domain.ts | 1 - packages/hydrooj/src/model/problem.ts | 6 ++++-- packages/hydrooj/src/model/setting.ts | 1 - packages/migrate-vijos/script.ts | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/hydrooj/src/interface.ts b/packages/hydrooj/src/interface.ts index ca2a78b0a..59d19ed95 100644 --- a/packages/hydrooj/src/interface.ts +++ b/packages/hydrooj/src/interface.ts @@ -303,7 +303,6 @@ export interface DomainDoc extends Record { roles: Dictionary, gravatar: string, bulletin: string, - pidCounter: number, _join?: any, host?: string, } diff --git a/packages/hydrooj/src/model/domain.ts b/packages/hydrooj/src/model/domain.ts index 139fdb2d0..c62e14071 100644 --- a/packages/hydrooj/src/model/domain.ts +++ b/packages/hydrooj/src/model/domain.ts @@ -48,7 +48,6 @@ class DomainModel { bulletin, roles: {}, gravatar: '', - pidCounter: 0, }; await bus.serial('domain/create', ddoc); await coll.insertOne(ddoc); diff --git a/packages/hydrooj/src/model/problem.ts b/packages/hydrooj/src/model/problem.ts index 27e630c07..6ba8c9137 100644 --- a/packages/hydrooj/src/model/problem.ts +++ b/packages/hydrooj/src/model/problem.ts @@ -48,8 +48,10 @@ export class ProblemModel { domainId: string, pid: string = null, title: string, content: string, owner: number, tag: string[] = [], hidden = false, ) { - const pidCounter = await domain.inc(domainId, 'pidCounter', 1); - const result = await ProblemModel.addWithId(domainId, pidCounter, pid, title, content, owner, tag, hidden); + const [doc] = await ProblemModel.getMulti(domainId, {}) + .sort({ docId: -1 }).limit(1).project({ docId: 1 }) + .toArray(); + const result = await ProblemModel.addWithId(domainId, (doc?.docId || 0) + 1, pid, title, content, owner, tag, hidden); return result; } diff --git a/packages/hydrooj/src/model/setting.ts b/packages/hydrooj/src/model/setting.ts index 33dad293a..4abdac444 100644 --- a/packages/hydrooj/src/model/setting.ts +++ b/packages/hydrooj/src/model/setting.ts @@ -124,7 +124,6 @@ DomainSetting( Setting('setting_domain', 'name', 'New domain', 'text', 'name'), Setting('setting_domain', 'gravatar', '', 'text', 'gravatar', 'Will be used as the domain icon.'), Setting('setting_domain', 'bulletin', '', 'markdown', 'Bulletin'), - Setting('setting_storage', 'pidCounter', 0, 'number', 'Problem ID Counter', null, FLAG_HIDDEN | FLAG_DISABLED), Setting('setting_storage', 'host', '', 'text', 'Custom host', null, FLAG_HIDDEN | FLAG_DISABLED), ); diff --git a/packages/migrate-vijos/script.ts b/packages/migrate-vijos/script.ts index ed64baff6..d4adfff00 100644 --- a/packages/migrate-vijos/script.ts +++ b/packages/migrate-vijos/script.ts @@ -258,7 +258,6 @@ const tasks = { }, gravatar: 'gravatar', bulletin: 'bulletin', - pid_counter: 'pidCounter', }, 'fs.files': async (doc) => doc, 'fs.chunks': async (doc) => doc,