Commit a5b93d5

committed

incremental: avoid double loop with stream from sync iterables

Replicates graphql/graphql-js@d245e65

1 parent c4c4142 commit a5b93d5Copy full SHA for a5b93d5

File tree

3 files changed

+32

-25

lines changed

pyproject.toml
src/graphql/execution
- execute.py
- incremental_publisher.py

3 files changed

+32

-25

lines changed

`‎pyproject.toml‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ disallow_untyped_defs = false`
`275`	`275`	`[tool.pyright]`
`276`	`276`	`# silence pyright since we're using mypy already`
`277`	`277`	`reportArgumentType = false`
	`278`	`+reportAttributeAccessIssue = false`
`278`	`279`	`reportIncompatibleVariableOverride = false`
`279`	`280`	`reportInvalidTypeForm = false`
`280`	`281`	`reportMissingModuleSource = false`

`‎src/graphql/execution/execute.py‎`

Lines changed: 20 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -1717,11 +1717,13 @@ def first_sync_stream_items(`
`1717`	`1717`	`item_type: GraphQLOutputType,`
`1718`	`1718`	`) -> StreamItemsRecord:`
`1719`	`1719`	`"""Get the first sync stream items."""`
`1720`		`- is_awaitable = self.is_awaitable`
`1721`		`- path = stream_record.path`
`1722`		`- initial_path = Path(path, initial_index, None)`
`1723`	`1720`
`1724`	`1721`	`async def await_result() -> StreamItemsResult:`
	`1722`	`+ is_awaitable = self.is_awaitable`
	`1723`	`+ prepend_next_stream_items = self.prepend_next_stream_items`
	`1724`	`+ path = stream_record.path`
	`1725`	`+ initial_path = Path(path, initial_index, None)`
	`1726`	`+`
`1725`	`1727`	`result = self.complete_stream_items(`
`1726`	`1728`	`stream_record,`
`1727`	`1729`	`initial_path,`
`@@ -1731,8 +1733,8 @@ async def await_result() -> StreamItemsResult:`
`1731`	`1733`	`info,`
`1732`	`1734`	`item_type,`
`1733`	`1735`	`)`
`1734`		`- results = [result]`
`1735`		`- append_result = results.append`
	`1736`	`+ first_stream_items = StreamItemsRecord(stream_record, result)`
	`1737`	`+ current_stream_items = first_stream_items`
`1736`	`1738`	`current_index = initial_index`
`1737`	`1739`	`errored_synchronously = False`
`1738`	`1740`	`for item in iterator:`
`@@ -1752,33 +1754,27 @@ async def await_result() -> StreamItemsResult:`
`1752`	`1754`	`info,`
`1753`	`1755`	`item_type,`
`1754`	`1756`	`)`
`1755`		`- append_result(result)`
`1756`	`1757`
`1757`		`- current_index = len(results) - 1`
	`1758`	`+ next_stream_items = StreamItemsRecord(stream_record, result)`
	`1759`	`+ current_stream_items.result = prepend_next_stream_items(`
	`1760`	`+ current_stream_items.result, next_stream_items`
	`1761`	`+ )`
	`1762`	`+ current_stream_items = next_stream_items`
	`1763`	`+`
`1758`	`1764`	`# If a non-reconcilable stream items result was encountered,`
`1759`	`1765`	`# then the stream terminates in error. Otherwise, add a stream terminator.`
`1760`		`- prepend_next_stream_items = self.prepend_next_stream_items`
`1761`		`- current_result = (`
`1762`		`- results[current_index]`
`1763`		`- if errored_synchronously`
`1764`		`- else prepend_next_stream_items(`
`1765`		`- results[current_index],`
	`1766`	`+ if not errored_synchronously:`
	`1767`	`+ current_stream_items.result = prepend_next_stream_items(`
	`1768`	`+ current_stream_items.result,`
`1766`	`1769`	`StreamItemsRecord(`
`1767`	`1770`	`stream_record, TerminatingStreamItemsResult(stream_record)`
`1768`	`1771`	`),`
`1769`	`1772`	`)`
`1770`		`- )`
`1771`	`1773`
`1772`		`- while current_index > 0:`
`1773`		`- current_index -= 1`
`1774`		`- current_result = prepend_next_stream_items(`
`1775`		`- results[current_index],`
`1776`		`- StreamItemsRecord(stream_record, current_result),`
`1777`		`- )`
`1778`		`-`
`1779`		`- if is_awaitable(current_result):`
`1780`		`- return await current_result # type: ignore`
`1781`		`- return current_result # type: ignore`
	`1774`	`+ result = first_stream_items.result`
	`1775`	`+ if is_awaitable(result):`
	`1776`	`+ return await result # type: ignore`
	`1777`	`+ return result # type: ignore`
`1782`	`1778`
`1783`	`1779`	`return StreamItemsRecord(stream_record, await_result())`
`1784`	`1780`

`‎src/graphql/execution/incremental_publisher.py‎`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -938,12 +938,22 @@ class NonReconcilableStreamItemsResult(NamedTuple):`
`938`	`938`	`]`
`939`	`939`
`940`	`940`
`941`		`-class StreamItemsRecord(NamedTuple):`
	`941`	`+class StreamItemsRecord:`
`942`	`942`	`"""Stream items record"""`
`943`	`943`
	`944`	`+ __slots__ = "result", "stream_record"`
	`945`	`+`
`944`	`946`	`stream_record: SubsequentResultRecord`
`945`	`947`	`result: AwaitableOrValue[StreamItemsResult]`
`946`	`948`
	`949`	`+ def __init__(`
	`950`	`+ self,`
	`951`	`+ stream_record: SubsequentResultRecord,`
	`952`	`+ result: AwaitableOrValue[StreamItemsResult],`
	`953`	`+ ) -> None:`
	`954`	`+ self.stream_record = stream_record`
	`955`	`+ self.result = result`
	`956`	`+`
`947`	`957`
`948`	`958`	`IncrementalDataRecord = Union[DeferredGroupedFieldSetRecord, StreamItemsRecord]`
`949`	`959`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit a5b93d5

File tree

3 files changed

3 files changed

`‎pyproject.toml‎`

`‎src/graphql/execution/execute.py‎`

`‎src/graphql/execution/incremental_publisher.py‎`

0 commit comments