Skip to content

fix: close mysql statement and rows resources when sql exec end #1720

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

Merged
merged 5 commits into from
Nov 2, 2021
Merged

fix: close mysql statement and rows resources when sql exec end #1720

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b278ce8
fix: close mysql statement and rows resources when sql exec end
chenwenjun01 Oct 22, 2021
b980da3
fix: close mysql statement and rows resources when sql exec end
chenwenjun-github Oct 22, 2021
985c7b2
Merge branch 'close_mysql_stmt' of https://github.com/chenwenjun-gith…
chenwenjun-github Oct 26, 2021
0671087
style: move code to other place
chenwenjun01 Oct 27, 2021
6fe941a
style: correct the typo(Prepare)
chenwenjun01 Oct 27, 2021
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
5 changes: 5 additions & 0 deletions pkg/db/v1beta1/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ func (d *dbConn) RegisterObservationLog(trialName string, observationLog *v1beta
return fmt.Errorf("Pepare SQL statement failed: %v", err)
Copy link
Member

Choose a reason for hiding this comment

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

Thank you for the fix @chenwenjun-github ! Could you please also correct the typo here? (Prepare)
Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

}

// Close the statement
defer stmt.Close()

// Execute INSERT
_, err = stmt.Exec(values...)
if err != nil {
Expand Down Expand Up @@ -179,6 +182,8 @@ func (d *dbConn) GetObservationLog(trialName string, metricName string, startTim
result := &v1beta1.ObservationLog{
MetricLogs: []*v1beta1.MetricLog{},
}
// Close the rows
defer rows.Close()
Copy link
Member

Choose a reason for hiding this comment

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

Please can you move this right after the error check (line number 182), similar to stmt.Close().

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

for rows.Next() {
var mname, mvalue, sqlTimeStr string
err := rows.Scan(&sqlTimeStr, &mname, &mvalue)
Expand Down