Skip to content

Commit

Permalink
interrupt query on ctx cancel/timeout (marcboeker#143)
Browse files Browse the repository at this point in the history
* interrupt query on ctx cancel/timeout

* adding unit test

* adding unit test - reduce timeout
  • Loading branch information
k-anshul committed Jan 18, 2024
1 parent 0e038fa commit 8ddacb3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
16 changes: 16 additions & 0 deletions duckdb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1100,6 +1100,22 @@ func TestParquetExtension(t *testing.T) {
require.NoError(t, err)
}

func TestQueryTimeout(t *testing.T) {
db := openDB(t)
defer db.Close()

ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*250)
defer cancel()

now := time.Now()
_, err := db.ExecContext(ctx, "CREATE TABLE test AS SELECT * FROM range(10000000) t1, range(1000000) t2;")
require.ErrorIs(t, err, context.DeadlineExceeded)

// a very defensive time check, but should be good enough
// the query takes much longer than 10 seconds
require.Less(t, time.Since(now), 10*time.Second)
}

func openDB(t *testing.T) *sql.DB {
db, err := sql.Open("duckdb", "")
require.NoError(t, err)
Expand Down
2 changes: 2 additions & 0 deletions statement.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ func (s *stmt) execute(ctx context.Context, args []driver.NamedValue) (*C.duckdb
select {
// if context is cancelled or deadline exceeded, don't execute further
case <-ctx.Done():
// also need to interrupt to cancel the query
C.duckdb_interrupt(*s.c.con)
return nil, ctx.Err()
default:
// continue
Expand Down

0 comments on commit 8ddacb3

Please sign in to comment.