fix(database/gdb): fix context canceled error in transaction due to usage of TransTimeout configuration (#4037)

Makefile

@@ -1,16 +1,20 @@
 SHELL := /bin/bash
 
+# execute "go mod tidy" on all folders that have go.mod file
 .PHONY: tidy
 tidy:
 	$(eval files=$(shell find . -name go.mod))
 	@set -e; \
 	for file in ${files}; do \
 		goModPath=$$(dirname $$file); \
-		cd $$goModPath; \
+		if ! echo $$goModPath | grep -q "testdata"; then \
-		go mod tidy; \
+			cd $$goModPath; \
-		cd -; \
+			go mod tidy; \
+			cd -; \
+		fi \
 	done
 
+# execute "golangci-lint" to check code style
 .PHONY: lint
 lint:
 	golangci-lint run -c .golangci.yml
@@ -22,5 +26,3 @@ version:
 	newVersion=$(to); \
 	./.set_version.sh ./ $$newVersion; \
 	echo "make version to=$(to) done"
-
-

cmd/gf/go.sum

@@ -39,6 +39,20 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.2 h1:4g5n8QdJA7ZEuDfWFeVQKMhul6RtOT89ObYAgVnxN+U=
+github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.2/go.mod h1:xW1mgNK0vTLfRSCnO0No8G4lCGNpXx1Jlhs6B1vzD+8=
+github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.2 h1:aNscErx5mcC28Q1L0MsZFFXybzLY/IJhskyiPAbxB78=
+github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.2/go.mod h1:yj6+Ds2BGzYcHthPvMnxhDRzq0o28HyO9E1Fsko0Lf8=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.2 h1:thK4DZT0irDrnhIxkap5JqBuBIJaXQ0IMvlIzuRGgVQ=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.2/go.mod h1:Vg7XaiwsQ27YmpDqzwCQ+yt10KntTvcP9iOoFL5DF40=
+github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.2 h1:ZukTXB9drVDmSdrFjCYHVzHj0kAvGKISrrW3WKU1xTg=
+github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.2/go.mod h1:wr+KA5h3+aJQk5XiA1qSNKxWBVrzlu8MVYKl1NqcQj4=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.2 h1:BsEBGoVfa4SPJ8GhNkH9PPtoSLydXK+VgcbpxyGF9Ps=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.2/go.mod h1:OSlAQeO7fZMbscxZomMCBcZWHSxpfeXIi6ELeKszSPU=
+github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.2 h1:144IdPDn6xyHVQ5aP4qsstFvNOLqvWyz+GtH3JD1rWg=
+github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.2/go.mod h1:xOgOp3SSdWHIEqviYC1kd3p6mJtfFkrcinBWdpgVUxc=
+github.com/gogf/gf/v2 v2.8.2 h1:4k641rn+hV1COAKygqsqcTm8+lDTkcO8HQ4iBv/uTFs=
+github.com/gogf/gf/v2 v2.8.2/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY=
 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM=
 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=

contrib/drivers/mysql/mysql_z_unit_init_test.go

@@ -44,18 +44,22 @@ func init() {
 	nodeDefault := gdb.ConfigNode{
 		ExecTimeout: time.Second * 2,
 		Link:        fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3306)/?loc=Local&parseTime=true", TestDbPass),
+		TranTimeout: time.Second * 3,
 	}
 	partitionDefault := gdb.ConfigNode{
-		Link:  fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
+		Link:        fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
-		Debug: true,
+		Debug:       true,
+		TranTimeout: time.Second * 3,
 	}
 	nodePrefix := gdb.ConfigNode{
-		Link: fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3306)/?loc=Local&parseTime=true", TestDbPass),
+		Link:        fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3306)/?loc=Local&parseTime=true", TestDbPass),
+		TranTimeout: time.Second * 3,
 	}
 	nodePrefix.Prefix = TableNamePrefix1
 
 	nodeInvalid := gdb.ConfigNode{
-		Link: fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
+		Link:        fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
+		TranTimeout: time.Second * 3,
 	}
 	gdb.AddConfigNode("test", nodeDefault)
 	gdb.AddConfigNode("prefix", nodePrefix)

contrib/drivers/mysql/mysql_z_unit_issue_test.go

@@ -1556,3 +1556,37 @@ func Test_Issue2119(t *testing.T) {
 		}
 	})
 }
+
+// https://github.com/gogf/gf/issues/4034
+func Test_Issue4034(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		table := "issue4034"
+		array := gstr.SplitAndTrim(gtest.DataContent(`issue4034.sql`), ";")
+		for _, v := range array {
+			_, err := db.Exec(ctx, v)
+			t.AssertNil(err)
+		}
+		defer dropTable(table)
+
+		err := issue4034SaveDeviceAndToken(ctx, table)
+		t.AssertNil(err)
+	})
+}
+
+func issue4034SaveDeviceAndToken(ctx context.Context, table string) error {
+	return db.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		if err := issue4034SaveAppDevice(ctx, table, tx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func issue4034SaveAppDevice(ctx context.Context, table string, tx gdb.TX) error {
+	_, err := db.Model(table).Safe().Ctx(ctx).TX(tx).Data(g.Map{
+		"passport": "111",
+		"password": "222",
+		"nickname": "333",
+	}).Save()
+	return err
+}

contrib/drivers/mysql/testdata/issue4034.sql

@@ -0,0 +1,8 @@
+CREATE TABLE issue4034 (
+    id INT PRIMARY KEY AUTO_INCREMENT,
+    passport VARCHAR(255),
+    password VARCHAR(255),
+    nickname VARCHAR(255),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+);

contrib/drivers/pgsql/pgsql_do_exec.go

@@ -64,12 +64,6 @@ func (d *Driver) DoExec(ctx context.Context, link gdb.Link, sql string, args ...
 
 	// Only the insert operation with primary key can execute the following code
 
-	if d.GetConfig().ExecTimeout > 0 {
-		var cancelFunc context.CancelFunc
-		ctx, cancelFunc = context.WithTimeout(ctx, d.GetConfig().ExecTimeout)
-		defer cancelFunc()
-	}
-
 	// Sql filtering.
 	sql, args = d.FormatSqlBeforeExecuting(sql, args)
 	sql, args, err = d.DoFilter(ctx, link, sql, args)

database/gdb/gdb.go

@@ -528,24 +528,53 @@ type dynamicConfig struct {
 
 // DoCommitInput is the input parameters for function DoCommit.
 type DoCommitInput struct {
-	Db            *sql.DB
+	// Db is the underlying database connection object.
-	Tx            *sql.Tx
+	Db *sql.DB
-	Stmt          *sql.Stmt
+
-	Link          Link
+	// Tx is the underlying transaction object.
-	Sql           string
+	Tx *sql.Tx
-	Args          []interface{}
+
-	Type          SqlType
+	// Stmt is the prepared statement object.
-	TxOptions     sql.TxOptions
+	Stmt *sql.Stmt
+
+	// Link is the common database function wrapper interface.
+	Link Link
+
+	// Sql is the SQL string to be executed.
+	Sql string
+
+	// Args is the arguments for SQL placeholders.
+	Args []interface{}
+
+	// Type indicates the type of SQL operation.
+	Type SqlType
+
+	// TxOptions specifies the transaction options.
+	TxOptions sql.TxOptions
+
+	// TxCancelFunc is the context cancel function for transaction.
+	TxCancelFunc context.CancelFunc
+
+	// IsTransaction indicates whether current operation is in transaction.
 	IsTransaction bool
 }
 
 // DoCommitOutput is the output parameters for function DoCommit.
 type DoCommitOutput struct {
-	Result    sql.Result  // Result is the result of exec statement.
+	// Result is the result of exec statement.
-	Records   []Record    // Records is the result of query statement.
+	Result sql.Result
-	Stmt      *Stmt       // Stmt is the Statement object result for Prepare.
+
-	Tx        TX          // Tx is the transaction object result for Begin.
+	// Records is the result of query statement.
-	RawResult interface{} // RawResult is the underlying result, which might be sql.Result/*sql.Rows/*sql.Row.
+	Records []Record
+
+	// Stmt is the Statement object result for Prepare.
+	Stmt *Stmt
+
+	// Tx is the transaction object result for Begin.
+	Tx TX
+
+	// RawResult is the underlying result, which might be sql.Result/*sql.Rows/*sql.Row.
+	RawResult interface{}
 }
 
 // Driver is the interface for integrating sql drivers into package gdb.
@@ -581,43 +610,84 @@ type Sql struct {
 
 // DoInsertOption is the input struct for function DoInsert.
 type DoInsertOption struct {
-	OnDuplicateStr string                 // Custom string for `on duplicated` statement.
+	// OnDuplicateStr is the custom string for `on duplicated` statement.
-	OnDuplicateMap map[string]interface{} // Custom key-value map from `OnDuplicateEx` function for `on duplicated` statement.
+	OnDuplicateStr string
-	OnConflict     []string               // Custom conflict key of upsert clause, if the database needs it.
+
-	InsertOption   InsertOption           // Insert operation in constant value.
+	// OnDuplicateMap is the custom key-value map from `OnDuplicateEx` function for `on duplicated` statement.
-	BatchCount     int                    // Batch count for batch inserting.
+	OnDuplicateMap map[string]interface{}
+
+	// OnConflict is the custom conflict key of upsert clause, if the database needs it.
+	OnConflict []string
+
+	// InsertOption is the insert operation in constant value.
+	InsertOption InsertOption
+
+	// BatchCount is the batch count for batch inserting.
+	BatchCount int
 }
 
 // TableField is the struct for table field.
 type TableField struct {
-	Index   int         // For ordering purpose as map is unordered.
+	// Index is for ordering purpose as map is unordered.
-	Name    string      // Field name.
+	Index int
-	Type    string      // Field type. Eg: 'int(10) unsigned', 'varchar(64)'.
+
-	Null    bool        // Field can be null or not.
+	// Name is the field name.
-	Key     string      // The index information(empty if it's not an index). Eg: PRI, MUL.
+	Name string
-	Default interface{} // Default value for the field.
+
-	Extra   string      // Extra information. Eg: auto_increment.
+	// Type is the field type. Eg: 'int(10) unsigned', 'varchar(64)'.
-	Comment string      // Field comment.
+	Type string
+
+	// Null is whether the field can be null or not.
+	Null bool
+
+	// Key is the index information(empty if it's not an index). Eg: PRI, MUL.
+	Key string
+
+	// Default is the default value for the field.
+	Default interface{}
+
+	// Extra is the extra information. Eg: auto_increment.
+	Extra string
+
+	// Comment is the field comment.
+	Comment string
 }
 
-// Counter  is the type for update count.
+// Counter is the type for update count.
 type Counter struct {
+	// Field is the field name.
 	Field string
+
+	// Value is the value.
 	Value float64
 }
 
 type (
-	Raw    string                   // Raw is a raw sql that will not be treated as argument but as a direct sql part.
+	// Raw is a raw sql that will not be treated as argument but as a direct sql part.
-	Value  = *gvar.Var              // Value is the field value type.
+	Raw string
-	Record map[string]Value         // Record is the row record of the table.
+
-	Result []Record                 // Result is the row record array.
+	// Value is the field value type.
-	Map    = map[string]interface{} // Map is alias of map[string]interface{}, which is the most common usage map type.
+	Value = *gvar.Var
-	List   = []Map                  // List is type of map array.
+
+	// Record is the row record of the table.
+	Record map[string]Value
+
+	// Result is the row record array.
+	Result []Record
+
+	// Map is alias of map[string]interface{}, which is the most common usage map type.
+	Map = map[string]interface{}
+
+	// List is type of map array.
+	List = []Map
 )
 
 type CatchSQLManager struct {
+	// SQLArray is the array of sql.
 	SQLArray *garray.StrArray
-	DoCommit bool // DoCommit marks it will be committed to underlying driver or not.
+
+	// DoCommit marks it will be committed to underlying driver or not.
+	DoCommit bool
 }
 
 const (

database/gdb/gdb_core.go

@@ -92,7 +92,6 @@ func (c *Core) GetCtxTimeout(ctx context.Context, timeoutType ctxTimeoutType) (c
 		if c.db.GetConfig().PrepareTimeout > 0 {
 			return context.WithTimeout(ctx, config.PrepareTimeout)
 		}
-
 	case ctxTimeoutTypeTrans:
 		if c.db.GetConfig().TranTimeout > 0 {
 			return context.WithTimeout(ctx, config.TranTimeout)

database/gdb/gdb_core_config.go

@@ -27,36 +27,126 @@ type ConfigGroup []ConfigNode
 
 // ConfigNode is configuration for one node.
 type ConfigNode struct {
-	Host                 string        `json:"host"`                 // Host of server, ip or domain like: 127.0.0.1, localhost
+	// Host specifies the server address, can be either IP address or domain name
-	Port                 string        `json:"port"`                 // Port, it's commonly 3306.
+	// Example: "127.0.0.1", "localhost"
-	User                 string        `json:"user"`                 // Authentication username.
+	Host string `json:"host"`
-	Pass                 string        `json:"pass"`                 // Authentication password.
+
-	Name                 string        `json:"name"`                 // Default used database name.
+	// Port specifies the server port number
-	Type                 string        `json:"type"`                 // Database type: mysql, mariadb, sqlite, mssql, pgsql, oracle, clickhouse, dm.
+	// Default is typically "3306" for MySQL
-	Link                 string        `json:"link"`                 // (Optional) Custom link information for all configuration in one single string.
+	Port string `json:"port"`
-	Extra                string        `json:"extra"`                // (Optional) Extra configuration according the registered third-party database driver.
+
-	Role                 string        `json:"role"`                 // (Optional, "master" in default) Node role, used for master-slave mode: master, slave.
+	// User specifies the authentication username for database connection
-	Debug                bool          `json:"debug"`                // (Optional) Debug mode enables debug information logging and output.
+	User string `json:"user"`
-	Prefix               string        `json:"prefix"`               // (Optional) Table prefix.
+
-	DryRun               bool          `json:"dryRun"`               // (Optional) Dry run, which does SELECT but no INSERT/UPDATE/DELETE statements.
+	// Pass specifies the authentication password for database connection
-	Weight               int           `json:"weight"`               // (Optional) Weight for load balance calculating, it's useless if there's just one node.
+	Pass string `json:"pass"`
-	Charset              string        `json:"charset"`              // (Optional, "utf8" in default) Custom charset when operating on database.
+
-	Protocol             string        `json:"protocol"`             // (Optional, "tcp" in default) See net.Dial for more information which networks are available.
+	// Name specifies the default database name to be used
-	Timezone             string        `json:"timezone"`             // (Optional) Sets the time zone for displaying and interpreting time stamps.
+	Name string `json:"name"`
-	Namespace            string        `json:"namespace"`            // (Optional) Namespace for some databases. Eg, in pgsql, the `Name` acts as the `catalog`, the `NameSpace` acts as the `schema`.
+
-	MaxIdleConnCount     int           `json:"maxIdle"`              // (Optional) Max idle connection configuration for underlying connection pool.
+	// Type specifies the database type
-	MaxOpenConnCount     int           `json:"maxOpen"`              // (Optional) Max open connection configuration for underlying connection pool.
+	// Example: mysql, mariadb, sqlite, mssql, pgsql, oracle, clickhouse, dm.
-	MaxConnLifeTime      time.Duration `json:"maxLifeTime"`          // (Optional) Max amount of time a connection may be idle before being closed.
+	Type string `json:"type"`
-	QueryTimeout         time.Duration `json:"queryTimeout"`         // (Optional) Max query time for per dql.
+
-	ExecTimeout          time.Duration `json:"execTimeout"`          // (Optional) Max exec time for dml.
+	// Link provides custom connection string that combines all configuration in one string
-	TranTimeout          time.Duration `json:"tranTimeout"`          // (Optional) Max exec time for a transaction.
+	// Optional field
-	PrepareTimeout       time.Duration `json:"prepareTimeout"`       // (Optional) Max exec time for prepare operation.
+	Link string `json:"link"`
-	CreatedAt            string        `json:"createdAt"`            // (Optional) The field name of table for automatic-filled created datetime.
+
-	UpdatedAt            string        `json:"updatedAt"`            // (Optional) The field name of table for automatic-filled updated datetime.
+	// Extra provides additional configuration options for third-party database drivers
-	DeletedAt            string        `json:"deletedAt"`            // (Optional) The field name of table for automatic-filled updated datetime.
+	// Optional field
-	TimeMaintainDisabled bool          `json:"timeMaintainDisabled"` // (Optional) Disable the automatic time maintaining feature.
+	Extra string `json:"extra"`
+
+	// Role specifies the node role in master-slave setup
+	// Optional field, defaults to "master"
+	// Available values: "master", "slave"
+	Role Role `json:"role"`
+
+	// Debug enables debug mode for logging and output
+	// Optional field
+	Debug bool `json:"debug"`
+
+	// Prefix specifies the table name prefix
+	// Optional field
+	Prefix string `json:"prefix"`
+
+	// DryRun enables simulation mode where SELECT statements are executed
+	// but INSERT/UPDATE/DELETE statements are not
+	// Optional field
+	DryRun bool `json:"dryRun"`
+
+	// Weight specifies the node weight for load balancing calculations
+	// Optional field, only effective in multi-node setups
+	Weight int `json:"weight"`
+
+	// Charset specifies the character set for database operations
+	// Optional field, defaults to "utf8"
+	Charset string `json:"charset"`
+
+	// Protocol specifies the network protocol for database connection
+	// Optional field, defaults to "tcp"
+	// See net.Dial for available network protocols
+	Protocol string `json:"protocol"`
+
+	// Timezone sets the time zone for timestamp interpretation and display
+	// Optional field
+	Timezone string `json:"timezone"`
+
+	// Namespace specifies the schema namespace for certain databases
+	// Optional field, e.g., in PostgreSQL, Name is the catalog and Namespace is the schema
+	Namespace string `json:"namespace"`
+
+	// MaxIdleConnCount specifies the maximum number of idle connections in the pool
+	// Optional field
+	MaxIdleConnCount int `json:"maxIdle"`
+
+	// MaxOpenConnCount specifies the maximum number of open connections in the pool
+	// Optional field
+	MaxOpenConnCount int `json:"maxOpen"`
+
+	// MaxConnLifeTime specifies the maximum lifetime of a connection
+	// Optional field
+	MaxConnLifeTime time.Duration `json:"maxLifeTime"`
+
+	// QueryTimeout specifies the maximum execution time for DQL operations
+	// Optional field
+	QueryTimeout time.Duration `json:"queryTimeout"`
+
+	// ExecTimeout specifies the maximum execution time for DML operations
+	// Optional field
+	ExecTimeout time.Duration `json:"execTimeout"`
+
+	// TranTimeout specifies the maximum execution time for a transaction block
+	// Optional field
+	TranTimeout time.Duration `json:"tranTimeout"`
+
+	// PrepareTimeout specifies the maximum execution time for prepare operations
+	// Optional field
+	PrepareTimeout time.Duration `json:"prepareTimeout"`
+
+	// CreatedAt specifies the field name for automatic timestamp on record creation
+	// Optional field
+	CreatedAt string `json:"createdAt"`
+
+	// UpdatedAt specifies the field name for automatic timestamp on record updates
+	// Optional field
+	UpdatedAt string `json:"updatedAt"`
+
+	// DeletedAt specifies the field name for automatic timestamp on record deletion
+	// Optional field
+	DeletedAt string `json:"deletedAt"`
+
+	// TimeMaintainDisabled controls whether automatic time maintenance is disabled
+	// Optional field
+	TimeMaintainDisabled bool `json:"timeMaintainDisabled"`
 }
 
+type Role string
+
+const (
+	RoleMaster Role = "master"
+	RoleSlave  Role = "slave"
+)
+
 const (
 	DefaultGroupName = "default" // Default group name.
 )

database/gdb/gdb_core_txcore.go

@@ -20,13 +20,30 @@ import (
 
 // TXCore is the struct for transaction management.
 type TXCore struct {
-	db               DB              // db is the current gdb database manager.
+	// db is the database management interface that implements the DB interface,
-	tx               *sql.Tx         // tx is the raw and underlying transaction manager.
+	// providing access to database operations and configuration.
-	ctx              context.Context // ctx is the context for this transaction only.
+	db DB
-	master           *sql.DB         // master is the raw and underlying database manager.
+	// tx is the underlying SQL transaction object from database/sql package,
-	transactionId    string          // transactionId is a unique id generated by this object for this transaction.
+	// which manages the actual transaction operations.
-	transactionCount int             // transactionCount marks the times that Begins.
+	tx *sql.Tx
-	isClosed         bool            // isClosed marks this transaction has already been committed or rolled back.
+	// ctx is the context specific to this transaction,
+	// which can be used for timeout control and cancellation.
+	ctx context.Context
+	// master is the underlying master database connection pool,
+	// used for direct database operations when needed.
+	master *sql.DB
+	// transactionId is a unique identifier for this transaction instance,
+	// used for tracking and debugging purposes.
+	transactionId string
+	// transactionCount tracks the number of nested transaction begins,
+	// used for managing transaction nesting depth.
+	transactionCount int
+	// isClosed indicates whether this transaction has been finalized
+	// through either a commit or rollback operation.
+	isClosed bool
+	// cancelFunc is the context cancellation function associated with ctx,
+	// used to cancel the transaction context when needed.
+	cancelFunc context.CancelFunc
 }
 
 // transactionKeyForNestedPoint forms and returns the transaction key at current save point.
@@ -73,6 +90,7 @@ func (tx *TXCore) Commit() error {
 		Tx:            tx.tx,
 		Sql:           "COMMIT",
 		Type:          SqlTypeTXCommit,
+		TxCancelFunc:  tx.cancelFunc,
 		IsTransaction: true,
 	})
 	if err == nil {
@@ -94,6 +112,7 @@ func (tx *TXCore) Rollback() error {
 		Tx:            tx.tx,
 		Sql:           "ROLLBACK",
 		Type:          SqlTypeTXRollback,
+		TxCancelFunc:  tx.cancelFunc,
 		IsTransaction: true,
 	})
 	if err == nil {

database/gdb/gdb_core_underlying.go

@@ -51,12 +51,6 @@ func (c *Core) DoQuery(ctx context.Context, link Link, sql string, args ...inter
 		}
 	}
 
-	if c.db.GetConfig().QueryTimeout > 0 {
-		var cancelFunc context.CancelFunc
-		ctx, cancelFunc = context.WithTimeout(ctx, c.db.GetConfig().QueryTimeout)
-		defer cancelFunc()
-	}
-
 	// Sql filtering.
 	sql, args = c.FormatSqlBeforeExecuting(sql, args)
 	sql, args, err = c.db.DoFilter(ctx, link, sql, args)
@@ -115,12 +109,6 @@ func (c *Core) DoExec(ctx context.Context, link Link, sql string, args ...interf
 		}
 	}
 
-	if c.db.GetConfig().ExecTimeout > 0 {
-		var cancelFunc context.CancelFunc
-		ctx, cancelFunc = context.WithTimeout(ctx, c.db.GetConfig().ExecTimeout)
-		defer cancelFunc()
-	}
-
 	// SQL filtering.
 	sql, args = c.FormatSqlBeforeExecuting(sql, args)
 	sql, args, err = c.db.DoFilter(ctx, link, sql, args)
@@ -183,11 +171,10 @@ func (c *Core) DoCommit(ctx context.Context, in DoCommitInput) (out DoCommitOutp
 	ctx, span := tr.Start(ctx, string(in.Type), trace.WithSpanKind(trace.SpanKindInternal))
 	defer span.End()
 
-	// Execution cased by type.
+	// Execution by type.
 	switch in.Type {
 	case SqlTypeBegin:
 		ctx, cancelFuncForTimeout = c.GetCtxTimeout(ctx, ctxTimeoutTypeTrans)
-		defer cancelFuncForTimeout()
 		formattedSql = fmt.Sprintf(
 			`%s (IosolationLevel: %s, ReadOnly: %t)`,
 			formattedSql, in.TxOptions.Isolation.String(), in.TxOptions.ReadOnly,
@@ -199,15 +186,22 @@ func (c *Core) DoCommit(ctx context.Context, in DoCommitInput) (out DoCommitOutp
 				ctx:           context.WithValue(ctx, transactionIdForLoggerCtx, transactionIdGenerator.Add(1)),
 				master:        in.Db,
 				transactionId: guid.S(),
+				cancelFunc:    cancelFuncForTimeout,
 			}
 			ctx = out.Tx.GetCtx()
 		}
 		out.RawResult = sqlTx
 
 	case SqlTypeTXCommit:
+		if in.TxCancelFunc != nil {
+			defer in.TxCancelFunc()
+		}
 		err = in.Tx.Commit()
 
 	case SqlTypeTXRollback:
+		if in.TxCancelFunc != nil {
+			defer in.TxCancelFunc()
+		}
 		err = in.Tx.Rollback()
 
 	case SqlTypeExecContext:

net/gudp/gudp_z_unit_test.go

@@ -99,14 +99,6 @@ func Test_Basic(t *testing.T) {
 			t.AssertNil(err)
 		}
 	})
-	// gudp.SendRecv
-	gtest.C(t, func(t *gtest.T) {
-		for i := 0; i < 100; i++ {
-			result, err := gudp.SendRecv(s.GetListenedAddress(), []byte(gconv.String(i)), -1)
-			t.AssertNil(err)
-			t.Assert(string(result), fmt.Sprintf(`> %d`, i))
-		}
-	})
 }
 
 // If the read buffer size is less than the sent package size,