Skip to content

Use idempotency key index when finding existing runs by idempotency key in batch #1677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2025
Merged

Use idempotency key index when finding existing runs by idempotency key in batch #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions apps/webapp/app/v3/services/batchTriggerV3.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,24 +329,40 @@ export class BatchTriggerV3Service extends BaseService {
}));
}

const idempotencyKeys = body.items.map((i) => i.options?.idempotencyKey).filter(Boolean);
// Group items by taskIdentifier
const itemsByTask = body.items.reduce((acc, item) => {
if (!item.options?.idempotencyKey) return acc;

const cachedRuns =
idempotencyKeys.length > 0
? await this._prisma.taskRun.findMany({
where: {
runtimeEnvironmentId: environment.id,
idempotencyKey: {
in: body.items.map((i) => i.options?.idempotencyKey).filter(Boolean),
},
},
select: {
friendlyId: true,
idempotencyKey: true,
idempotencyKeyExpiresAt: true,
if (!acc[item.task]) {
acc[item.task] = [];
}
acc[item.task].push(item);
return acc;
}, {} as Record<string, typeof body.items>);

logger.debug("[BatchTriggerV2][call] Grouped items by task identifier", {
itemsByTask,
});

// Fetch cached runs for each task identifier separately to make use of the index
const cachedRuns = await Promise.all(
Object.entries(itemsByTask).map(([taskIdentifier, items]) =>
this._prisma.taskRun.findMany({
where: {
runtimeEnvironmentId: environment.id,
taskIdentifier,
idempotencyKey: {
in: items.map((i) => i.options?.idempotencyKey).filter(Boolean),
},
})
: [];
},
select: {
friendlyId: true,
idempotencyKey: true,
idempotencyKeyExpiresAt: true,
},
})
)
).then((results) => results.flat());

// Now we need to create an array of all the run IDs, in order
// If we have a cached run, that isn't expired, we should use that run ID
Expand Down
20 changes: 16 additions & 4 deletions references/v3-catalog/src/trigger/batch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,24 @@ export const allV2TestTask = task({
retry: {
maxAttempts: 1,
},
run: async ({ triggerSequentially }: { triggerSequentially?: boolean }) => {
run: async ({ triggerSequentially }: { triggerSequentially?: boolean }, { ctx }) => {
const response1 = await batch.trigger<typeof allV2ChildTask1 | typeof allV2ChildTask2>(
[
{ id: "all-v2-test-child-1", payload: { child1: "foo" } },
{ id: "all-v2-test-child-2", payload: { child2: "bar" } },
{ id: "all-v2-test-child-1", payload: { child1: "baz" } },
{
id: "all-v2-test-child-1",
payload: { child1: "foo" },
options: { idempotencyKey: randomUUID() },
},
{
id: "all-v2-test-child-2",
payload: { child2: "bar" },
options: { idempotencyKey: randomUUID() },
},
{
id: "all-v2-test-child-1",
payload: { child1: "baz" },
options: { idempotencyKey: randomUUID() },
},
],
{
triggerSequentially,
Expand Down