From 2d1eebfad82ca4be192e11bb578439c21f859aba Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 2 Feb 2024 12:21:08 +0800 Subject: [PATCH] remove size --- packages/api/src/jobs/bulk_action.ts | 19 ++----------------- packages/api/src/resolvers/article/index.ts | 3 --- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/packages/api/src/jobs/bulk_action.ts b/packages/api/src/jobs/bulk_action.ts index c8c17cb75..5a3e6a6a7 100644 --- a/packages/api/src/jobs/bulk_action.ts +++ b/packages/api/src/jobs/bulk_action.ts @@ -13,7 +13,6 @@ export interface BulkActionData { batchSize: number labelIds?: string[] args?: unknown - useFolders?: boolean } export const BULK_ACTION_JOB_NAME = 'bulk-action' @@ -23,22 +22,12 @@ export const bulkAction = async (data: BulkActionData, id?: string) => { throw new Error('Missing id') } - const { - userId, - action, - query, - labelIds, - count, - args, - batchSize, - useFolders, - } = data + const { userId, action, query, labelIds, count, args, batchSize } = data const queue = await getBackendQueue() if (!queue) { throw new Error('Queue not initialized') } - const parent = { id, queue: queue.name } let offset = 0 do { @@ -46,7 +35,6 @@ export const bulkAction = async (data: BulkActionData, id?: string) => { size: batchSize, from: offset, query, - useFolders, } const searchResult = await searchLibraryItems(searchArgs, userId) @@ -57,7 +45,6 @@ export const bulkAction = async (data: BulkActionData, id?: string) => { labelIds, libraryItemIds, args, - size: batchSize, } const libraryItemIdsStr = libraryItemIds.sort().join() const jobId = `${BATCH_UPDATE_JOB_NAME}-${stringToHash(libraryItemIdsStr)}` @@ -66,12 +53,10 @@ export const bulkAction = async (data: BulkActionData, id?: string) => { try { await queue.add(BATCH_UPDATE_JOB_NAME, data, { attempts: 1, - priority: 5, + priority: 10, jobId, // deduplication removeOnComplete: true, removeOnFail: true, - parent, // for tracking - removeDependencyOnFailure: true, }) } catch (error) { logger.error('Error enqueuing batch update job', error) diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index 1441acbd3..0ac442f62 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -876,11 +876,9 @@ export const bulkActionResolver = authorized< }) const batchSize = 100 - const useFolders = query.includes('use:folders') const searchArgs = { query, size: batchSize, - useFolders, } const searchResult = await searchLibraryItems(searchArgs, uid) const count = searchResult.count @@ -912,7 +910,6 @@ export const bulkActionResolver = authorized< count, args, batchSize, - useFolders, } const job = await enqueueBulkAction(data) if (!job) {