Skip to content

Commit

Permalink
v1.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@stfnmllr
stfnmllr committed Sep 13, 2023
1 parent c6ec215 commit 19c5721
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 14 deletions.
3 changes: 3 additions & 0 deletions RELEASENOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Release Notes

### Minor revisions

#### v1.5.2
- fixed race condition in connection conn and stmt methods in case of context cancelling

#### v1.5.1
- updated dependencies

Expand Down
41 changes: 28 additions & 13 deletions driver/connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ func (c *conn) isBad() bool { return errors.Is(c.lastError, driver.ErrBadConn) }
func (c *conn) IsValid() bool { return !c.isBad() }

// Ping implements the driver.Pinger interface.
func (c *conn) Ping(ctx context.Context) (err error) {
func (c *conn) Ping(ctx context.Context) error {
if c.isBad() {
return driver.ErrBadConn
}
Expand All @@ -428,6 +428,7 @@ func (c *conn) Ping(ctx context.Context) (err error) {
}

done := make(chan struct{})
var err error
go func() {
_, err = c._queryDirect(ctx, dummyQuery, !c.inTx)
close(done)
Expand All @@ -444,7 +445,7 @@ func (c *conn) Ping(ctx context.Context) (err error) {
}

// PrepareContext implements the driver.ConnPrepareContext interface.
func (c *conn) PrepareContext(ctx context.Context, query string) (stmt driver.Stmt, err error) {
func (c *conn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) {
if c.isBad() {
return nil, driver.ErrBadConn
}
Expand All @@ -455,6 +456,8 @@ func (c *conn) PrepareContext(ctx context.Context, query string) (stmt driver.St
}

done := make(chan struct{})
var stmt driver.Stmt
var err error
go func() {
var pr *prepareResult

Expand Down Expand Up @@ -487,7 +490,7 @@ func (c *conn) Close() error {
}

// BeginTx implements the driver.ConnBeginTx interface.
func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (tx driver.Tx, err error) {
func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
if c.isBad() {
return nil, driver.ErrBadConn
}
Expand All @@ -501,6 +504,8 @@ func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (tx driver.Tx
}

done := make(chan struct{})
var tx driver.Tx
var err error
go func() {
// set isolation level
query := strings.Join([]string{setIsolationLevel, level}, " ")
Expand Down Expand Up @@ -532,7 +537,7 @@ func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (tx driver.Tx
var callStmt = regexp.MustCompile(`(?i)^\s*call\s+.*`) // sql statement beginning with call

// QueryContext implements the driver.QueryerContext interface.
func (c *conn) QueryContext(ctx context.Context, query string, nvargs []driver.NamedValue) (rows driver.Rows, err error) {
func (c *conn) QueryContext(ctx context.Context, query string, nvargs []driver.NamedValue) (driver.Rows, error) {
if c.isBad() {
return nil, driver.ErrBadConn
}
Expand All @@ -549,6 +554,8 @@ func (c *conn) QueryContext(ctx context.Context, query string, nvargs []driver.N
}

done := make(chan struct{})
var rows driver.Rows
var err error
go func() {
rows, err = c._queryDirect(ctx, query, !c.inTx)
close(done)
Expand All @@ -565,7 +572,7 @@ func (c *conn) QueryContext(ctx context.Context, query string, nvargs []driver.N
}

// ExecContext implements the driver.ExecerContext interface.
func (c *conn) ExecContext(ctx context.Context, query string, nvargs []driver.NamedValue) (r driver.Result, err error) {
func (c *conn) ExecContext(ctx context.Context, query string, nvargs []driver.NamedValue) (driver.Result, error) {
if c.isBad() {
return nil, driver.ErrBadConn
}
Expand All @@ -579,9 +586,11 @@ func (c *conn) ExecContext(ctx context.Context, query string, nvargs []driver.Na
}

done := make(chan struct{})
var result driver.Result
var err error
go func() {
// handle procesure call without parameters here as well
r, err = c._execDirect(ctx, query, !c.inTx)
result, err = c._execDirect(ctx, query, !c.inTx)
close(done)
}()

Expand All @@ -591,7 +600,7 @@ func (c *conn) ExecContext(ctx context.Context, query string, nvargs []driver.Na
return nil, ctx.Err()
case <-done:
c.lastError = err
return r, err
return result, err
}
}

Expand All @@ -614,12 +623,14 @@ func (c *conn) HDBVersion() *Version { return c.hdbVersion }
func (c *conn) DatabaseName() string { return c._databaseName() }

// DBConnectInfo implements the Conn interface.
func (c *conn) DBConnectInfo(ctx context.Context, databaseName string) (ci *DBConnectInfo, err error) {
func (c *conn) DBConnectInfo(ctx context.Context, databaseName string) (*DBConnectInfo, error) {
if c.isBad() {
return nil, driver.ErrBadConn
}

done := make(chan struct{})
var ci *DBConnectInfo
var err error
go func() {
ci, err = c._dbConnectInfo(ctx, databaseName)
close(done)
Expand Down Expand Up @@ -726,7 +737,7 @@ func (s *stmt) Close() error {
return c._dropStatementID(context.Background(), s.pr.stmtID)
}

func (s *stmt) QueryContext(ctx context.Context, nvargs []driver.NamedValue) (rows driver.Rows, err error) {
func (s *stmt) QueryContext(ctx context.Context, nvargs []driver.NamedValue) (driver.Rows, error) {
c := s.conn
if c.isBad() {
return nil, driver.ErrBadConn
Expand All @@ -741,6 +752,8 @@ func (s *stmt) QueryContext(ctx context.Context, nvargs []driver.NamedValue) (ro
}

done := make(chan struct{})
var rows driver.Rows
var err error
go func() {
rows, err = s.conn._query(ctx, s.pr, nvargs, !s.conn.inTx)
close(done)
Expand All @@ -756,7 +769,7 @@ func (s *stmt) QueryContext(ctx context.Context, nvargs []driver.NamedValue) (ro
}
}

func (s *stmt) ExecContext(ctx context.Context, nvargs []driver.NamedValue) (r driver.Result, err error) {
func (s *stmt) ExecContext(ctx context.Context, nvargs []driver.NamedValue) (driver.Result, error) {
c := s.conn

if c.isBad() {
Expand All @@ -772,11 +785,13 @@ func (s *stmt) ExecContext(ctx context.Context, nvargs []driver.NamedValue) (r d
}

done := make(chan struct{})
var result driver.Result
var err error
go func() {
if s.pr.isProcedureCall() {
r, s.rows, err = s.conn._execCall(ctx, s.pr, nvargs)
result, s.rows, err = s.conn._execCall(ctx, s.pr, nvargs)
} else {
r, err = s.exec(ctx, nvargs)
result, err = s.exec(ctx, nvargs)
}
close(done)
}()
Expand All @@ -787,7 +802,7 @@ func (s *stmt) ExecContext(ctx context.Context, nvargs []driver.NamedValue) (r d
return nil, ctx.Err()
case <-done:
c.lastError = err
return r, err
return result, err
}
}

Expand Down
2 changes: 1 addition & 1 deletion driver/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

// DriverVersion is the version number of the hdb driver.
const DriverVersion = "1.5.1"
const DriverVersion = "1.5.2"

// DriverName is the driver name to use with sql.Open for hdb databases.
const DriverName = "hdb"
Expand Down

0 comments on commit 19c5721

Please sign in to comment.