Skip to content

add checks for actual deferral #3991

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

Draft
wants to merge 2 commits into
base: next
Choose a base branch
from
Draft

add checks for actual deferral #3991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af18110
do not emit pending for empty non-published subsequent results
yaacovCR Nov 22, 2023
4203dda
add checks for actual deferral
yaacovCR Nov 21, 2023
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
44 changes: 24 additions & 20 deletions src/execution/IncrementalPublisher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,25 +301,20 @@ export class IncrementalPublisher {
initialResultRecord: InitialResultRecord,
data: ObjMap<unknown> | null,
): ExecutionResult | ExperimentalIncrementalExecutionResults {
const pendingSources = new Set<DeferredFragmentRecord | StreamRecord>();
for (const child of initialResultRecord.children) {
if (child.filtered) {
continue;
}
this._publish(child);
const maybePendingSource = this._publish(child);
if (maybePendingSource) {
pendingSources.add(maybePendingSource);
}
}

const errors = initialResultRecord.errors;
const initialResult = errors.length === 0 ? { data } : { errors, data };
const pending = this._pending;
if (pending.size > 0) {
const pendingSources = new Set<DeferredFragmentRecord | StreamRecord>();
for (const subsequentResultRecord of pending) {
const pendingSource = isStreamItemsRecord(subsequentResultRecord)
? subsequentResultRecord.streamRecord
: subsequentResultRecord;
pendingSources.add(pendingSource);
}

if (pendingSources.size > 0) {
return {
initialResult: {
...initialResult,
Expand Down Expand Up @@ -542,13 +537,10 @@ export class IncrementalPublisher {
if (child.filtered) {
continue;
}
const pendingSource = isStreamItemsRecord(child)
? child.streamRecord
: child;
if (!pendingSource.pendingSent) {
newPendingSources.add(pendingSource);
const maybePendingSource = this._publish(child);
if (maybePendingSource) {
newPendingSources.add(maybePendingSource);
}
this._publish(child);
}
if (isStreamItemsRecord(subsequentResultRecord)) {
if (subsequentResultRecord.isFinalRecord) {
Expand Down Expand Up @@ -655,14 +647,20 @@ export class IncrementalPublisher {
return result;
}

private _publish(subsequentResultRecord: SubsequentResultRecord): void {
private _publish(
subsequentResultRecord: SubsequentResultRecord,
): DeferredFragmentRecord | StreamRecord | undefined {
if (isStreamItemsRecord(subsequentResultRecord)) {
if (subsequentResultRecord.isCompleted) {
this._push(subsequentResultRecord);
return;
} else {
this._introduce(subsequentResultRecord);
}

this._introduce(subsequentResultRecord);
const stream = subsequentResultRecord.streamRecord;
if (!stream.pendingSent) {
return stream;
}
return;
}

Expand All @@ -673,6 +671,12 @@ export class IncrementalPublisher {
subsequentResultRecord.children.size > 0
) {
this._push(subsequentResultRecord);
} else {
return;
}

if (!subsequentResultRecord.pendingSent) {
return subsequentResultRecord;
}
}

Expand Down
Loading