Commit970ed4c

authored

fix: update resume token for restarting BiDi streams (#10282)

1 parentf0bcbd6 commit970ed4cCopy full SHA for 970ed4c

File tree

2 files changed

+18

-6

lines changed

firestore
- google/cloud/firestore_v1
  - watch.py
- tests/unit/v1
  - test_watch.py

2 files changed

+18

-6

lines changed

`‎firestore/google/cloud/firestore_v1/watch.py‎`

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -213,9 +213,9 @@ def __init__(`
`213`	`213`	`self._closing=threading.Lock()`
`214`	`214`	`self._closed=False`
`215`	`215`
`216`		`-initial_request=firestore_pb2.ListenRequest(`
`217`		`-database=self._firestore._database_string,add_target=self._targets`
`218`		`-)`
	`216`	`+self.resume_token=None`
	`217`	`+`
	`218`	`+rpc_request=self._get_rpc_request`
`219`	`219`
`220`	`220`	`ifResumableBidiRpcisNone:`
`221`	`221`	`ResumableBidiRpc=self.ResumableBidiRpc# FBO unit tests`
`@@ -224,7 +224,7 @@ def __init__(`
`224`	`224`	`self._api.transport.listen,`
`225`	`225`	`should_recover=_should_recover,`
`226`	`226`	`should_terminate=_should_terminate,`
`227`		`-initial_request=initial_request,`
	`227`	`+initial_request=rpc_request,`
`228`	`228`	`metadata=self._firestore._rpc_metadata,`
`229`	`229`	`)`
`230`	`230`
`@@ -252,13 +252,19 @@ def __init__(`
`252`	`252`	`self.has_pushed=False`
`253`	`253`
`254`	`254`	`# The server assigns and updates the resume token.`
`255`		`-self.resume_token=None`
`256`	`255`	`ifBackgroundConsumerisNone:# FBO unit tests`
`257`	`256`	`BackgroundConsumer=self.BackgroundConsumer`
`258`	`257`
`259`	`258`	`self._consumer=BackgroundConsumer(self._rpc,self.on_snapshot)`
`260`	`259`	`self._consumer.start()`
`261`	`260`
	`261`	`+def_get_rpc_request(self):`
	`262`	`+ifself.resume_tokenisnotNone:`
	`263`	`+self._targets["resume_token"]=self.resume_token`
	`264`	`+returnfirestore_pb2.ListenRequest(`
	`265`	`+database=self._firestore._database_string,add_target=self._targets`
	`266`	`+ )`
	`267`	`+`
`262`	`268`	`@property`
`263`	`269`	`defis_active(self):`
`264`	`270`	`"""bool: True if this manager is actively streaming.`

`‎firestore/tests/unit/v1/test_watch.py‎`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -776,6 +776,12 @@ def test__reset_docs(self):`
`776`	`776`	`self.assertEqual(inst.resume_token,None)`
`777`	`777`	`self.assertFalse(inst.current)`
`778`	`778`
	`779`	`+deftest_resume_token_sent_on_recovery(self):`
	`780`	`+inst=self._makeOne()`
	`781`	`+inst.resume_token=b"ABCD0123"`
	`782`	`+request=inst._get_rpc_request()`
	`783`	`+self.assertEqual(request.add_target.resume_token,b"ABCD0123")`
	`784`	`+`
`779`	`785`
`780`	`786`	`classDummyFirestoreStub(object):`
`781`	`787`	`defListen(self):# pragma: NO COVER`
`@@ -922,7 +928,7 @@ def __init__(`
`922`	`928`	`self.start_rpc=start_rpc`
`923`	`929`	`self.should_recover=should_recover`
`924`	`930`	`self.should_terminate=should_terminate`
`925`		`-self.initial_request=initial_request`
	`931`	`+self.initial_request=initial_request()`
`926`	`932`	`self.metadata=metadata`
`927`	`933`	`self.closed=False`
`928`	`934`	`self.callbacks= []`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit970ed4c

File tree

2 files changed

2 files changed

`‎firestore/google/cloud/firestore_v1/watch.py‎`

`‎firestore/tests/unit/v1/test_watch.py‎`

0 commit comments