Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/177323594 Metadata in JPV2 #4121

Merged
merged 23 commits into from
Mar 30, 2021
Merged

Conversation

connorwstein
Copy link
Contributor

@connorwstein connorwstein commented Mar 25, 2021

@github-actions
Copy link
Contributor

I see that you haven't updated any CHANGELOG files. Would it make sense to do so?

@@ -187,7 +187,6 @@ func (r *runner) processUnfinishedRuns() {
type (
memoryTaskRun struct {
task Task
taskRun TaskRun
Copy link
Contributor Author

@connorwstein connorwstein Mar 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

realizing this isn't necessary since we have task

@@ -28,7 +28,7 @@ type (
Task interface {
Type() TaskType
DotID() string
Run(ctx context.Context, taskRun TaskRun, inputs []Result) Result
Run(ctx context.Context, meta JSONSerializable, inputs []Result) Result
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the only thing used from the taskRun was the metadata, just making that explicit

@connorwstein connorwstein marked this pull request as ready for review March 26, 2021 14:21
@@ -312,48 +301,3 @@ func TestAdapterResponse_UnmarshalJSON_Happy(t *testing.T) {
})
}
}

func TestBridgeTask_AddsID(t *testing.T) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Follow up ticket addresses the IDs

@@ -193,7 +193,7 @@ func (d Delegate) ServicesForSpec(jobSpec job.Job) (services []job.Service, err
runResults := make(chan pipeline.RunWithResults, d.config.JobPipelineResultWriteQueueDepth())
oracle, err := ocr.NewOracle(ocr.OracleArgs{
Database: ocrdb,
Datasource: dataSource{
Datasource: &dataSource{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious, why change this to a pointer?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -173,7 +173,7 @@ func (o *orm) ProcessNextUnfinishedRun(ctx context.Context, fn ProcessRunFunc) (
// IDs.
for i, trr := range trrs {
for _, tr := range pRun.PipelineTaskRuns {
if trr.TaskRun.DotID == tr.DotID {
if trr.Task.DotID() == tr.DotID {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to kill off TaskRun as it just contains redundant data with Task

samsondav
samsondav previously approved these changes Mar 26, 2021
…tkit/chainlink into bugfix/177323594-metadata-2
@connorwstein connorwstein added the ready for review PR is ready for code review label Mar 29, 2021
j16r
j16r previously approved these changes Mar 30, 2021
@connorwstein connorwstein merged commit 51944ed into develop Mar 30, 2021
@connorwstein connorwstein deleted the bugfix/177323594-metadata-2 branch March 30, 2021 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review PR is ready for code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants