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 MR

Browse Source
This commit is contained in:
jianghang.loujh
2021-10-09 15:59:12 +08:00
parent 5b6fd8094a
commit 40d840375f
4 changed files with 66 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/pom.xml
View File

@@ -132,6 +132,12 @@
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
<!-- Pulsar -->
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
<scope>provided</scope>
</dependency>
<!-- junit -->
<dependency>
@@ -139,12 +145,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- Pulsar -->
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
</dependency>
</dependencies>
<build>

4
connector/pom.xml
View File

@@ -92,12 +92,12 @@
</repositories>
<modules>
<module>kafka-connector</module>
<module>core</module>
<module>kafka-connector</module>
<module>rocketmq-connector</module>
<module>rabbitmq-connector</module>
<module>tcp-connector</module>
<module>pulsarmq-connector</module>
<module>tcp-connector</module>
</modules>
<build>

19
connector/rocketmq-connector/src/main/java/com/alibaba/otter/canal/connector/rocketmq/producer/CanalRocketMQProducer.java
View File

@@ -46,8 +46,7 @@ import java.util.stream.Collectors;
* @author rewerma 2020-01-27
* @version 1.0.0
*/
@SPI("rocketmq")
public class CanalRocketMQProducer extends AbstractMQProducer implements CanalMQProducer {
@SPI("rocketmq") public class CanalRocketMQProducer extends AbstractMQProducer implements CanalMQProducer {
private static final Logger logger = LoggerFactory.getLogger(CanalRocketMQProducer.class);
@@ -55,8 +54,7 @@ public class CanalRocketMQProducer extends AbstractMQProducer implements CanalMQ
private static final String CLOUD_ACCESS_CHANNEL = "cloud";
protected ThreadPoolExecutor sendPartitionExecutor;
@Override
public void init(Properties properties) {
@Override public void init(Properties properties) {
RocketMQProducerConfig rocketMQProperties = new RocketMQProducerConfig();
this.mqProperties = rocketMQProperties;
super.init(properties);
@@ -145,8 +143,8 @@ public class CanalRocketMQProducer extends AbstractMQProducer implements CanalMQ
}
}
@Override
public void send(MQDestination destination, com.alibaba.otter.canal.protocol.Message message, Callback callback) {
@Override public void send(MQDestination destination, com.alibaba.otter.canal.protocol.Message message,
Callback callback) {
ExecutorTemplate template = new ExecutorTemplate(sendExecutor);
try {
if (!StringUtils.isEmpty(destination.getDynamicTopic())) {
@@ -181,7 +179,8 @@ public class CanalRocketMQProducer extends AbstractMQProducer implements CanalMQ
}
}
public void send(final MQDestination destination, String topicName, com.alibaba.otter.canal.protocol.Message message) {
public void send(final MQDestination destination, String topicName,
com.alibaba.otter.canal.protocol.Message message) {
// 获取当前topic的分区数
Integer partitionNum = MQMessageUtils.parseDynamicTopicPartition(topicName,
destination.getDynamicTopicPartitionNum());
@@ -305,8 +304,7 @@ public class CanalRocketMQProducer extends AbstractMQProducer implements CanalMQ
}
}
@SuppressWarnings("deprecation")
private void sendMessage(List<Message> messages, int partition) {
@SuppressWarnings("deprecation") private void sendMessage(List<Message> messages, int partition) {
if (messages.isEmpty()) {
return;
}
@@ -348,8 +346,7 @@ public class CanalRocketMQProducer extends AbstractMQProducer implements CanalMQ
}
}
@Override
public void stop() {
@Override public void stop() {
logger.info("## Stop RocketMQ producer##");
this.defaultMQProducer.shutdown();
if (sendPartitionExecutor != null) {

4
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/rds/BinlogDownloadQueue.java
View File

@@ -223,7 +223,7 @@ public class BinlogDownloadQueue {
TarArchiveEntry tarArchiveEntry = null;
while ((tarArchiveEntry = tais.getNextTarEntry()) != null) {
String name = tarArchiveEntry.getName();
File tarFile = new File(parentFile, name);
File tarFile = new File(parentFile, name + ".tmp");
logger.info("start to download file " + tarFile.getName());
if (tarFile.exists()) {
tarFile.delete();
@@ -244,7 +244,7 @@ public class BinlogDownloadQueue {
}
tais.close();
} else {
File file = new File(parentFile, fileName);
File file = new File(parentFile, fileName + ".tmp");
if (file.exists()) {
file.delete();
}