fix conflicts with master

apache · Jul 24, 2024 · 95d4a00 · 95d4a00
1 parent c5c2c15
commit 95d4a00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...src/main/java/org/apache/eventmesh/connector/canal/sink/connector/CanalSinkConnector.java b/...src/main/java/org/apache/eventmesh/connector/canal/sink/connector/CanalSinkConnector.java
@@ -278,7 +278,7 @@ private void doLoadWithGtid(DbLoadContext context, CanalSinkConfig sinkConfig, C
             List<List<CanalConnectRecord>> totalRows = batch.getBatches();
             List<CanalConnectRecord> filteredRows = new ArrayList<>();
             for (List<CanalConnectRecord> canalConnectRecords : totalRows) {
-                canalConnectRecords = filterRecord(canalConnectRecords, sinkConfig);
+                canalConnectRecords = filterRecord(canalConnectRecords);
                 if (!CollectionUtils.isEmpty(canalConnectRecords)) {
                     for (final CanalConnectRecord record : canalConnectRecords) {
                         boolean filter = interceptor.before(sinkConfig, record);

diff --git a/...main/java/org/apache/eventmesh/connector/canal/source/connector/CanalSourceConnector.java b/...main/java/org/apache/eventmesh/connector/canal/source/connector/CanalSourceConnector.java
@@ -150,6 +150,8 @@ protected void startEventParserInternal(CanalEventParser parser, boolean isGroup
                 return instance;
             }
         });
+        DatabaseConnection.sourceConfig = sourceConfig.getSourceConnectorConfig();
+        DatabaseConnection.initSourceConnection();
         tableMgr = new RdbTableMgr(sourceConfig.getSourceConnectorConfig(), DatabaseConnection.sourceDataSource);
     }