reactor:multiple delete executor #482

liiibpm · 2023-02-19T14:13:26Z

What this PR does:

Which issue(s) this PR fixes:

Fixes #475

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

CLAassistant · 2023-02-19T14:13:31Z

All committers have signed the CLA.

codecov-commenter · 2023-02-19T14:16:32Z

Codecov Report

Merging #482 (6d76920) into master (e3060d0) will increase coverage by 0.11%.
The diff coverage is 44.59%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##           master     #482      +/-   ##
==========================================
+ Coverage   38.72%   38.84%   +0.11%     
==========================================
  Files         149      150       +1     
  Lines        9984    10131     +147     
==========================================
+ Hits         3866     3935      +69     
- Misses       5798     5875      +77     
- Partials      320      321       +1

Impacted Files	Coverage Δ
pkg/datasource/sql/exec/at/multi_executor.go	`0.00% <0.00%> (ø)`
pkg/datasource/sql/exec/at/multi_update_excutor.go	`32.35% <ø> (ø)`
...kg/datasource/sql/exec/at/multi_delete_executor.go	`45.51% <45.51%> (ø)`
pkg/datasource/sql/exec/at/base_executor.go	`39.13% <0.00%> (+1.18%)`	⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

georgehao · 2023-02-19T14:35:25Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

@@ -0,0 +1,193 @@
+package at


add License header

直接执行 sh goimport.sh脚本就行

georgehao · 2023-02-19T14:35:38Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+	"fmt"
+	"github.com/arana-db/parser/ast"
+	"github.com/arana-db/parser/format"
+	"github.com/seata/seata-go/pkg/datasource/sql/datasource"


format import header

这格式还是不对

georgehao · 2023-02-19T14:36:35Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+}
+
+//NewMultiDeleteExecutor get multiDelete executor
+func NewMultiDeleteExecutor(parserCtx *types.ParseContext, execContent *types.ExecContext, hooks []exec.SQLHook) executor {


move NewMultiDeleteExecutor to type multiDeleteExecutor struct next line

luky116 · 2023-02-20T01:05:36Z

参考这个PR，把at_executor.go文件完善下
https://github.com/seata/seata-go/pull/481/files#diff-84f163a33322f2f1282a877450c2dbe24769b8caf415962d4724f8fbfd90554a

Issues-translate-bot · 2023-02-20T01:05:47Z

RoBot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Refer to this PR and improve the at_executor.go file
https://github.com/seata/seata-go/pull/481/files#diff-84f163a33322f2f1282a877450c2dbe24769b8caf415962d4724f8fbfd90554a

luky116 · 2023-02-20T01:06:03Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

@@ -0,0 +1,193 @@
+package at


直接执行 sh goimport.sh脚本就行

luky116 · 2023-02-20T01:20:28Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+	return &multiDeleteExecutor{parserCtx: parserCtx, execContext: execContent, baseExecutor: baseExecutor{hooks: hooks}}
+}
+
+func (m *multiDeleteExecutor) BeforeImage(ctx context.Context) ([]*types.RecordImage, error) {


首字母小写：beforeImage

luky116 · 2023-02-20T01:20:47Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+
+}
+
+func (m *multiDeleteExecutor) AfterImage(ctx context.Context) ([]*types.RecordImage, error) {


首字母小写：afterImage

luky116 · 2023-02-20T01:47:16Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+	return nil, nil
+}
+
+func (m *multiDeleteExecutor) buildBeforeImageSQL(multiQuery []string, args []driver.NamedValue) ([]string, []driver.NamedValue, error) {


multiQuery 参数可以从m.execContext.Query拿到，args参数可以从m.execContext.NamedValues拿到，这里可以不传参数进来

luky116 · 2023-02-20T01:48:35Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+			lockKey := m.buildLockKey(image, *metaData)
+			m.execContext.TxCtx.LockKeys[lockKey] = struct{}{}
+		}
+	} else {


else 逻辑改为 if !ok{} ，放在79行前面

georgehao · 2023-02-21T11:41:47Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+	}
+	var (
+		rowsi driver.Rows
+


delete 空行

luky116 · 2023-02-28T00:54:54Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+		log.Errorf("target conn should been driver.QueryerContext or driver.Queryer")
+		return nil, fmt.Errorf("invalid conn")
+	}
+	if ok {


if ok的条件可以删了，因为上面已经退出了

luky116 · 2023-02-28T00:56:46Z

pkg/datasource/sql/exec/at/multi_delete_executor.go

+		}
+		tableName = p.DeleteStmt.TableRefs.TableRefs.Left.(*ast.TableSource).Source.(*ast.TableName).Name.O
+
+		v, ok := tables[tableName]


151~156行代码改为如下：

ps, err := parser.DoParser(m.execContext.Query) if err != nil { return nil, nil, err } for _, p = range ps.MultiStmt { tableName = p.DeleteStmt.TableRefs.TableRefs.Left.(*ast.TableSource).Source.(*ast.TableName).Name.O

luky116 · 2023-02-28T01:22:42Z

这里加上这些代码：

Issues-translate-bot · 2023-02-28T01:22:55Z

RoBot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Add these codes here:

luky116 · 2023-02-28T01:26:56Z

移除这部分代码，因为multidelete时候，前后镜像是不一样的

Issues-translate-bot · 2023-02-28T01:27:07Z

RoBot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

luky116 · 2023-02-28T01:36:16Z

multi_executor文件改动：

for _, beforeImage := range beforeImages {
    m.execContext.TxCtx.RoundImages.AppendBeofreImage(beforeImage)
}
for _, afterImage := range afterImages {
    m.execContext.TxCtx.RoundImages.AppendAfterImage(afterImage)
}

Issues-translate-bot · 2023-02-28T01:36:28Z

RoBot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

multi_executor文件改动：

for _, beforeImage := range beforeImages {
    m.execContext.TxCtx.RoundImages.AppendBeofreImage(beforeImage)
}
for _, afterImage := range beforeImages {
    m.execContext.TxCtx.RoundImages.AppendAfterImage(afterImage)
}

* reactor:multiple delete executor

reactor:multiple delete executor

a20c3e3

github-actions bot added the coding label Feb 19, 2023

georgehao reviewed Feb 19, 2023

View reviewed changes

liiibpm and others added 5 commits February 20, 2023 14:47

add License header

c3ce911

reactor:multiple delete executor

a7cb52b

format import header

c479086

Merge branch 'seata:master' into master

756a430

format import header

e987042

luky116 reviewed Feb 20, 2023

View reviewed changes

georgehao reviewed Feb 21, 2023

View reviewed changes

pkg/datasource/sql/exec/at/multi_delete_executor.go Outdated

}

var (

rowsi driver.Rows

Copy link

Contributor

georgehao Feb 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete 空行

liiibpm added 4 commits February 25, 2023 13:12

multidelete bug fix

1529f7b

multidelete bug fix

20f5bfb

reactor: multidelete

23acf4a

reactor: multidelete

164cfcc

luky116 reviewed Feb 28, 2023

View reviewed changes

liiibpm and others added 2 commits March 1, 2023 14:41

Merge branch 'seata:master' into master

6d76920

reactor: multidelete

a6d3fae

luky116 approved these changes Mar 4, 2023

View reviewed changes

luky116 requested a review from 106umao March 4, 2023 08:50

georgehao approved these changes Mar 4, 2023

View reviewed changes

luky116 merged commit f2d7d8a into apache:master Mar 4, 2023

luky116 mentioned this pull request Mar 11, 2023

Integrate and test multi delete sql #440

Closed

georgehao pushed a commit to georgehao/seata-go that referenced this pull request May 7, 2023

reactor:multiple delete executor (apache#482)

d2deebf

* reactor:multiple delete executor

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

reactor:multiple delete executor #482

reactor:multiple delete executor #482

liiibpm commented Feb 19, 2023 •

edited by luky116

Loading

CLAassistant commented Feb 19, 2023 •

edited

Loading

codecov-commenter commented Feb 19, 2023 •

edited

Loading

georgehao Feb 19, 2023

luky116 Feb 20, 2023

georgehao Feb 19, 2023

georgehao Feb 21, 2023

georgehao Feb 19, 2023

luky116 commented Feb 20, 2023

Issues-translate-bot commented Feb 20, 2023

luky116 Feb 20, 2023

luky116 Feb 20, 2023

luky116 Feb 20, 2023

luky116 Feb 20, 2023

luky116 Feb 20, 2023

georgehao Feb 21, 2023

luky116 Feb 28, 2023

luky116 Feb 28, 2023

liiibpm Mar 1, 2023

luky116 commented Feb 28, 2023

Issues-translate-bot commented Feb 28, 2023

luky116 commented Feb 28, 2023 •

edited

Loading

Issues-translate-bot commented Feb 28, 2023

luky116 commented Feb 28, 2023 •

edited

Loading

Issues-translate-bot commented Feb 28, 2023


		}

		func (m multiDeleteExecutor) AfterImage(ctx context.Context) ([]types.RecordImage, error) {

reactor:multiple delete executor #482

reactor:multiple delete executor #482

Conversation

liiibpm commented Feb 19, 2023 • edited by luky116 Loading

CLAassistant commented Feb 19, 2023 • edited Loading

codecov-commenter commented Feb 19, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

luky116 commented Feb 20, 2023

Issues-translate-bot commented Feb 20, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

luky116 commented Feb 28, 2023

Issues-translate-bot commented Feb 28, 2023

luky116 commented Feb 28, 2023 • edited Loading

Issues-translate-bot commented Feb 28, 2023

luky116 commented Feb 28, 2023 • edited Loading

Issues-translate-bot commented Feb 28, 2023

liiibpm commented Feb 19, 2023 •

edited by luky116

Loading

CLAassistant commented Feb 19, 2023 •

edited

Loading

codecov-commenter commented Feb 19, 2023 •

edited

Loading

luky116 commented Feb 28, 2023 •

edited

Loading

luky116 commented Feb 28, 2023 •

edited

Loading