Commitda902a8

committed

allow blocking rollup init to handle data insertion

1 parent60d812d commitda902a8Copy full SHA for da902a8

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ const (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`typeEventstruct {`
`24`		`-TemplateUsageStatsbool`
	`24`	+Initbool`json:"-"`
	`25`	+TemplateUsageStatsbool`json:"template_usage_stats"`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`typeRolluperstruct {`
`@@ -138,6 +139,15 @@ func (r *Rolluper) start(ctx context.Context) {`
`138`	`139`	`}`
`139`	`140`	`}`
`140`	`141`
	`142`	`+// For testing.`
	`143`	`+ifr.event!=nil {`
	`144`	`+select {`
	`145`	`+case<-ctx.Done():`
	`146`	`+return`
	`147`	`+caser.event<-Event{Init:true}:`
	`148`	`+}`
	`149`	`+}`
	`150`	`+`
`141`	`151`	`// Perform do immediately and on every tick of the ticker,`
`142`	`152`	`// disregarding the execution time of do. This ensure that`
`143`	`153`	`// the rollup is performed every interval assuming do does`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,8 @@ func TestRollup_TwoInstancesUseLocking(t *testing.T) {`
`110`	`110`	`)`
`111`	`111`	`defercloseRolluper(rolluper2,resume2)`
`112`	`112`
	`113`	`+_,_=<-events1,<-events2// Deplete init event, resume operation.`
	`114`	`+`
`113`	`115`	`ctx:=testutil.Context(t,testutil.WaitMedium)`
`114`	`116`
`115`	`117`	`// One of the rollup instances should roll up and the other should not.`
`@@ -222,6 +224,8 @@ func TestRollupTemplateUsageStats(t *testing.T) {`
`222`	`224`	`rolluper:=dbrollup.New(logger,db,dbrollup.WithInterval(250*time.Millisecond),dbrollup.WithEventChannel(events))`
`223`	`225`	`deferrolluper.Close()`
`224`	`226`
	`227`	`+<-events// Deplete init event, resume operation.`
	`228`	`+`
`225`	`229`	`ctx:=testutil.Context(t,testutil.WaitMedium)`
`226`	`230`
`227`	`231`	`select {`

Comments

(0)