From a06789e346505bb0e7f85d5f6fe3da7768aff97f Mon Sep 17 00:00:00 2001 From: eastfisher Date: Tue, 1 Mar 2022 13:54:47 +0800 Subject: [PATCH] [tidb] Bump tikv client version to v3.2.0 --- .../cdc/connectors/tidb/TiDBSource.java | 36 ++++++++++--------- .../tidb/TiKVRichParallelSourceFunction.java | 2 -- .../tidb/table/TiDBConnectorITCase.java | 4 +-- pom.xml | 3 +- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiDBSource.java b/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiDBSource.java index e09b49dc5..759d8cce7 100644 --- a/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiDBSource.java +++ b/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiDBSource.java @@ -1,20 +1,22 @@ -package com.ververica.cdc.connectors.tidb; /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.ververica.cdc.connectors.tidb; import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction; diff --git a/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java b/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java index 34b0a595e..d7b846729 100644 --- a/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java +++ b/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java @@ -185,8 +185,6 @@ public class TiKVRichParallelSourceFunction extends RichParallelSourceFunctio .next() .toByteString(); } - } catch (Exception e) { - e.printStackTrace(); } finally { scanClient.close(); } diff --git a/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorITCase.java b/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorITCase.java index 36c2d86e5..12ece55e7 100644 --- a/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorITCase.java +++ b/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorITCase.java @@ -32,11 +32,10 @@ import org.apache.flink.util.TestLogger; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.junit.Ignore; -import java.net.URL; import java.sql.Connection; import java.sql.DriverManager; import java.sql.Statement; @@ -83,7 +82,6 @@ public class TiDBConnectorITCase extends TestLogger { } @Test - @Ignore("Test ignored because it need manually install TiDB suites by TiUP") public void testConsumingAllEvents() throws Exception { String sourceDDL = String.format( diff --git a/pom.xml b/pom.xml index 6106de680..d610e3669 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ under the License. flink-sql-connector-oracle-cdc flink-sql-connector-sqlserver-cdc flink-sql-connector-tidb-cdc - flink-format-changelog-json flink-cdc-e2e-tests @@ -73,7 +72,7 @@ under the License. 1.13.5 1.5.4.Final - 3.2.0-SNAPSHOT + 3.2.0 2.2.0