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.

Sign up for GitHub

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

Jump to bottom

Return resource count from ListXXX calls #595

Merged
merged 17 commits into from
Jan 31, 2019
Merged

Return resource count from ListXXX calls #595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6298367
add count to protos and libs
Dec 19, 2018
9ac96c5
close db rows before second query
Dec 28, 2018
e67226e
count -> total_size
Jan 7, 2019
3d7bba0
int32 -> int
Jan 8, 2019
8bac6d1
move scan count row to util
Jan 8, 2019
c8300a9
add comments
Jan 9, 2019
4bc2ee2
add logs when transactions fail
Jan 10, 2019
d020d0c
dedup from and where clauses
Jan 10, 2019
fb62d39
simplify job count query
Jan 15, 2019
c16277c
job count queries
Jan 22, 2019
5479f5c
run count queries
Jan 24, 2019
82ffd19
add job_store total size test
Jan 25, 2019
48ecfad
added tests for list util
Jan 26, 2019
33c8fab
pr comments
Jan 28, 2019
a96fc14
list_utils -> list
Jan 28, 2019
f5653c0
fix clients and fake clients to support TotalSize
Jan 30, 2019
55bacd1
added TotalSize checks in api integration tests
Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
close db rows before second query
  • Loading branch information
Yasser Elsayed committed Jan 24, 2019
commit 9ac96c5d7dcf7015be1646c54d4675c04aab1b36
10 changes: 4 additions & 6 deletions backend/src/apiserver/storage/experiment_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,24 @@ func (s *ExperimentStore) ListExperiments(opts *list.Options) ([]*model.Experime
tx.Rollback()
return errorF(err)
}
defer rows.Close()

countRow, err := tx.Query(countSql, countArgs...)
exps, err := s.scanRows(rows)
if err != nil {
tx.Rollback()
return errorF(err)
}
defer rows.Close()
rows.Close()
yebrahim marked this conversation as resolved.
Show resolved Hide resolved

exps, err := s.scanRows(rows)
countRow, err := tx.Query(countSql, countArgs...)
if err != nil {
tx.Rollback()
return errorF(err)
}

count, err := s.scanRowToCount(countRow)
if err != nil {
tx.Rollback()
return errorF(err)
}
countRow.Close()

tx.Commit()
if err != nil {
Expand Down
10 changes: 4 additions & 6 deletions backend/src/apiserver/storage/job_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,24 @@ func (s *JobStore) ListJobs(
tx.Rollback()
return errorF(err)
}
defer rows.Close()

countRow, err := tx.Query(countSql, countArgs...)
jobs, err := s.scanRows(rows)
if err != nil {
tx.Rollback()
return errorF(err)
}
defer countRow.Close()
rows.Close()

jobs, err := s.scanRows(rows)
countRow, err := tx.Query(countSql, countArgs...)
if err != nil {
tx.Rollback()
return errorF(err)
}

count, err := s.scanRowToCount(countRow)
if err != nil {
tx.Rollback()
return errorF(err)
}
countRow.Close()

tx.Commit()
if err != nil {
yebrahim marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
10 changes: 4 additions & 6 deletions backend/src/apiserver/storage/pipeline_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,24 @@ func (s *PipelineStore) ListPipelines(opts *list.Options) ([]*model.Pipeline, in
tx.Rollback()
return errorF(err)
}
defer rows.Close()

countRow, err := tx.Query(countSql, countArgs...)
pipelines, err := s.scanRows(rows)
if err != nil {
tx.Rollback()
return errorF(err)
}
defer rows.Close()
rows.Close()

pipelines, err := s.scanRows(rows)
countRow, err := tx.Query(countSql, countArgs...)
if err != nil {
tx.Rollback()
return errorF(err)
}

count, err := s.scanRowToCount(countRow)
if err != nil {
tx.Rollback()
return errorF(err)
}
countRow.Close()

tx.Commit()
if err != nil {
Expand Down
10 changes: 4 additions & 6 deletions backend/src/apiserver/storage/run_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,26 +100,24 @@ func (s *RunStore) ListRuns(
tx.Rollback()
return errorF(err)
}
defer rows.Close()

countRow, err := tx.Query(countSql, countArgs...)
runDetails, err := s.scanRowsToRunDetails(rows)
if err != nil {
tx.Rollback()
return errorF(err)
}
defer countRow.Close()
rows.Close()

runDetails, err := s.scanRowsToRunDetails(rows)
countRow, err := tx.Query(countSql, countArgs...)
if err != nil {
tx.Rollback()
return errorF(err)
}

count, err := s.scanRowToCount(countRow)
if err != nil {
tx.Rollback()
return errorF(err)
}
countRow.Close()

tx.Commit()
if err != nil {
Expand Down