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

整理代码

Browse Source
This commit is contained in:
mcy
2018-12-10 09:52:48 +08:00
parent 5650b56bed
commit 99a1123e01
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployer/src/main/resources/example/instance.properties
View File

@@ -48,5 +48,5 @@ canal.mq.topic=example
canal.mq.partition=0 canal.mq.partition=0
# hash partition config # hash partition config
#canal.mq.partitionsNum=3 #canal.mq.partitionsNum=3
#canal.mq.partitionHash=mytest.person:id,mytest.role:id #canal.mq.partitionHash=.*\\..*.$pk$
################################################# #################################################

27
protocol/src/main/java/com/alibaba/otter/canal/protocol/Message.java
View File

@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.google.protobuf.InvalidProtocolBufferException;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringBuilder;
@@ -108,7 +109,25 @@ public class Message implements Serializable {
for (int i = 0; i < partitionsNum; i++) { for (int i = 0; i < partitionsNum; i++) {
partitionEntries[i] = new ArrayList<>(); partitionEntries[i] = new ArrayList<>();
} }
for (Entry entry : this.getEntries()) {
List<CanalEntry.Entry> entries;
if (this.isRaw()) {
List<ByteString> rawEntries = this.getRawEntries();
entries = new ArrayList<>(rawEntries.size());
for (ByteString byteString : rawEntries) {
Entry entry;
try {
entry = Entry.parseFrom(byteString);
} catch (InvalidProtocolBufferException e) {
throw new RuntimeException(e);
}
entries.add(entry);
}
} else {
entries = this.getEntries();
}
for (Entry entry : entries) {
CanalEntry.RowChange rowChange; CanalEntry.RowChange rowChange;
try { try {
rowChange = CanalEntry.RowChange.parseFrom(entry.getStoreValue()); rowChange = CanalEntry.RowChange.parseFrom(entry.getStoreValue());
@@ -194,9 +213,9 @@ public class Message implements Serializable {
} }
for (int i = 0; i < partitionsNum; i++) { for (int i = 0; i < partitionsNum; i++) {
List<Entry> entries = partitionEntries[i]; List<Entry> entriesTmp = partitionEntries[i];
if (!entries.isEmpty()) { if (!entriesTmp.isEmpty()) {
partitionMessages[i] = new Message(this.id, entries); partitionMessages[i] = new Message(this.id, entriesTmp);
} }
} }