kubeflow
/
pipelines
mirror of https://github.com/kubeflow/pipelines.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix miscellaneous List API issue (#90) 

* fix

* Update job_store.go

* Update run_store.go

* Update presubmit-tests.sh

* Update job_store.go
This commit is contained in:
Yang Pan 2018-11-06 11:32:59 -08:00 committed by k8s-ci-robot
parent 458c817d83
commit c514b08703
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/apiserver/storage/job_store.go
View File

@ -67,7 +67,6 @@ func (s *JobStore) queryJobTable(
return nil, util.NewInternalServerError(err, "Failed to create query to list jobs: %v", return nil, util.NewInternalServerError(err, "Failed to create query to list jobs: %v",
err.Error()) err.Error())
} }
rows, err := s.db.Query(sql, args...) rows, err := s.db.Query(sql, args...)
if err != nil { if err != nil {
return nil, util.NewInternalServerError(err, "Failed to list jobs: %v", return nil, util.NewInternalServerError(err, "Failed to list jobs: %v",
@ -91,7 +90,7 @@ func (s *JobStore) toFilteredQuery(selectBuilder sq.SelectBuilder, filterContext
if filterContext.ReferenceKey != nil { if filterContext.ReferenceKey != nil {
selectBuilder = sq.Select("list_job.*"). selectBuilder = sq.Select("list_job.*").
From("resource_references AS rf"). From("resource_references AS rf").
LeftJoin(fmt.Sprintf("(%s) as list_job on list_job.UUID=rf.ResourceUUID", sql), args...). Join(fmt.Sprintf("(%s) as list_job on list_job.UUID=rf.ResourceUUID", sql), args...).
Where(sq.And{ Where(sq.And{
sq.Eq{"rf.ReferenceUUID": filterContext.ID}, sq.Eq{"rf.ReferenceUUID": filterContext.ID},
sq.Eq{"rf.ReferenceType": filterContext.Type}}) sq.Eq{"rf.ReferenceType": filterContext.Type}})

3
backend/src/apiserver/storage/run_store.go
View File

@ -79,7 +79,6 @@ func (s *RunStore) queryRunTable(
return nil, util.NewInternalServerError(err, "Failed to create query to list jobs: %v", return nil, util.NewInternalServerError(err, "Failed to create query to list jobs: %v",
err.Error()) err.Error())
} }
r, err := s.db.Query(sql, args...) r, err := s.db.Query(sql, args...)
if err != nil { if err != nil {
return nil, util.NewInternalServerError(err, "Failed to list runs: %v", err.Error()) return nil, util.NewInternalServerError(err, "Failed to list runs: %v", err.Error())
@ -102,7 +101,7 @@ func (s *RunStore) toFilteredQuery(selectBuilder sq.SelectBuilder, filterContext
if filterContext.ReferenceKey != nil { if filterContext.ReferenceKey != nil {
selectBuilder = sq.Select("list_run.*"). selectBuilder = sq.Select("list_run.*").
From("resource_references AS rf"). From("resource_references AS rf").
LeftJoin(fmt.Sprintf("(%s) as list_run on list_run.UUID=rf.ResourceUUID", sql), args...). Join(fmt.Sprintf("(%s) as list_run on list_run.UUID=rf.ResourceUUID", sql), args...).
Where(sq.And{ Where(sq.And{
sq.Eq{"rf.ReferenceUUID": filterContext.ID}, sq.Eq{"rf.ReferenceUUID": filterContext.ID},
sq.Eq{"rf.ReferenceType": filterContext.Type}}) sq.Eq{"rf.ReferenceType": filterContext.Type}})