syncer(dm): use DML library #4313

lance6716 · 2022-01-13T03:19:44Z

What problem does this PR solve?

Issue Number: ref #3242

What is changed and how it works?

DM side switched to the DML library of #4376

Check List

Tests

pass original test

Code changes

Side effects

Related changes

Release note

`None`.

ti-chi-bot · 2022-01-13T03:19:45Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

GMHDBJD
glorv

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

lance6716 · 2022-01-16T09:45:28Z

/run-dm-integration-test

lance6716 · 2022-01-16T09:47:53Z

GBK integration test has passed succesful, I'll split this PR into smaller ones to make it easier to review

lance6716 · 2022-01-16T12:17:05Z

/run-dm-integration-test

lance6716 · 2022-01-16T12:53:35Z

/run-dm-integration-test

lance6716 · 2022-01-17T02:21:39Z

/run-dm-integration-test

lance6716 · 2022-01-17T02:45:08Z

a good CI https://ci2.pingcap.net/blue/organizations/jenkins/dm_ghpr_integration_test/detail/dm_ghpr_integration_test/2843/pipeline

lance6716 · 2022-02-08T11:25:43Z

unit tests and integration tests passed. Most changes are to cope with existing unit tests and delete repeat codes.

/cc @GMHDBJD @glorv @Ehco1996

GMHDBJD

rest LGTM

GMHDBJD · 2022-02-10T05:10:05Z

dm/syncer/compactor.go

 		}
-	case del:
-		// do nothing because anything + DELETE => DELETE
+	}


Why not also skip reduce RowChangeDelete?

we only run compactor for row changes whose PR/UK doesn't change, I think it's both OK.

And I want to apply Reduce to all combinations of row change so I want to reduce the presence of skipReduce. If we implement multi-row version of UPDATE in future, I think we can also remove the // DELETE + INSERT => INSERT with safemode extra path

GMHDBJD · 2022-02-10T05:20:43Z

dm/syncer/compactor.go

-			if j.dml.op == update && j.dml.updateIdentify() {
-				delDML, insertDML := updateToDelAndInsert(j.dml)
+			if j.dml.IsIdentityUpdated() {
+				delDML, insertDML := j.dml.Split()


How about SplitUpdate()

GMHDBJD

LGTM

lance6716 · 2022-02-11T02:03:19Z

ptal @Ehco1996 @glorv @lichunzhu

CI has passed in previous commits

glorv

LGTM

glorv · 2022-02-11T03:50:39Z

dm/syncer/dml_worker.go

+		case sqlmodel.RowChangeUpdate:
+			if j.safeMode {
+				query, arg = j.dml.GenSQL(sqlmodel.DMLDelete)
+				appendQueryAndArg()


Seems we can move all appendQueryAndArg out of the switch except this one

glorv · 2022-02-11T04:00:50Z

dm/syncer/job.go

+}
+
+// newDummyJob is only used in tests.
+func newDummyJob(tp opType, targetTable *filter.Table, ddls ...string) *job {


Nit: We can move this function to _test.go since it is a package private function.

lichunzhu · 2022-02-11T05:28:35Z

dm/syncer/dml.go

-	}
-	return
-}
-
 // genDMLParam stores pruned columns, data as well as the original columns, data, index.


We should update this comment

lance6716 · 2022-02-11T06:26:03Z

updated, PTAL @lichunzhu

codecov-commenter · 2022-02-11T06:43:26Z

Codecov Report

Merging #4313 (935c1ea) into master (9607554) will decrease coverage by 0.1363%.
The diff coverage is 61.6892%.

Flag	Coverage Δ
cdc	`60.3103% <62.9976%> (+0.3880%)`	⬆️
dm	`51.3658% <61.0678%> (-0.6631%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@@               Coverage Diff                @@
##             master      #4313        +/-   ##
================================================
- Coverage   55.6402%   55.5038%   -0.1364%     
================================================
  Files           494        503         +9     
  Lines         61283      62129       +846     
================================================
+ Hits          34098      34484       +386     
- Misses        23750      24195       +445     
- Partials       3435       3450        +15

lichunzhu

LGTM

lance6716 · 2022-02-11T06:44:38Z

/merge

ti-chi-bot · 2022-02-11T06:44:41Z

This pull request has been accepted and is ready to merge.

Commit hash: 935c1ea

lance6716 · 2022-02-11T08:20:38Z

/run-leak-test
/run-integration-test
/run-kafka-integration-test

lance6716 · 2022-02-11T08:44:49Z

/run-kafka-integration-test

lance6716 · 2022-02-11T08:59:21Z

/run-kafka-integration-test

lance6716 · 2022-02-11T09:22:29Z

/run-kafka-integration-test

lance6716 · 2022-02-11T09:23:58Z

/run-kafka-integration-test /tidb=pr/32081

ref pingcap#3242

lance6716 force-pushed the common-dml branch from 603acf4 to 96dc8c5 Compare January 13, 2022 10:18

ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 13, 2022

Ehco1996 added area/ticdc Issues or PRs related to TiCDC. area/dm Issues or PRs related to DM. labels Jan 13, 2022

lance6716 force-pushed the common-dml branch 4 times, most recently from 42845c2 to a2ac57d Compare January 16, 2022 09:45

save work

c1c1b09

lance6716 force-pushed the common-dml branch from a2ac57d to c1c1b09 Compare January 16, 2022 12:16

lance6716 added 2 commits January 16, 2022 20:53

add some comments

d5a009f

Merge branch 'master' into common-dml

32db3b4

fix test

0ef67c4

lance6716 added 2 commits January 17, 2022 21:05

add some unit test

030ae33

add more UT

5ad89ad

lance6716 mentioned this pull request Jan 20, 2022

pkg(both): a separate library for DML row change #4376

Merged

ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 26, 2022

ti-chi-bot removed the do-not-merge/needs-linked-issue label Feb 8, 2022

ti-chi-bot requested review from Ehco1996, glorv and GMHDBJD February 8, 2022 11:25

GMHDBJD reviewed Feb 10, 2022

View reviewed changes

lance6716 and others added 2 commits February 10, 2022 13:46

address comment

d4f9693

Merge branch 'master' into common-dml

fe2d539

GMHDBJD approved these changes Feb 10, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 10, 2022

glorv approved these changes Feb 11, 2022

View reviewed changes

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Feb 11, 2022

lichunzhu reviewed Feb 11, 2022

View reviewed changes

lance6716 added 2 commits February 11, 2022 14:25

address comment

539cd42

Merge branch 'master' into common-dml

935c1ea

lichunzhu approved these changes Feb 11, 2022

View reviewed changes

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 11, 2022

ti-chi-bot merged commit edad7da into pingcap:master Feb 11, 2022

zhaoxinyu pushed a commit to zhaoxinyu/ticdc that referenced this pull request Feb 16, 2022

syncer(dm): use DML library (pingcap#4313)

e7ec34a

ref pingcap#3242

lance6716 deleted the common-dml branch October 13, 2022 08:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

syncer(dm): use DML library #4313

syncer(dm): use DML library #4313

lance6716 commented Jan 13, 2022 •

edited

Loading

ti-chi-bot commented Jan 13, 2022 •

edited

Loading

lance6716 commented Jan 16, 2022

lance6716 commented Jan 16, 2022

lance6716 commented Jan 16, 2022

lance6716 commented Jan 16, 2022

lance6716 commented Jan 17, 2022

lance6716 commented Jan 17, 2022

lance6716 commented Feb 8, 2022

GMHDBJD left a comment

GMHDBJD Feb 10, 2022

lance6716 Feb 10, 2022

GMHDBJD Feb 10, 2022

GMHDBJD left a comment

lance6716 commented Feb 11, 2022

glorv left a comment

glorv Feb 11, 2022

glorv Feb 11, 2022

lichunzhu Feb 11, 2022

lance6716 commented Feb 11, 2022

codecov-commenter commented Feb 11, 2022 •

edited

Loading

lichunzhu left a comment

lance6716 commented Feb 11, 2022

ti-chi-bot commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Feb 11, 2022

syncer(dm): use DML library #4313

syncer(dm): use DML library #4313

Conversation

lance6716 commented Jan 13, 2022 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Jan 13, 2022 • edited Loading

lance6716 commented Jan 16, 2022

lance6716 commented Jan 16, 2022

lance6716 commented Jan 16, 2022

lance6716 commented Jan 16, 2022

lance6716 commented Jan 17, 2022

lance6716 commented Jan 17, 2022

lance6716 commented Feb 8, 2022

GMHDBJD left a comment

Choose a reason for hiding this comment

GMHDBJD Feb 10, 2022

Choose a reason for hiding this comment

lance6716 Feb 10, 2022

Choose a reason for hiding this comment

GMHDBJD Feb 10, 2022

Choose a reason for hiding this comment

GMHDBJD left a comment

Choose a reason for hiding this comment

lance6716 commented Feb 11, 2022

glorv left a comment

Choose a reason for hiding this comment

glorv Feb 11, 2022

Choose a reason for hiding this comment

glorv Feb 11, 2022

Choose a reason for hiding this comment

lichunzhu Feb 11, 2022

Choose a reason for hiding this comment

lance6716 commented Feb 11, 2022

codecov-commenter commented Feb 11, 2022 • edited Loading

Codecov Report

lichunzhu left a comment

Choose a reason for hiding this comment

lance6716 commented Feb 11, 2022

ti-chi-bot commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Feb 11, 2022

lance6716 commented Jan 13, 2022 •

edited

Loading

ti-chi-bot commented Jan 13, 2022 •

edited

Loading

codecov-commenter commented Feb 11, 2022 •

edited

Loading