Commit151c6bb

committed

linting

1 parent94ccfa8 commit151c6bbCopy full SHA for 151c6bb

File tree

+20

-4

lines changed

+20

-4

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTERTABLE ONLY`
	`2`	`+provisioner_job_timings`
	`3`	`+DROP COLUMN IF EXISTS stage_seq;`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,7 @@`
	`1`	`+ALTERTABLE ONLY`
	`2`	`+provisioner_job_timings`
	`3`	`+ADD COLUMN stage_seqinteger DEFAULT0;`
	`4`	`+`
	`5`	`+COMMENTON COLUMN`
	`6`	`+provisioner_job_timings.stage_seq IS`
	`7`	`+'Distinguish repeated runs of the same stage within a single build job.';`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -603,9 +603,9 @@ func (e *executor) apply(`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	// `terraform show` & `terraform graph`
`606`		`-//endGraph := e.timings.startStage(database.ProvisionerJobTimingStageGraph)`
	`606`	`+//endGraph := e.timings.startStage(database.ProvisionerJobTimingStageGraph)`
`607`	`607`	`state,err:=e.stateResources(ctx,killCtx)`
`608`		`-//endGraph(err)`
	`608`	`+//endGraph(err)`
`609`	`609`	`iferr!=nil {`
`610`	`610`	`returnnil,err`
`611`	`611`	`}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,9 @@ func (t timingAggregator) ingest(ts time.Time, s timingSpan) {`
`109`	`109`	`return`
`110`	`110`	`}`
`111`	`111`
`112`		`-ifs.stage!="" {`
`113`		`-// Explicitly set stage takes precedence.`
	`112`	`+// Only set the stage if it hasn't already been set on the span.`
	`113`	`+// Explicitly set stage takes precedence.`
	`114`	`+ifs.stage=="" {`
`114`	`115`	`s.stage=t.stage`
`115`	`116`	`}`
`116`	`117`	`ts=dbtime.Time(ts.UTC())`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -457,6 +457,11 @@ message Timing {`
`457`	`457`	`stringresource=5;`
`458`	`458`	`stringstage=6;`
`459`	`459`	`TimingStatestate=7;`
	`460`	`+// stage_que distinguishes repeated runs of the same stage.`
	`461`	`+// 0 is the first occurrence, 1 is the second, etc.`
	`462`	`+// Repeated stages are not ideal, but they do exist and should be known`
	`463`	`+// to be unique by this field.`
	`464`	`+int32stage_seq=8;`
`460`	`465`	`}`
`461`	`466`
`462`	`467`	`enumTimingState {`

Comments

(0)