From 7ebb3fd1ab65239b73c02eb4f61268287a78f419 Mon Sep 17 00:00:00 2001 From: agapple Date: Tue, 28 Apr 2015 21:11:41 +0800 Subject: [PATCH] fixed code template and format --- .../otter/canal/client/CanalConnectors.java | 17 +- .../client/impl/SimpleCanalConnector.java | 3 +- codeformat.xml | 291 ++++ codetemplates.xml | 27 + .../canal/common/utils/AddressUtils.java | 3 +- .../canal/common/zookeeper/ZkClientx.java | 45 +- .../canal/common/zookeeper/ZooKeeperx.java | 9 +- .../common/zookeeper/ZookeeperPathUtils.java | 6 +- .../running/ServerRunningMonitors.java | 3 +- .../com/google/common/collect/MigrateMap.java | 14 +- .../tddl/dbsync/binlog/CharsetConversion.java | 101 +- .../tddl/dbsync/binlog/DirectLogFetcher.java | 307 ++-- .../taobao/tddl/dbsync/binlog/LogBuffer.java | 1434 ++++++----------- .../taobao/tddl/dbsync/binlog/LogContext.java | 39 +- .../taobao/tddl/dbsync/binlog/LogDecoder.java | 541 +++---- .../taobao/tddl/dbsync/binlog/LogEvent.java | 487 +++--- .../taobao/tddl/dbsync/binlog/LogFetcher.java | 22 +- .../tddl/dbsync/binlog/LogPosition.java | 53 +- .../binlog/event/AppendBlockLogEvent.java | 17 +- .../binlog/event/BeginLoadQueryLogEvent.java | 8 +- .../binlog/event/CreateFileLogEvent.java | 49 +- .../binlog/event/DeleteFileLogEvent.java | 13 +- .../binlog/event/DeleteRowsLogEvent.java | 8 +- .../binlog/event/ExecuteLoadLogEvent.java | 13 +- .../event/ExecuteLoadQueryLogEvent.java | 35 +- .../event/FormatDescriptionLogEvent.java | 147 +- .../binlog/event/IgnorableLogEvent.java | 26 +- .../dbsync/binlog/event/IncidentLogEvent.java | 28 +- .../dbsync/binlog/event/IntvarLogEvent.java | 37 +- .../dbsync/binlog/event/LoadLogEvent.java | 139 +- .../tddl/dbsync/binlog/event/LogHeader.java | 178 +- .../binlog/event/PreviousGtidsLogEvent.java | 4 +- .../dbsync/binlog/event/QueryLogEvent.java | 623 ++++--- .../dbsync/binlog/event/RandLogEvent.java | 32 +- .../dbsync/binlog/event/RotateLogEvent.java | 47 +- .../dbsync/binlog/event/RowsLogEvent.java | 102 +- .../dbsync/binlog/event/StartLogEventV3.java | 22 +- .../dbsync/binlog/event/StopLogEvent.java | 14 +- .../dbsync/binlog/event/TableMapLogEvent.java | 191 +-- .../dbsync/binlog/event/UnknownLogEvent.java | 7 +- .../binlog/event/UpdateRowsLogEvent.java | 15 +- .../dbsync/binlog/event/UserVarLogEvent.java | 99 +- .../binlog/event/WriteRowsLogEvent.java | 8 +- .../tddl/dbsync/binlog/event/XidLogEvent.java | 14 +- .../dbsync/binlog/BaseLogFetcherTest.java | 34 +- .../dbsync/binlog/FileLogFetcherTest.java | 11 +- .../tddl/dbsync/binlog/LogBufferTest.java | 144 +- .../otter/canal/deployer/CanalController.java | 99 +- .../otter/canal/deployer/CanalLauncher.java | 4 +- .../monitor/SpringInstanceConfigMonitor.java | 14 +- .../driver/mysql/packets/HeaderPacket.java | 8 +- .../parse/driver/mysql/packets/IPacket.java | 1 + .../mysql/packets/server/FieldPacket.java | 12 +- .../server/HandshakeInitializationPacket.java | 3 +- .../parse/driver/mysql/utils/ByteHelper.java | 2 +- .../mysql/utils/LengthCodedStringReader.java | 2 +- .../driver/mysql/utils/PacketManager.java | 6 +- .../canal/example/SimpleCanalClientTest.java | 2 +- .../otter/canal/filter/PatternUtils.java | 54 +- .../otter/canal/filter/AviaterFilterTest.java | 6 +- .../manager/CanalInstanceWithManager.java | 3 +- .../PropertyPlaceholderConfigurer.java | 6 +- .../canal/meta/FileMixedMetaManager.java | 40 +- .../otter/canal/meta/MemoryMetaManager.java | 21 +- .../otter/canal/meta/MixedMetaManager.java | 136 +- .../canal/meta/PeriodMixedMetaManager.java | 31 +- .../inbound/mysql/dbsync/TableMetaCache.java | 21 +- .../index/FileMixedLogPositionManager.java | 21 +- .../parse/index/MixedLogPositionManager.java | 15 +- .../index/PeriodMixedLogPositionManager.java | 15 +- .../inbound/EventTransactionBufferTest.java | 6 +- .../parse/inbound/group/DummyEventStore.java | 42 +- .../otter/canal/protocol/ClientIdentity.java | 4 +- .../otter/canal/server/CanalService.java | 12 +- .../embedded/CanalServerWithEmbedded.java | 55 +- .../server/netty/CanalServerWithNetty.java | 14 +- .../otter/canal/server/netty/NettyUtils.java | 24 +- .../handler/ClientAuthenticationHandler.java | 9 +- .../handler/FixedHeaderFrameDecoder.java | 2 +- .../HandshakeInitializationHandler.java | 7 +- .../server/netty/handler/SessionHandler.java | 94 +- .../BaseCanalServerWithEmbededTest.java | 16 +- .../server/CanalServerWithNettyTest.java | 6 +- .../canal/sink/entry/EntryEventSink.java | 5 +- .../group/TimelineTransactionBarrier.java | 24 +- .../MemoryEventStoreMultiThreadTest.java | 8 +- 86 files changed, 2763 insertions(+), 3554 deletions(-) create mode 100644 codeformat.xml create mode 100644 codetemplates.xml diff --git a/client/src/main/java/com/alibaba/otter/canal/client/CanalConnectors.java b/client/src/main/java/com/alibaba/otter/canal/client/CanalConnectors.java index d64bd491..391b21dc 100644 --- a/client/src/main/java/com/alibaba/otter/canal/client/CanalConnectors.java +++ b/client/src/main/java/com/alibaba/otter/canal/client/CanalConnectors.java @@ -44,8 +44,10 @@ public class CanalConnectors { */ public static CanalConnector newClusterConnector(List addresses, String destination, String username, String password) { - ClusterCanalConnector canalConnector = new ClusterCanalConnector(username, password, destination, - new SimpleNodeAccessStrategy(addresses)); + ClusterCanalConnector canalConnector = new ClusterCanalConnector(username, + password, + destination, + new SimpleNodeAccessStrategy(addresses)); canalConnector.setSoTimeout(30 * 1000); return canalConnector; } @@ -61,13 +63,10 @@ public class CanalConnectors { */ public static CanalConnector newClusterConnector(String zkServers, String destination, String username, String password) { - ClusterCanalConnector canalConnector = new ClusterCanalConnector( - username, - password, - destination, - new ClusterNodeAccessStrategy( - destination, - ZkClientx.getZkClient(zkServers))); + ClusterCanalConnector canalConnector = new ClusterCanalConnector(username, + password, + destination, + new ClusterNodeAccessStrategy(destination, ZkClientx.getZkClient(zkServers))); canalConnector.setSoTimeout(30 * 1000); return canalConnector; } diff --git a/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java b/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java index 7993669d..a432e668 100644 --- a/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java +++ b/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java @@ -102,7 +102,7 @@ public class SimpleCanalConnector implements CanalConnector { rollback(); } } - + connected = true; } @@ -411,7 +411,6 @@ public class SimpleCanalConnector implements CanalConnector { } } - private void waitClientRunning() { try { if (zkClientx != null) { diff --git a/codeformat.xml b/codeformat.xml new file mode 100644 index 00000000..01b28b5b --- /dev/null +++ b/codeformat.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/codetemplates.xml b/codetemplates.xml new file mode 100644 index 00000000..20ee0fc1 --- /dev/null +++ b/codetemplates.xml @@ -0,0 +1,27 @@ +