From 1112148c2309c3803bae7501a0263c5adc59e8d1 Mon Sep 17 00:00:00 2001 From: TheRealDanii <58031079+TheRealDanii@users.noreply.github.com> Date: Wed, 4 Nov 2026 13:27:30 +0100 Subject: [PATCH 1/2] fix(firestore): disable autoPaginate for streaming requests --- handwritten/firestore/dev/src/index.ts | 7 ++++++- handwritten/firestore/dev/test/partition-query.ts | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/handwritten/firestore/dev/src/index.ts b/handwritten/firestore/dev/src/index.ts index 9889dd797090..36eb3e8a96a7 100644 --- a/handwritten/firestore/dev/src/index.ts +++ b/handwritten/firestore/dev/src/index.ts @@ -1895,7 +1895,12 @@ export class Firestore implements firestore.Firestore { request: {}, requestTag: string, ): Promise { - const callOptions = this.createCallOptions(methodName); + // gax ignores autoPaginate for stream paging methods (e.g. + // partitionQueryStream) and warns if it is not explicitly disabled. + const callOptions = { + ...this.createCallOptions(methodName), + autoPaginate: false, + }; const bidirectional = methodName === 'listen'; let numResponses = 0; diff --git a/handwritten/firestore/dev/test/partition-query.ts b/handwritten/firestore/dev/test/partition-query.ts index 3a3ecfd99f8f..6aa5d4732804 100644 --- a/handwritten/firestore/dev/test/partition-query.ts +++ b/handwritten/firestore/dev/test/partition-query.ts @@ -154,6 +154,20 @@ describe('Partition Query', () => { }); }); + it('disables autoPaginate for the stream request', () => { + const overrides: ApiOverride = { + partitionQueryStream: (request, options) => { + expect(options?.autoPaginate).to.be.false; + return stream({values: [{referenceValue: DOC1}]}); + }, + }; + return createInstance(overrides).then(async firestore => { + const query = firestore.collectionGroup('collectionId'); + const result = await getPartitions(query, 2); + expect(result.length).to.equal(2); + }); + }); + it('does not issue RPC if only a single partition is requested', () => { const desiredPartitionsCount = 1; From ff78fb683e8914d36af5b66a22c8c2c8726d129a Mon Sep 17 00:00:00 2001 From: TheRealDanii <58031079+TheRealDanii@users.noreply.github.com> Date: Wed, 4 Nov 2026 13:51:24 +0100 Subject: [PATCH 2/2] test(firestore): use async/await in autoPaginate test --- handwritten/firestore/dev/test/partition-query.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/handwritten/firestore/dev/test/partition-query.ts b/handwritten/firestore/dev/test/partition-query.ts index 6aa5d4732804..71b8d8d90954 100644 --- a/handwritten/firestore/dev/test/partition-query.ts +++ b/handwritten/firestore/dev/test/partition-query.ts @@ -154,18 +154,17 @@ describe('Partition Query', () => { }); }); - it('disables autoPaginate for the stream request', () => { + it('disables autoPaginate for the stream request', async () => { const overrides: ApiOverride = { partitionQueryStream: (request, options) => { expect(options?.autoPaginate).to.be.false; return stream({values: [{referenceValue: DOC1}]}); }, }; - return createInstance(overrides).then(async firestore => { - const query = firestore.collectionGroup('collectionId'); - const result = await getPartitions(query, 2); - expect(result.length).to.equal(2); - }); + const firestore = await createInstance(overrides); + const query = firestore.collectionGroup('collectionId'); + const result = await getPartitions(query, 2); + expect(result.length).to.equal(2); }); it('does not issue RPC if only a single partition is requested', () => {