chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed compile

Browse Source
This commit is contained in:
agapple
2019-06-18 22:18:30 +08:00
parent 5bea876ec9
commit 8728beb4b6
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbSyncService.java
View File

@@ -272,7 +272,7 @@ public class RdbSyncService {
batchExecutor.execute(insertSql.toString(), values); batchExecutor.execute(insertSql.toString(), values);
} catch (SQLException e) { } catch (SQLException e) {
if (skipDupException if (skipDupException
&& (e.getMessage().contains("Duplicate entry") || e.getMessage().startsWith("ORA-00001: 违反唯一约束条件"))) { && (e.getMessage().contains("Duplicate entry") || e.getMessage().startsWith("ORA-00001:"))) {
// ignore // ignore
// TODO 增加更多关系数据库的主键冲突的错误码 // TODO 增加更多关系数据库的主键冲突的错误码
} else { } else {

19
instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
View File

@@ -1,6 +1,7 @@
package com.alibaba.otter.canal.instance.manager; package com.alibaba.otter.canal.instance.manager;
import java.io.File; import java.io.File;
import java.io.FilenameFilter;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
@@ -117,7 +118,13 @@ public class CanalInstanceWithManager extends AbstractCanalInstance {
} else { } else {
try { try {
File externalLibDir = new File(alarmHandlerPluginDir); File externalLibDir = new File(alarmHandlerPluginDir);
File[] jarFiles = externalLibDir.listFiles((dir1, name) -> name.endsWith(".jar")); File[] jarFiles = externalLibDir.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.endsWith(".jar");
}
});
if (jarFiles == null || jarFiles.length == 0) { if (jarFiles == null || jarFiles.length == 0) {
throw new IllegalStateException(String.format("alarmHandlerPluginDir [%s] can't find any name endswith \".jar\" file.", throw new IllegalStateException(String.format("alarmHandlerPluginDir [%s] can't find any name endswith \".jar\" file.",
alarmHandlerPluginDir)); alarmHandlerPluginDir));
@@ -126,14 +133,16 @@ public class CanalInstanceWithManager extends AbstractCanalInstance {
for (int i = 0; i < jarFiles.length; i++) { for (int i = 0; i < jarFiles.length; i++) {
urls[i] = jarFiles[i].toURI().toURL(); urls[i] = jarFiles[i].toURI().toURL();
} }
ClassLoader currentClassLoader = new URLClassLoader(urls, CanalInstanceWithManager.class.getClassLoader()); ClassLoader currentClassLoader = new URLClassLoader(urls,
Class<CanalAlarmHandler> _alarmClass = CanalInstanceWithManager.class.getClassLoader());
(Class<CanalAlarmHandler>)currentClassLoader.loadClass(alarmHandlerClass); Class<CanalAlarmHandler> _alarmClass = (Class<CanalAlarmHandler>) currentClassLoader.loadClass(alarmHandlerClass);
alarmHandler = _alarmClass.newInstance(); alarmHandler = _alarmClass.newInstance();
logger.info("init [{}] alarm handler success.", alarmHandlerClass); logger.info("init [{}] alarm handler success.", alarmHandlerClass);
} catch (Throwable e) { } catch (Throwable e) {
String errorMsg = String.format("init alarmHandlerPluginDir [%s] alarm handler [%s] error: %s", String errorMsg = String.format("init alarmHandlerPluginDir [%s] alarm handler [%s] error: %s",
alarmHandlerPluginDir, alarmHandlerClass, ExceptionUtils.getFullStackTrace(e)); alarmHandlerPluginDir,
alarmHandlerClass,
ExceptionUtils.getFullStackTrace(e));
logger.error(errorMsg); logger.error(errorMsg);
throw new CanalException(errorMsg, e); throw new CanalException(errorMsg, e);
} }

2
pom.xml
View File

@@ -253,7 +253,7 @@
<dependency> <dependency>
<groupId>com.alibaba.fastsql</groupId> <groupId>com.alibaba.fastsql</groupId>
<artifactId>fastsql</artifactId> <artifactId>fastsql</artifactId>
<version>2.0.0_preview_855</version> <version>2.0.0_preview_914</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>