feat: support mydumper dump data

mydumper commit id is : 9b24a21 ./mydumper --version mydumper 0.9.5, built against MySQL 8.0.31 how to use: $ ./mydumper -u u1 -p 123 -P 3308 -h xx --database test -c -t 8 -o /root/backdir $ ./mydumper -u u1 -p 123 -P 3308 -h xx --regex 'test|db1' -t 8 -o /root/backdir
datafuselabs · Oct 27, 2022 · 6ab3268 · 6ab3268
1 parent 84adcb9
commit 6ab3268
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/src/query/service/src/servers/mysql/mysql_federated.rs b/src/query/service/src/servers/mysql/mysql_federated.rs
@@ -217,8 +217,13 @@ impl MySQLFederated {
                 None,
             ),
             // mydumper.
+            ("(?i)^(/\\*!80003 SET(.*) \\*/)$", None),
             ("(?i)^(SHOW MASTER STATUS)", None),
             ("(?i)^(SHOW ALL SLAVES STATUS)", None),
+            ("(?i)^(LOCK BINLOG FOR BACKUP)", None),
+            ("(?i)^(LOCK TABLES FOR BACKUP)", None),
+            ("(?i)^(UNLOCK BINLOG(.*))", None),
+            ("(?i)^(/\\*!40101 SET(.*) \\*/)$", None),
             // DBeaver.
             ("(?i)^(SHOW WARNINGS)", None),
             ("(?i)^(/\\* ApplicationName=(.*)SHOW WARNINGS)", None),

diff --git a/src/query/service/tests/it/storages/testdata/system-tables.txt b/src/query/service/tests/it/storages/testdata/system-tables.txt
@@ -15,6 +15,7 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
 | cluster_by               | system   | tables_with_history | VARCHAR           |              |                    | false       |         |
 | cluster_id               | system   | query_log           | VARCHAR           |              |                    | false       |         |
 | columns                  | system   | query_log           | VARCHAR           |              |                    | false       |         |
+| command                  | system   | processes           | VARCHAR           |              |                    | false       |         |
 | comment                  | system   | columns             | VARCHAR           |              |                    | false       |         |
 | comment                  | system   | stages              | VARCHAR           |              |                    | false       |         |
 | copy_options             | system   | stages              | VARCHAR           |              |                    | false       |         |
@@ -123,7 +124,6 @@ DB.Table: 'system'.'columns', Table: columns-table_id:1, ver:0, Engine: SystemCo
 | stage_params             | system   | stages              | VARCHAR           |              |                    | false       |         |
 | stage_type               | system   | stages              | VARCHAR           |              |                    | false       |         |
 | start_time               | system   | clustering_history  | TIMESTAMP         |              |                    | false       |         |
-| state                    | system   | processes           | VARCHAR           |              |                    | false       |         |
 | status                   | system   | processes           | VARCHAR           |              |                    | false       |         |
 | syntax                   | system   | functions           | VARCHAR           |              |                    | false       |         |
 | table                    | system   | clustering_history  | VARCHAR           |              |                    | false       |         |

diff --git a/src/query/storages/preludes/src/information_schema/columns_table.rs b/src/query/storages/preludes/src/information_schema/columns_table.rs
@@ -50,7 +50,8 @@ impl ColumnsTable {
             NULL AS collation_name,
             NULL AS domain_catalog,
             NULL AS domain_schema,
-            NULL AS domain_name
+            NULL AS domain_name,
+            NULL AS extra
         FROM system.columns;";
 
         let mut options = BTreeMap::new();

diff --git a/src/query/storages/preludes/src/system/processes_table.rs b/src/query/storages/preludes/src/system/processes_table.rs
@@ -126,7 +126,7 @@ impl ProcessesTable {
             DataField::new("type", Vu8::to_data_type()),
             DataField::new_nullable("host", Vu8::to_data_type()),
             DataField::new("user", Vu8::to_data_type()),
-            DataField::new("state", Vu8::to_data_type()),
+            DataField::new("command", Vu8::to_data_type()),
             DataField::new("database", Vu8::to_data_type()),
             DataField::new("extra_info", Vu8::to_data_type()),
             DataField::new("memory_usage", i64::to_data_type()),

diff --git a/tests/logictest/suites/base/03_dml/03_0011_select_from_system_processes b/tests/logictest/suites/base/03_dml/03_0011_select_from_system_processes
@@ -1,5 +1,5 @@
 statement query TT
-select state, database from system.processes;
+select command, database from system.processes;
 
 ----
 Query default

diff --git a/tests/logictest/suites/base/20+_others/20_0000_describe_table b/tests/logictest/suites/base/20+_others/20_0000_describe_table
@@ -79,6 +79,7 @@ collation_name NULL NO NULL
 domain_catalog NULL NO NULL 
 domain_schema NULL NO NULL 
 domain_name NULL NO NULL 
+extra  NULL  NO  NULL 
 
 statement ok
 DROP TABLE IF EXISTS t;