bugfix: at model execution failed (apache#429)

* bugfix: at model execution failed
georgehao · Feb 3, 2023 · 2740434 · 2740434
1 parent 7ab546e
commit 2740434
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 0 deletions.
diff --git a/pkg/datasource/sql/exec/at/delete_executor.go b/pkg/datasource/sql/exec/at/delete_executor.go
@@ -87,6 +87,11 @@ func (d *deleteExecutor) beforeImage(ctx context.Context) (*types.RecordImage, e
 	}
 	if ok {
 		rowsi, err = util.CtxDriverQuery(ctx, queryerCtx, queryer, selectSQL, selectArgs)
+		defer func() {
+			if rowsi != nil {
+				rowsi.Close()
+			}
+		}()
 		if err != nil {
 			log.Errorf("ctx driver query: %+v", err)
 			return nil, err

diff --git a/pkg/datasource/sql/exec/at/insert_executor.go b/pkg/datasource/sql/exec/at/insert_executor.go
@@ -110,6 +110,11 @@ func (i *insertExecutor) afterImage(ctx context.Context) (*types.RecordImage, er
 	}
 	if ok {
 		rowsi, err = util.CtxDriverQuery(ctx, queryerCtx, queryer, selectSQL, selectArgs)
+		defer func() {
+			if rowsi != nil {
+				rowsi.Close()
+			}
+		}()
 		if err != nil {
 			log.Errorf("ctx driver query: %+v", err)
 			return nil, err

diff --git a/pkg/datasource/sql/exec/at/update_executor.go b/pkg/datasource/sql/exec/at/update_executor.go
@@ -108,6 +108,11 @@ func (u *updateExecutor) beforeImage(ctx context.Context) (*types.RecordImage, e
 	}
 	if ok {
 		rowsi, err = util.CtxDriverQuery(ctx, queryerCtx, queryer, selectSQL, selectArgs)
+		defer func() {
+			if rowsi != nil {
+				rowsi.Close()
+			}
+		}()
 		if err != nil {
 			log.Errorf("ctx driver query: %+v", err)
 			return nil, err
@@ -153,6 +158,11 @@ func (u *updateExecutor) afterImage(ctx context.Context, beforeImage types.Recor
 	}
 	if ok {
 		rowsi, err = util.CtxDriverQuery(ctx, queryerCtx, queryer, selectSQL, selectArgs)
+		defer func() {
+			if rowsi != nil {
+				rowsi.Close()
+			}
+		}()
 		if err != nil {
 			log.Errorf("ctx driver query: %+v", err)
 			return nil, err

diff --git a/testdata/sql/undo_log.sql b/testdata/sql/undo_log.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS `undo_log`;
+CREATE TABLE `undo_log`
+(
+    `id`            bigint(20) NOT NULL AUTO_INCREMENT,
+    `branch_id`     bigint(20) NOT NULL,
+    `xid`           varchar(100) NOT NULL,
+    `context`       varchar(128) NOT NULL,
+    `rollback_info` longblob     NOT NULL,
+    `log_status`    int(11) NOT NULL,
+    `log_created`   datetime     NOT NULL,
+    `log_modified`  datetime     NOT NULL,
+    `ext`           varchar(100) DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;