From df7760feee4cad9769d0abaea9fa51fbbe7338ae Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Mon, 7 Aug 2023 20:18:09 +0800 Subject: [PATCH] lightning: fix routes panic for csv data load (#45405) (#45537) close pingcap/tidb#43284 --- br/pkg/lightning/mydump/loader.go | 18 ++++++++++++++++++ br/pkg/lightning/mydump/loader_test.go | 17 +++++++++++++++++ br/tests/lightning_routes_panic/config.toml | 9 +++++++++ .../data/test1.dump_test.001.sql | 1 + .../data/test1.dump_test.002.sql | 1 + .../data/test1.dump_test.003.sql | 1 + br/tests/lightning_routes_panic/run.sh | 18 ++++++++++++++++++ 7 files changed, 65 insertions(+) create mode 100644 br/tests/lightning_routes_panic/config.toml create mode 100644 br/tests/lightning_routes_panic/data/test1.dump_test.001.sql create mode 100644 br/tests/lightning_routes_panic/data/test1.dump_test.002.sql create mode 100644 br/tests/lightning_routes_panic/data/test1.dump_test.003.sql create mode 100755 br/tests/lightning_routes_panic/run.sh diff --git a/br/pkg/lightning/mydump/loader.go b/br/pkg/lightning/mydump/loader.go index 3dfe132ec8fed..fa406f65e8ba2 100644 --- a/br/pkg/lightning/mydump/loader.go +++ b/br/pkg/lightning/mydump/loader.go @@ -529,12 +529,30 @@ func (s *mdLoaderSetup) route() error { } } for _, info := range s.tableSchemas { + if _, ok := knownDBNames[info.TableName.Schema]; !ok { + knownDBNames[info.TableName.Schema] = &dbInfo{ + fileMeta: info.FileMeta, + count: 1, + } + } knownDBNames[info.TableName.Schema].count++ } for _, info := range s.viewSchemas { + if _, ok := knownDBNames[info.TableName.Schema]; !ok { + knownDBNames[info.TableName.Schema] = &dbInfo{ + fileMeta: info.FileMeta, + count: 1, + } + } knownDBNames[info.TableName.Schema].count++ } for _, info := range s.tableDatas { + if _, ok := knownDBNames[info.TableName.Schema]; !ok { + knownDBNames[info.TableName.Schema] = &dbInfo{ + fileMeta: info.FileMeta, + count: 1, + } + } knownDBNames[info.TableName.Schema].count++ } diff --git a/br/pkg/lightning/mydump/loader_test.go b/br/pkg/lightning/mydump/loader_test.go index 58236d7b626f5..30928ac06e1d1 100644 --- a/br/pkg/lightning/mydump/loader_test.go +++ b/br/pkg/lightning/mydump/loader_test.go @@ -688,6 +688,23 @@ func TestRouter(t *testing.T) { } } +func TestRoutesPanic(t *testing.T) { + s := newTestMydumpLoaderSuite(t) + s.cfg.Routes = []*router.TableRule{ + { + SchemaPattern: "test1", + TargetSchema: "test", + }, + } + + s.touch(t, "test1.dump_test.001.sql") + s.touch(t, "test1.dump_test.002.sql") + s.touch(t, "test1.dump_test.003.sql") + + _, err := md.NewMyDumpLoader(context.Background(), s.cfg) + require.NoError(t, err) +} + func TestBadRouterRule(t *testing.T) { s := newTestMydumpLoaderSuite(t) diff --git a/br/tests/lightning_routes_panic/config.toml b/br/tests/lightning_routes_panic/config.toml new file mode 100644 index 0000000000000..1e6e444e7fe74 --- /dev/null +++ b/br/tests/lightning_routes_panic/config.toml @@ -0,0 +1,9 @@ +[tikv-importer] +backend = 'local' + +# here we're verifying that routes does not panic for csv data load. +[[routes]] +schema-pattern = "test1" +table-pattern = "d*" +target-schema = "test" +target-table = "u" diff --git a/br/tests/lightning_routes_panic/data/test1.dump_test.001.sql b/br/tests/lightning_routes_panic/data/test1.dump_test.001.sql new file mode 100644 index 0000000000000..22f20b3808dd1 --- /dev/null +++ b/br/tests/lightning_routes_panic/data/test1.dump_test.001.sql @@ -0,0 +1 @@ +insert into dump_test values (1.0); diff --git a/br/tests/lightning_routes_panic/data/test1.dump_test.002.sql b/br/tests/lightning_routes_panic/data/test1.dump_test.002.sql new file mode 100644 index 0000000000000..e1bfd3fd8f7c1 --- /dev/null +++ b/br/tests/lightning_routes_panic/data/test1.dump_test.002.sql @@ -0,0 +1 @@ +insert into dump_test values (6.0); diff --git a/br/tests/lightning_routes_panic/data/test1.dump_test.003.sql b/br/tests/lightning_routes_panic/data/test1.dump_test.003.sql new file mode 100644 index 0000000000000..403e49b03fbf4 --- /dev/null +++ b/br/tests/lightning_routes_panic/data/test1.dump_test.003.sql @@ -0,0 +1 @@ +insert into dump_test values (36.0); diff --git a/br/tests/lightning_routes_panic/run.sh b/br/tests/lightning_routes_panic/run.sh new file mode 100755 index 0000000000000..37661999b3320 --- /dev/null +++ b/br/tests/lightning_routes_panic/run.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +# Basic check for whether routing rules work + +set -eux + +run_sql 'DROP DATABASE IF EXISTS test1;' +run_sql 'DROP DATABASE IF EXISTS test;' + +run_sql 'CREATE DATABASE test1;' +run_sql 'CREATE DATABASE test;' +run_sql 'CREATE TABLE test1.dump_test (x real primary key);' +run_sql 'CREATE TABLE test.u (x real primary key);' + +run_lightning + +run_sql 'SELECT sum(x) FROM test.u;' +check_contains 'sum(x): 43'