Merge pull request #530 from navytux/y/no-go-if-notneeded

Don't spawn interrupt goroutine if we know that context cannot be canceled

sqlite3.go

@@ -1124,18 +1124,20 @@ func (s *SQLiteStmt) query(ctx context.Context, args []namedValue) (driver.Rows,
 		done:     make(chan struct{}),
 	}
 
-	go func(db *C.sqlite3) {
+	if ctxdone := ctx.Done(); ctxdone != nil {
-		select {
+		go func(db *C.sqlite3) {
-		case <-ctx.Done():
 			select {
+			case <-ctxdone:
+				select {
+				case <-rows.done:
+				default:
+					C.sqlite3_interrupt(db)
+					rows.Close()
+				}
 			case <-rows.done:
-			default:
-				C.sqlite3_interrupt(db)
-				rows.Close()
 			}
-		case <-rows.done:
+		}(s.c.db)
-		}
+	}
-	}(s.c.db)
 
 	return rows, nil
 }
@@ -1169,19 +1171,21 @@ func (s *SQLiteStmt) exec(ctx context.Context, args []namedValue) (driver.Result
 		return nil, err
 	}
 
-	done := make(chan struct{})
+	if ctxdone := ctx.Done(); ctxdone != nil {
-	defer close(done)
+		done := make(chan struct{})
-	go func(db *C.sqlite3) {
+		defer close(done)
-		select {
+		go func(db *C.sqlite3) {
-		case <-done:
-		case <-ctx.Done():
 			select {
 			case <-done:
-			default:
+			case <-ctxdone:
-				C.sqlite3_interrupt(db)
+				select {
+				case <-done:
+				default:
+					C.sqlite3_interrupt(db)
+				}
 			}
-		}
+		}(s.c.db)
-	}(s.c.db)
+	}
 
 	var rowid, changes C.longlong
 	rv := C._sqlite3_step(s.s, &rowid, &changes)