From d01e82ce3c8e250a51fb43c103221a3fcc3d2773 Mon Sep 17 00:00:00 2001 From: wener Date: Thu, 23 Apr 2015 16:23:34 +0800 Subject: [PATCH 1/5] fix typo embeded -> embedded --- .../otter/canal/deployer/CanalController.java | 6 ++--- .../CanalServerWithEmbedded.java} | 6 ++--- .../server/netty/CanalServerWithNetty.java | 24 +++++++++---------- .../handler/ClientAuthenticationHandler.java | 11 +++++---- .../server/netty/handler/SessionHandler.java | 8 +++---- .../BaseCanalServerWithEmbededTest.java | 6 ++--- ...nalServerWithEmbedded_StandaloneTest.java} | 2 +- ... CanalServerWithEmbedded_StandbyTest.java} | 2 +- .../server/CanalServerWithNettyTest.java | 4 ++-- 9 files changed, 35 insertions(+), 34 deletions(-) rename server/src/main/java/com/alibaba/otter/canal/server/{embeded/CanalServerWithEmbeded.java => embedded/CanalServerWithEmbedded.java} (99%) rename server/src/test/java/com/alibaba/otter/canal/server/{CanalServerWithEmbeded_StandaloneTest.java => CanalServerWithEmbedded_StandaloneTest.java} (96%) rename server/src/test/java/com/alibaba/otter/canal/server/{CanalServerWithEmbeded_StandbyTest.java => CanalServerWithEmbedded_StandbyTest.java} (96%) diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java index 9a8b93a4..9246e26d 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java @@ -33,7 +33,7 @@ import com.alibaba.otter.canal.instance.core.CanalInstanceGenerator; import com.alibaba.otter.canal.instance.manager.CanalConfigClient; import com.alibaba.otter.canal.instance.manager.ManagerCanalInstanceGenerator; import com.alibaba.otter.canal.instance.spring.SpringCanalInstanceGenerator; -import com.alibaba.otter.canal.server.embeded.CanalServerWithEmbeded; +import com.alibaba.otter.canal.server.embedded.CanalServerWithEmbedded; import com.alibaba.otter.canal.server.exception.CanalServerException; import com.alibaba.otter.canal.server.netty.CanalServerWithNetty; import com.google.common.base.Function; @@ -59,7 +59,7 @@ public class CanalController { private boolean autoScan = true; private InstanceAction defaultAction; private Map instanceConfigMonitors; - private CanalServerWithEmbeded embededCanalServer; + private CanalServerWithEmbedded embededCanalServer; private CanalServerWithNetty canalServer; private CanalInstanceGenerator instanceGenerator; @@ -87,7 +87,7 @@ public class CanalController { cid = Long.valueOf(getProperty(properties, CanalConstants.CANAL_ID)); ip = getProperty(properties, CanalConstants.CANAL_IP); port = Integer.valueOf(getProperty(properties, CanalConstants.CANAL_PORT)); - embededCanalServer = new CanalServerWithEmbeded(); + embededCanalServer = new CanalServerWithEmbedded(); embededCanalServer.setCanalInstanceGenerator(instanceGenerator);// 设置自定义的instanceGenerator canalServer = new CanalServerWithNetty(embededCanalServer); canalServer.setIp(ip); diff --git a/server/src/main/java/com/alibaba/otter/canal/server/embeded/CanalServerWithEmbeded.java b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java similarity index 99% rename from server/src/main/java/com/alibaba/otter/canal/server/embeded/CanalServerWithEmbeded.java rename to server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java index 82518928..30e827e9 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/embeded/CanalServerWithEmbeded.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java @@ -1,4 +1,4 @@ -package com.alibaba.otter.canal.server.embeded; +package com.alibaba.otter.canal.server.embedded; import java.util.ArrayList; import java.util.Collections; @@ -37,9 +37,9 @@ import com.google.common.collect.Maps; * @author zebin.xuzb * @version 1.0.0 */ -public class CanalServerWithEmbeded extends AbstractCanalLifeCycle implements CanalServer { +public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements CanalServer { - private static final Logger logger = LoggerFactory.getLogger(CanalServerWithEmbeded.class); + private static final Logger logger = LoggerFactory.getLogger(CanalServerWithEmbedded.class); private Map canalInstances; // private Map lastRollbackPostions; private CanalInstanceGenerator canalInstanceGenerator; diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java index 0e39bd48..ade3c3bf 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/CanalServerWithNetty.java @@ -13,7 +13,7 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import com.alibaba.otter.canal.common.AbstractCanalLifeCycle; import com.alibaba.otter.canal.server.CanalServer; -import com.alibaba.otter.canal.server.embeded.CanalServerWithEmbeded; +import com.alibaba.otter.canal.server.embedded.CanalServerWithEmbedded; import com.alibaba.otter.canal.server.netty.handler.ClientAuthenticationHandler; import com.alibaba.otter.canal.server.netty.handler.FixedHeaderFrameDecoder; import com.alibaba.otter.canal.server.netty.handler.HandshakeInitializationHandler; @@ -27,7 +27,7 @@ import com.alibaba.otter.canal.server.netty.handler.SessionHandler; */ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements CanalServer { - private CanalServerWithEmbeded embededServer; // 嵌入式server + private CanalServerWithEmbedded embeddedServer; // 嵌入式server private String ip; private int port; private Channel serverChannel = null; @@ -36,15 +36,15 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana public CanalServerWithNetty(){ } - public CanalServerWithNetty(CanalServerWithEmbeded embededServer){ - this.embededServer = embededServer; + public CanalServerWithNetty(CanalServerWithEmbedded embeddedServer){ + this.embeddedServer = embeddedServer; } public void start() { super.start(); - if (!embededServer.isStart()) { - embededServer.start(); + if (!embeddedServer.isStart()) { + embeddedServer.start(); } this.bootstrap = new ServerBootstrap(new NioServerSocketChannelFactory(Executors.newCachedThreadPool(), @@ -58,9 +58,9 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana pipelines.addLast(FixedHeaderFrameDecoder.class.getName(), new FixedHeaderFrameDecoder()); pipelines.addLast(HandshakeInitializationHandler.class.getName(), new HandshakeInitializationHandler()); pipelines.addLast(ClientAuthenticationHandler.class.getName(), - new ClientAuthenticationHandler(embededServer)); + new ClientAuthenticationHandler(embeddedServer)); - SessionHandler sessionHandler = new SessionHandler(embededServer); + SessionHandler sessionHandler = new SessionHandler(embeddedServer); pipelines.addLast(SessionHandler.class.getName(), sessionHandler); return pipelines; } @@ -85,8 +85,8 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana this.bootstrap.releaseExternalResources(); } - if (embededServer.isStart()) { - embededServer.stop(); + if (embeddedServer.isStart()) { + embeddedServer.stop(); } } @@ -98,8 +98,8 @@ public class CanalServerWithNetty extends AbstractCanalLifeCycle implements Cana this.port = port; } - public void setEmbededServer(CanalServerWithEmbeded embededServer) { - this.embededServer = embededServer; + public void setEmbeddedServer(CanalServerWithEmbedded embeddedServer) { + this.embeddedServer = embeddedServer; } } diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java index 72b4fee2..a925e4a6 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java @@ -19,7 +19,7 @@ import com.alibaba.otter.canal.common.zookeeper.running.ServerRunningMonitors; import com.alibaba.otter.canal.protocol.CanalPacket.ClientAuth; import com.alibaba.otter.canal.protocol.CanalPacket.Packet; import com.alibaba.otter.canal.protocol.ClientIdentity; -import com.alibaba.otter.canal.server.embeded.CanalServerWithEmbeded; +import com.alibaba.otter.canal.server.embedded.CanalServerWithEmbedded; import com.alibaba.otter.canal.server.netty.NettyUtils; /** @@ -33,13 +33,13 @@ public class ClientAuthenticationHandler extends SimpleChannelHandler { private static final Logger logger = LoggerFactory.getLogger(ClientAuthenticationHandler.class); private final int SUPPORTED_VERSION = 3; private final int defaultSubscriptorDisconnectIdleTimeout = 5 * 60 * 1000; - private CanalServerWithEmbeded embededServer; + private CanalServerWithEmbedded embededServer; public ClientAuthenticationHandler(){ } - public ClientAuthenticationHandler(CanalServerWithEmbeded embededServer){ + public ClientAuthenticationHandler(CanalServerWithEmbedded embededServer){ this.embededServer = embededServer; } @@ -62,7 +62,8 @@ public class ClientAuthenticationHandler extends SimpleChannelHandler { ctx.setAttachment(clientIdentity);// 设置状态数据 // 尝试启动，如果已经启动，忽略 if (!embededServer.isStart(clientIdentity.getDestination())) { - ServerRunningMonitor runningMonitor = ServerRunningMonitors.getRunningMonitor(clientIdentity.getDestination()); + ServerRunningMonitor runningMonitor = ServerRunningMonitors.getRunningMonitor(clientIdentity + .getDestination()); if (!runningMonitor.isStart()) { runningMonitor.start(); } @@ -114,7 +115,7 @@ public class ClientAuthenticationHandler extends SimpleChannelHandler { } } - public void setEmbededServer(CanalServerWithEmbeded embededServer) { + public void setEmbededServer(CanalServerWithEmbedded embededServer) { this.embededServer = embededServer; } diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java index 54ccd58b..bf83c6ff 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java @@ -31,7 +31,7 @@ import com.alibaba.otter.canal.protocol.CanalPacket.Sub; import com.alibaba.otter.canal.protocol.CanalPacket.Unsub; import com.alibaba.otter.canal.protocol.ClientIdentity; import com.alibaba.otter.canal.protocol.Message; -import com.alibaba.otter.canal.server.embeded.CanalServerWithEmbeded; +import com.alibaba.otter.canal.server.embedded.CanalServerWithEmbedded; import com.alibaba.otter.canal.server.netty.NettyUtils; /** @@ -43,13 +43,13 @@ import com.alibaba.otter.canal.server.netty.NettyUtils; public class SessionHandler extends SimpleChannelHandler { private static final Logger logger = LoggerFactory.getLogger(SessionHandler.class); - private CanalServerWithEmbeded embededServer; + private CanalServerWithEmbedded embededServer; public SessionHandler(){ } - public SessionHandler(CanalServerWithEmbeded embededServer){ + public SessionHandler(CanalServerWithEmbedded embededServer){ this.embededServer = embededServer; } @@ -242,7 +242,7 @@ public class SessionHandler extends SimpleChannelHandler { } } - public void setEmbededServer(CanalServerWithEmbeded embededServer) { + public void setEmbededServer(CanalServerWithEmbedded embededServer) { this.embededServer = embededServer; } diff --git a/server/src/test/java/com/alibaba/otter/canal/server/BaseCanalServerWithEmbededTest.java b/server/src/test/java/com/alibaba/otter/canal/server/BaseCanalServerWithEmbededTest.java index b0dad135..296dbcc5 100644 --- a/server/src/test/java/com/alibaba/otter/canal/server/BaseCanalServerWithEmbededTest.java +++ b/server/src/test/java/com/alibaba/otter/canal/server/BaseCanalServerWithEmbededTest.java @@ -14,7 +14,7 @@ import com.alibaba.otter.canal.parse.CanalEventParser; import com.alibaba.otter.canal.parse.CanalHASwitchable; import com.alibaba.otter.canal.protocol.ClientIdentity; import com.alibaba.otter.canal.protocol.Message; -import com.alibaba.otter.canal.server.embeded.CanalServerWithEmbeded; +import com.alibaba.otter.canal.server.embedded.CanalServerWithEmbedded; public abstract class BaseCanalServerWithEmbededTest { @@ -26,12 +26,12 @@ public abstract class BaseCanalServerWithEmbededTest { protected static final String PASSWORD = "retl"; protected static final String FILTER = "retl\\..*,erosa.zk_complaint_bizdata"; - private CanalServerWithEmbeded server; + private CanalServerWithEmbedded server; private ClientIdentity clientIdentity = new ClientIdentity(DESTINATION, (short) 1); ; @Before public void setUp() { - server = new CanalServerWithEmbeded(); + server = new CanalServerWithEmbedded(); server.setCanalInstanceGenerator(new CanalInstanceGenerator() { public CanalInstance generate(String destination) { diff --git a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbeded_StandaloneTest.java b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandaloneTest.java similarity index 96% rename from server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbeded_StandaloneTest.java rename to server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandaloneTest.java index 9b14d32e..9790f770 100644 --- a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbeded_StandaloneTest.java +++ b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandaloneTest.java @@ -11,7 +11,7 @@ import com.alibaba.otter.canal.instance.manager.model.CanalParameter.MetaMode; import com.alibaba.otter.canal.instance.manager.model.CanalParameter.SourcingType; import com.alibaba.otter.canal.instance.manager.model.CanalParameter.StorageMode; -public class CanalServerWithEmbeded_StandaloneTest extends BaseCanalServerWithEmbededTest { +public class CanalServerWithEmbedded_StandaloneTest extends BaseCanalServerWithEmbededTest { protected Canal buildCanal() { Canal canal = new Canal(); diff --git a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbeded_StandbyTest.java b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandbyTest.java similarity index 96% rename from server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbeded_StandbyTest.java rename to server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandbyTest.java index e20ce69d..19063cba 100644 --- a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbeded_StandbyTest.java +++ b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithEmbedded_StandbyTest.java @@ -15,7 +15,7 @@ import com.alibaba.otter.canal.instance.manager.model.CanalParameter.MetaMode; import com.alibaba.otter.canal.instance.manager.model.CanalParameter.SourcingType; import com.alibaba.otter.canal.instance.manager.model.CanalParameter.StorageMode; -public class CanalServerWithEmbeded_StandbyTest extends BaseCanalServerWithEmbededTest { +public class CanalServerWithEmbedded_StandbyTest extends BaseCanalServerWithEmbededTest { private ZkClient zkClient = new ZkClient(cluster1); diff --git a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithNettyTest.java b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithNettyTest.java index dddad6b6..102436c5 100644 --- a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithNettyTest.java +++ b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithNettyTest.java @@ -31,7 +31,7 @@ import com.alibaba.otter.canal.protocol.CanalPacket.Packet; import com.alibaba.otter.canal.protocol.CanalPacket.PacketType; import com.alibaba.otter.canal.protocol.CanalPacket.Sub; import com.alibaba.otter.canal.protocol.CanalPacket.Unsub; -import com.alibaba.otter.canal.server.embeded.CanalServerWithEmbeded; +import com.alibaba.otter.canal.server.embedded.CanalServerWithEmbedded; import com.alibaba.otter.canal.server.netty.CanalServerWithNetty; public class CanalServerWithNettyTest { @@ -49,7 +49,7 @@ public class CanalServerWithNettyTest { @Before public void setUp() { - CanalServerWithEmbeded embededServer = new CanalServerWithEmbeded(); + CanalServerWithEmbedded embededServer = new CanalServerWithEmbedded(); embededServer.setCanalInstanceGenerator(new CanalInstanceGenerator() { public CanalInstance generate(String destination) { From bdf3b0c86164dd042e4d3f3adf05f2dd3cab84d2 Mon Sep 17 00:00:00 2001 From: wener Date: Thu, 23 Apr 2015 17:25:36 +0800 Subject: [PATCH 2/5] typo, javadoc,code cleanup --- .../otter/canal/common/CanalLifeCycle.java | 6 ++-- .../canal/common/alarm/CanalAlarmHandler.java | 3 +- .../otter/canal/deployer/CanalController.java | 2 +- .../deployer/monitor/InstanceAction.java | 6 ++-- .../monitor/InstanceConfigMonitor.java | 4 +-- .../monitor/ManagerInstanceConfigMonitor.java | 4 +-- .../monitor/SpringInstanceConfigMonitor.java | 4 +-- .../canal/instance/core/CanalInstance.java | 14 ++++---- .../otter/canal/server/CanalServer.java | 4 +-- .../embedded/CanalServerWithEmbedded.java | 9 +++-- .../handler/ClientAuthenticationHandler.java | 14 ++++---- .../server/netty/handler/SessionHandler.java | 36 +++++++++---------- .../server/CanalServerWithNettyTest.java | 10 +++--- 13 files changed, 57 insertions(+), 59 deletions(-) diff --git a/common/src/main/java/com/alibaba/otter/canal/common/CanalLifeCycle.java b/common/src/main/java/com/alibaba/otter/canal/common/CanalLifeCycle.java index 6bd15f14..da62d885 100644 --- a/common/src/main/java/com/alibaba/otter/canal/common/CanalLifeCycle.java +++ b/common/src/main/java/com/alibaba/otter/canal/common/CanalLifeCycle.java @@ -6,9 +6,9 @@ package com.alibaba.otter.canal.common; */ public interface CanalLifeCycle { - public void start(); + void start(); - public void stop(); + void stop(); - public boolean isStart(); + boolean isStart(); } diff --git a/common/src/main/java/com/alibaba/otter/canal/common/alarm/CanalAlarmHandler.java b/common/src/main/java/com/alibaba/otter/canal/common/alarm/CanalAlarmHandler.java index 4c9d1099..67e47f0c 100644 --- a/common/src/main/java/com/alibaba/otter/canal/common/alarm/CanalAlarmHandler.java +++ b/common/src/main/java/com/alibaba/otter/canal/common/alarm/CanalAlarmHandler.java @@ -14,8 +14,7 @@ public interface CanalAlarmHandler extends CanalLifeCycle { * 发送对应destination的报警 * * @param destination - * @param title * @param msg */ - public void sendAlarm(String destination, String msg); + void sendAlarm(String destination, String msg); } diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java index 9246e26d..3e8f0c8a 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java @@ -391,7 +391,7 @@ public class CanalController { } if (autoScan) { - instanceConfigMonitors.get(config.getMode()).regeister(destination, defaultAction); + instanceConfigMonitors.get(config.getMode()).register(destination, defaultAction); } } diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/InstanceAction.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/InstanceAction.java index 14551ea7..6f1112dc 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/InstanceAction.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/InstanceAction.java @@ -11,15 +11,15 @@ public interface InstanceAction { /** * 启动destination */ - public void start(String destination); + void start(String destination); /** * 停止destination */ - public void stop(String destination); + void stop(String destination); /** * 重载destination，可能需要stop,start操作，或者只是更新下内存配置 */ - public void reload(String destination); + void reload(String destination); } diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/InstanceConfigMonitor.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/InstanceConfigMonitor.java index c1ec67d1..190c804c 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/InstanceConfigMonitor.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/InstanceConfigMonitor.java @@ -10,7 +10,7 @@ import com.alibaba.otter.canal.common.CanalLifeCycle; */ public interface InstanceConfigMonitor extends CanalLifeCycle { - public void regeister(String destination, InstanceAction action); + void register(String destination, InstanceAction action); - public void unRegeister(String destination); + void unregister(String destination); } diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/ManagerInstanceConfigMonitor.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/ManagerInstanceConfigMonitor.java index ee508b9f..d6099f29 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/ManagerInstanceConfigMonitor.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/ManagerInstanceConfigMonitor.java @@ -9,11 +9,11 @@ import com.alibaba.otter.canal.common.CanalLifeCycle; */ public class ManagerInstanceConfigMonitor extends AbstractCanalLifeCycle implements InstanceConfigMonitor, CanalLifeCycle { - public void regeister(String destination, InstanceAction action) { + public void register(String destination, InstanceAction action) { } - public void unRegeister(String destination) { + public void unregister(String destination) { } diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java index e19323a2..c56edf21 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java @@ -72,7 +72,7 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen lastFiles.clear(); } - public void regeister(String destination, InstanceAction action) { + public void register(String destination, InstanceAction action) { if (action != null) { actions.put(destination, action); } else { @@ -80,7 +80,7 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen } } - public void unRegeister(String destination) { + public void unregister(String destination) { actions.remove(destination); } diff --git a/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/CanalInstance.java b/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/CanalInstance.java index 198071a0..3bd0464b 100644 --- a/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/CanalInstance.java +++ b/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/CanalInstance.java @@ -16,20 +16,20 @@ import com.alibaba.otter.canal.store.CanalEventStore; */ public interface CanalInstance extends CanalLifeCycle { - public String getDestination(); + String getDestination(); - public CanalEventParser getEventParser(); + CanalEventParser getEventParser(); - public CanalEventSink getEventSink(); + CanalEventSink getEventSink(); - public CanalEventStore getEventStore(); + CanalEventStore getEventStore(); - public CanalMetaManager getMetaManager(); + CanalMetaManager getMetaManager(); - public CanalAlarmHandler getAlarmHandler(); + CanalAlarmHandler getAlarmHandler(); /** * 客户端发生订阅/取消订阅行为 */ - public boolean subscribeChange(ClientIdentity identity); + boolean subscribeChange(ClientIdentity identity); } diff --git a/server/src/main/java/com/alibaba/otter/canal/server/CanalServer.java b/server/src/main/java/com/alibaba/otter/canal/server/CanalServer.java index a6453d7b..ad067500 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/CanalServer.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/CanalServer.java @@ -11,7 +11,7 @@ import com.alibaba.otter.canal.server.exception.CanalServerException; */ public interface CanalServer extends CanalLifeCycle { - public void start() throws CanalServerException; + void start() throws CanalServerException; - public void stop() throws CanalServerException; + void stop() throws CanalServerException; } diff --git a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java index 30e827e9..604a54b6 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java @@ -50,8 +50,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C canalInstances = new MapMaker().makeComputingMap(new Function() { public CanalInstance apply(String destination) { - CanalInstance canalInstance = canalInstanceGenerator.generate(destination); - return canalInstance; + return canalInstanceGenerator.generate(destination); } }); @@ -74,7 +73,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C } } } catch (Exception e) { - logger.error(String.format("stop cannalInstance[%s] has an error", entry.getKey()), e); + logger.error(String.format("stop CanalInstance[%s] has an error", entry.getKey()), e); } } } @@ -357,7 +356,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C } /** - * 回滚到未进行 {@link ack} 的地方，下次fetch的时候，可以从最后一个没有 {@link ack} 的地方开始拿 + * 回滚到未进行 {@link #ack} 的地方，下次fetch的时候，可以从最后一个没有 {@link #ack} 的地方开始拿 */ public void rollback(ClientIdentity clientIdentity) throws CanalServerException { checkStart(clientIdentity.getDestination()); @@ -378,7 +377,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C } /** - * 回滚到未进行 {@link ack} 的地方，下次fetch的时候，可以从最后一个没有 {@link ack} 的地方开始拿 + * 回滚到未进行 {@link #ack} 的地方，下次fetch的时候，可以从最后一个没有 {@link #ack} 的地方开始拿 */ public void rollback(ClientIdentity clientIdentity, Long batchId) throws CanalServerException { checkStart(clientIdentity.getDestination()); diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java index a925e4a6..9d86eb21 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/ClientAuthenticationHandler.java @@ -33,14 +33,14 @@ public class ClientAuthenticationHandler extends SimpleChannelHandler { private static final Logger logger = LoggerFactory.getLogger(ClientAuthenticationHandler.class); private final int SUPPORTED_VERSION = 3; private final int defaultSubscriptorDisconnectIdleTimeout = 5 * 60 * 1000; - private CanalServerWithEmbedded embededServer; + private CanalServerWithEmbedded embeddedServer; public ClientAuthenticationHandler(){ } - public ClientAuthenticationHandler(CanalServerWithEmbedded embededServer){ - this.embededServer = embededServer; + public ClientAuthenticationHandler(CanalServerWithEmbedded embeddedServer){ + this.embeddedServer = embeddedServer; } public void messageReceived(final ChannelHandlerContext ctx, MessageEvent e) throws Exception { @@ -58,10 +58,10 @@ public class ClientAuthenticationHandler extends SimpleChannelHandler { clientAuth.getFilter()); try { MDC.put("destination", clientIdentity.getDestination()); - embededServer.subscribe(clientIdentity); + embeddedServer.subscribe(clientIdentity); ctx.setAttachment(clientIdentity);// 设置状态数据 // 尝试启动，如果已经启动，忽略 - if (!embededServer.isStart(clientIdentity.getDestination())) { + if (!embeddedServer.isStart(clientIdentity.getDestination())) { ServerRunningMonitor runningMonitor = ServerRunningMonitors.getRunningMonitor(clientIdentity .getDestination()); if (!runningMonitor.isStart()) { @@ -115,8 +115,8 @@ public class ClientAuthenticationHandler extends SimpleChannelHandler { } } - public void setEmbededServer(CanalServerWithEmbedded embededServer) { - this.embededServer = embededServer; + public void setEmbeddedServer(CanalServerWithEmbedded embeddedServer) { + this.embeddedServer = embeddedServer; } } diff --git a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java index bf83c6ff..cda44668 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java @@ -43,14 +43,12 @@ import com.alibaba.otter.canal.server.netty.NettyUtils; public class SessionHandler extends SimpleChannelHandler { private static final Logger logger = LoggerFactory.getLogger(SessionHandler.class); - private CanalServerWithEmbedded embededServer; + private CanalServerWithEmbedded embeddedServer; - public SessionHandler(){ + public SessionHandler(){ } - } - - public SessionHandler(CanalServerWithEmbedded embededServer){ - this.embededServer = embededServer; + public SessionHandler(CanalServerWithEmbedded embeddedServer){ + this.embeddedServer = embeddedServer; } public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { @@ -66,10 +64,10 @@ public class SessionHandler extends SimpleChannelHandler { clientIdentity = new ClientIdentity(sub.getDestination(), Short.valueOf(sub.getClientId()), sub.getFilter()); MDC.put("destination", clientIdentity.getDestination()); - embededServer.subscribe(clientIdentity); + embeddedServer.subscribe(clientIdentity); // 尝试启动，如果已经启动，忽略 - if (!embededServer.isStart(clientIdentity.getDestination())) { + if (!embeddedServer.isStart(clientIdentity.getDestination())) { ServerRunningMonitor runningMonitor = ServerRunningMonitors.getRunningMonitor(clientIdentity.getDestination()); if (!runningMonitor.isStart()) { runningMonitor.start(); @@ -90,7 +88,7 @@ public class SessionHandler extends SimpleChannelHandler { clientIdentity = new ClientIdentity(unsub.getDestination(), Short.valueOf(unsub.getClientId()), unsub.getFilter()); MDC.put("destination", clientIdentity.getDestination()); - embededServer.unsubscribe(clientIdentity); + embeddedServer.unsubscribe(clientIdentity); stopCanalInstanceIfNecessary(clientIdentity);// 尝试关闭 NettyUtils.ack(ctx.getChannel(), null); } else { @@ -108,17 +106,17 @@ public class SessionHandler extends SimpleChannelHandler { // if (get.getAutoAck()) { // if (get.getTimeout() == -1) {//是否是初始值 - // message = embededServer.get(clientIdentity, get.getFetchSize()); + // message = embeddedServer.get(clientIdentity, get.getFetchSize()); // } else { // TimeUnit unit = convertTimeUnit(get.getUnit()); - // message = embededServer.get(clientIdentity, get.getFetchSize(), get.getTimeout(), unit); + // message = embeddedServer.get(clientIdentity, get.getFetchSize(), get.getTimeout(), unit); // } // } else { if (get.getTimeout() == -1) {//是否是初始值 - message = embededServer.getWithoutAck(clientIdentity, get.getFetchSize()); + message = embeddedServer.getWithoutAck(clientIdentity, get.getFetchSize()); } else { TimeUnit unit = convertTimeUnit(get.getUnit()); - message = embededServer.getWithoutAck(clientIdentity, get.getFetchSize(), get.getTimeout(), + message = embeddedServer.getWithoutAck(clientIdentity, get.getFetchSize(), get.getTimeout(), unit); } // } @@ -153,7 +151,7 @@ public class SessionHandler extends SimpleChannelHandler { // donothing } else { clientIdentity = new ClientIdentity(ack.getDestination(), Short.valueOf(ack.getClientId())); - embededServer.ack(clientIdentity, ack.getBatchId()); + embeddedServer.ack(clientIdentity, ack.getBatchId()); } } else { NettyUtils.error(401, @@ -169,9 +167,9 @@ public class SessionHandler extends SimpleChannelHandler { clientIdentity = new ClientIdentity(rollback.getDestination(), Short.valueOf(rollback.getClientId())); if (rollback.getBatchId() == 0L) { - embededServer.rollback(clientIdentity);// 回滚所有批次 + embeddedServer.rollback(clientIdentity);// 回滚所有批次 } else { - embededServer.rollback(clientIdentity, rollback.getBatchId()); // 只回滚单个批次 + embeddedServer.rollback(clientIdentity, rollback.getBatchId()); // 只回滚单个批次 } } else { NettyUtils.error(401, @@ -212,7 +210,7 @@ public class SessionHandler extends SimpleChannelHandler { } private void stopCanalInstanceIfNecessary(ClientIdentity clientIdentity) { - List clientIdentitys = embededServer.listAllSubscribe(clientIdentity.getDestination()); + List clientIdentitys = embeddedServer.listAllSubscribe(clientIdentity.getDestination()); if (clientIdentitys != null && clientIdentitys.size() == 1 && clientIdentitys.contains(clientIdentity)) { ServerRunningMonitor runningMonitor = ServerRunningMonitors.getRunningMonitor(clientIdentity.getDestination()); if (runningMonitor.isStart()) { @@ -242,8 +240,8 @@ public class SessionHandler extends SimpleChannelHandler { } } - public void setEmbededServer(CanalServerWithEmbedded embededServer) { - this.embededServer = embededServer; + public void setEmbeddedServer(CanalServerWithEmbedded embeddedServer) { + this.embeddedServer = embeddedServer; } } diff --git a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithNettyTest.java b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithNettyTest.java index 102436c5..78032adb 100644 --- a/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithNettyTest.java +++ b/server/src/test/java/com/alibaba/otter/canal/server/CanalServerWithNettyTest.java @@ -49,16 +49,18 @@ public class CanalServerWithNettyTest { @Before public void setUp() { - CanalServerWithEmbedded embededServer = new CanalServerWithEmbedded(); - embededServer.setCanalInstanceGenerator(new CanalInstanceGenerator() { + CanalServerWithEmbedded embeddedServer = new CanalServerWithEmbedded(); + embeddedServer.setCanalInstanceGenerator(new CanalInstanceGenerator() + { - public CanalInstance generate(String destination) { + public CanalInstance generate(String destination) + { Canal canal = buildCanal(); return new CanalInstanceWithManager(canal, FILTER); } }); - nettyServer = new CanalServerWithNetty(embededServer); + nettyServer = new CanalServerWithNetty(embeddedServer); nettyServer.setPort(1088); nettyServer.start(); } From 6a0733bbab7b600c0d41afa8a421e9c443ddecbc Mon Sep 17 00:00:00 2001 From: wener Date: Thu, 23 Apr 2015 22:15:57 +0800 Subject: [PATCH 3/5] update guava to 18.0, magriate compute map by package level implement --- .../canal/common/zookeeper/ZkClientx.java | 13 +- .../otter/canal/deployer/CanalController.java | 96 ++- .../monitor/SpringInstanceConfigMonitor.java | 13 +- .../otter/canal/filter/PatternUtils.java | 58 +- .../canal/meta/FileMixedMetaManager.java | 25 +- .../otter/canal/meta/MemoryMetaManager.java | 13 +- .../otter/canal/meta/MixedMetaManager.java | 140 ++-- .../canal/meta/PeriodMixedMetaManager.java | 29 +- .../inbound/mysql/dbsync/TableMetaCache.java | 19 +- .../index/FileMixedLogPositionManager.java | 19 +- .../parse/index/MixedLogPositionManager.java | 13 +- .../index/PeriodMixedLogPositionManager.java | 13 +- pom.xml | 677 +++++++++--------- .../embedded/CanalServerWithEmbedded.java | 7 +- 14 files changed, 633 insertions(+), 502 deletions(-) diff --git a/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZkClientx.java b/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZkClientx.java index cba75cc3..74bde300 100644 --- a/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZkClientx.java +++ b/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZkClientx.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.common.zookeeper; +import com.google.common.collect.MigrateMap; import java.util.Map; import org.I0Itec.zkclient.IZkConnection; @@ -23,12 +24,14 @@ import com.google.common.collect.MapMaker; public class ZkClientx extends ZkClient { // 对于zkclient进行一次缓存，避免一个jvm内部使用多个zk connection - private static Map clients = new MapMaker().makeComputingMap(new Function() { + private static Map clients = MigrateMap.makeComputingMap(new Function() + { - public ZkClientx apply(String servers) { - return new ZkClientx(servers); - } - }); + public ZkClientx apply(String servers) + { + return new ZkClientx(servers); + } + }); public static ZkClientx getZkClient(String servers) { return clients.get(servers); diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java index 3e8f0c8a..8ba01a98 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.deployer; +import com.google.common.collect.MigrateMap; import java.util.Map; import java.util.Properties; @@ -70,9 +71,11 @@ public class CanalController { } public CanalController(final Properties properties){ - managerClients = new MapMaker().makeComputingMap(new Function() { + managerClients = MigrateMap.makeComputingMap(new Function() + { - public CanalConfigClient apply(String managerAddress) { + public CanalConfigClient apply(String managerAddress) + { return getManagerClient(managerAddress); } }); @@ -107,68 +110,88 @@ public class CanalController { final ServerRunningData serverData = new ServerRunningData(cid, ip + ":" + port); ServerRunningMonitors.setServerData(serverData); - ServerRunningMonitors.setRunningMonitors(new MapMaker().makeComputingMap(new Function() { - - public ServerRunningMonitor apply(final String destination) { + ServerRunningMonitors.setRunningMonitors(MigrateMap.makeComputingMap(new Function() + { + public ServerRunningMonitor apply(final String destination) + { ServerRunningMonitor runningMonitor = new ServerRunningMonitor(serverData); runningMonitor.setDestination(destination); - runningMonitor.setListener(new ServerRunningListener() { + runningMonitor.setListener(new ServerRunningListener() + { - public void processActiveEnter() { - try { + public void processActiveEnter() + { + try + { MDC.put(CanalConstants.MDC_DESTINATION, String.valueOf(destination)); embededCanalServer.start(destination); - } finally { + } finally + { MDC.remove(CanalConstants.MDC_DESTINATION); } } - public void processActiveExit() { - try { + public void processActiveExit() + { + try + { MDC.put(CanalConstants.MDC_DESTINATION, String.valueOf(destination)); embededCanalServer.stop(destination); - } finally { + } finally + { MDC.remove(CanalConstants.MDC_DESTINATION); } } - public void processStart() { - try { - if (zkclientx != null) { + public void processStart() + { + try + { + if (zkclientx != null) + { final String path = ZookeeperPathUtils.getDestinationClusterNode(destination, ip + ":" - + port); + + port); initCid(path); - zkclientx.subscribeStateChanges(new IZkStateListener() { + zkclientx.subscribeStateChanges(new IZkStateListener() + { - public void handleStateChanged(KeeperState state) throws Exception { + public void handleStateChanged(KeeperState state) throws Exception + { } - public void handleNewSession() throws Exception { + public void handleNewSession() throws Exception + { initCid(path); } }); } - } finally { + } finally + { MDC.remove(CanalConstants.MDC_DESTINATION); } } - public void processStop() { - try { + public void processStop() + { + try + { MDC.put(CanalConstants.MDC_DESTINATION, String.valueOf(destination)); - if (zkclientx != null) { + if (zkclientx != null) + { final String path = ZookeeperPathUtils.getDestinationClusterNode(destination, ip + ":" - + port); + + port); releaseCid(path); } - } finally { + } finally + { MDC.remove(CanalConstants.MDC_DESTINATION); } } }); - if (zkclientx != null) { + if (zkclientx != null) + { runningMonitor.setZkClient(zkclientx); } return runningMonitor; @@ -216,25 +239,32 @@ public class CanalController { } }; - instanceConfigMonitors = new MapMaker().makeComputingMap(new Function() { + instanceConfigMonitors = MigrateMap.makeComputingMap(new Function() + { - public InstanceConfigMonitor apply(InstanceMode mode) { - int scanInterval = Integer.valueOf(getProperty(properties, CanalConstants.CANAL_AUTO_SCAN_INTERVAL)); + public InstanceConfigMonitor apply(InstanceMode mode) + { + int scanInterval = Integer + .valueOf(getProperty(properties, CanalConstants.CANAL_AUTO_SCAN_INTERVAL)); - if (mode.isSpring()) { + if (mode.isSpring()) + { SpringInstanceConfigMonitor monitor = new SpringInstanceConfigMonitor(); monitor.setScanIntervalInSecond(scanInterval); monitor.setDefaultAction(defaultAction); // 设置conf目录，默认是user.dir + conf目录组成 String rootDir = getProperty(properties, CanalConstants.CANAL_CONF_DIR); - if (StringUtils.isEmpty(rootDir)) { + if (StringUtils.isEmpty(rootDir)) + { rootDir = "../conf"; } monitor.setRootConf(rootDir); return monitor; - } else if (mode.isManager()) { + } else if (mode.isManager()) + { return new ManagerInstanceConfigMonitor(); - } else { + } else + { throw new UnsupportedOperationException("unknow mode :" + mode + " for monitor"); } } diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java index c56edf21..d3b769e1 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.deployer.monitor; +import com.google.common.collect.MigrateMap; import java.io.File; import java.io.FileFilter; import java.io.FilenameFilter; @@ -39,12 +40,14 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen private long scanIntervalInSecond = 5; private InstanceAction defaultAction = null; private Map actions = new MapMaker().makeMap(); - private Map lastFiles = new MapMaker().makeComputingMap(new Function() { + private Map lastFiles = MigrateMap.makeComputingMap(new Function() + { - public InstanceConfigFiles apply(String destination) { - return new InstanceConfigFiles(destination); - } - }); + public InstanceConfigFiles apply(String destination) + { + return new InstanceConfigFiles(destination); + } + }); private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("canal-instance-scan")); diff --git a/filter/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java b/filter/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java index 4ce36315..ce10dc3f 100644 --- a/filter/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java +++ b/filter/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java @@ -1,48 +1,54 @@ package com.alibaba.otter.canal.filter; +import com.alibaba.otter.canal.filter.exception.CanalFilterException; +import com.google.common.base.Function; +import com.google.common.collect.MapMaker; +import com.google.common.collect.MigrateMap; import java.util.Map; - import org.apache.oro.text.regex.MalformedPatternException; import org.apache.oro.text.regex.Pattern; import org.apache.oro.text.regex.PatternCompiler; import org.apache.oro.text.regex.Perl5Compiler; -import com.alibaba.otter.canal.filter.exception.CanalFilterException; -import com.google.common.base.Function; -import com.google.common.collect.MapMaker; - /** * 提供{@linkplain Pattern}的lazy get处理 - * + * * @author jianghang 2013-1-22 下午09:36:44 * @version 1.0.0 */ -public class PatternUtils { +public class PatternUtils +{ - private static Map patterns = new MapMaker().softValues().makeComputingMap( - new Function() { + private static Map patterns = MigrateMap.makeComputingMap(new MapMaker().softValues(), + new Function() + { - public Pattern apply( - String pattern) { - try { - PatternCompiler pc = new Perl5Compiler(); - return pc.compile( - pattern, - Perl5Compiler.CASE_INSENSITIVE_MASK - | Perl5Compiler.READ_ONLY_MASK - | Perl5Compiler.SINGLELINE_MASK); - } catch (MalformedPatternException e) { - throw new CanalFilterException( - e); - } - } - }); + public Pattern apply( + String pattern) + { + try + { + PatternCompiler pc = new Perl5Compiler(); + return pc.compile( + pattern, + Perl5Compiler.CASE_INSENSITIVE_MASK + | Perl5Compiler.READ_ONLY_MASK + | Perl5Compiler.SINGLELINE_MASK); + } catch (MalformedPatternException e) + { + throw new CanalFilterException( + e); + } + } + }); - public static Pattern getPattern(String pattern) { + public static Pattern getPattern(String pattern) + { return patterns.get(pattern); } - public static void clear() { + public static void clear() + { patterns.clear(); } } diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java index f7062c53..7319c2cb 100644 --- a/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java +++ b/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.meta; +import com.google.common.collect.MigrateMap; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; @@ -69,28 +70,36 @@ public class FileMixedMetaManager extends MemoryMetaManager implements CanalMeta throw new CanalMetaManagerException("dir[" + dataDir.getPath() + "] can not read/write"); } - dataFileCaches = new MapMaker().makeComputingMap(new Function() { + dataFileCaches = MigrateMap.makeComputingMap(new Function() + { - public File apply(String destination) { + public File apply(String destination) + { return getDataFile(destination); } }); executor = Executors.newScheduledThreadPool(1); - destinations = new MapMaker().makeComputingMap(new Function>() { + destinations = MigrateMap.makeComputingMap(new Function>() + { - public List apply(String destination) { + public List apply(String destination) + { return loadClientIdentity(destination); } }); - cursors = new MapMaker().makeComputingMap(new Function() { + cursors = MigrateMap.makeComputingMap(new Function() + { - public Position apply(ClientIdentity clientIdentity) { + public Position apply(ClientIdentity clientIdentity) + { Position position = loadCursor(clientIdentity.getDestination(), clientIdentity); - if (position == null) { + if (position == null) + { return nullCursor; // 返回一个空对象标识，避免出现异常 - } else { + } else + { return position; } } diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/MemoryMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/MemoryMetaManager.java index 6effab1a..f7cbb6b4 100644 --- a/meta/src/main/java/com/alibaba/otter/canal/meta/MemoryMetaManager.java +++ b/meta/src/main/java/com/alibaba/otter/canal/meta/MemoryMetaManager.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.meta; +import com.google.common.collect.MigrateMap; import java.util.Collections; import java.util.List; import java.util.Map; @@ -31,9 +32,11 @@ public class MemoryMetaManager extends AbstractCanalLifeCycle implements CanalMe public void start() { super.start(); - batches = new MapMaker().makeComputingMap(new Function() { + batches = MigrateMap.makeComputingMap(new Function() + { - public MemoryClientIdentityBatch apply(ClientIdentity clientIdentity) { + public MemoryClientIdentityBatch apply(ClientIdentity clientIdentity) + { return MemoryClientIdentityBatch.create(clientIdentity); } @@ -41,9 +44,11 @@ public class MemoryMetaManager extends AbstractCanalLifeCycle implements CanalMe cursors = new MapMaker().makeMap(); - destinations = new MapMaker().makeComputingMap(new Function>() { + destinations = MigrateMap.makeComputingMap(new Function>() + { - public List apply(String destination) { + public List apply(String destination) + { return Lists.newArrayList(); } }); diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/MixedMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/MixedMetaManager.java index 84d7696d..f835a156 100644 --- a/meta/src/main/java/com/alibaba/otter/canal/meta/MixedMetaManager.java +++ b/meta/src/main/java/com/alibaba/otter/canal/meta/MixedMetaManager.java @@ -1,68 +1,79 @@ package com.alibaba.otter.canal.meta; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import org.springframework.util.Assert; - import com.alibaba.otter.canal.meta.exception.CanalMetaManagerException; import com.alibaba.otter.canal.protocol.ClientIdentity; import com.alibaba.otter.canal.protocol.position.Position; import com.alibaba.otter.canal.protocol.position.PositionRange; import com.google.common.base.Function; -import com.google.common.collect.MapMaker; +import com.google.common.collect.MigrateMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import org.springframework.util.Assert; /** * 组合memory + zookeeper的使用模式 - * + * * @author jianghang 2012-7-11 下午03:58:00 * @version 1.0.0 */ -public class MixedMetaManager extends MemoryMetaManager implements CanalMetaManager { +public class MixedMetaManager extends MemoryMetaManager implements CanalMetaManager +{ - private ExecutorService executor; + private ExecutorService executor; private ZooKeeperMetaManager zooKeeperMetaManager; @SuppressWarnings("serial") - private final Position nullCursor = new Position() { - }; + private final Position nullCursor = new Position() + { + }; - public void start() { + public void start() + { super.start(); Assert.notNull(zooKeeperMetaManager); - if (!zooKeeperMetaManager.isStart()) { + if (!zooKeeperMetaManager.isStart()) + { zooKeeperMetaManager.start(); } executor = Executors.newFixedThreadPool(1); - destinations = new MapMaker().makeComputingMap(new Function>() { + destinations = MigrateMap.makeComputingMap(new Function>() + { - public List apply(String destination) { + public List apply(String destination) + { return zooKeeperMetaManager.listAllSubscribeInfo(destination); } }); - cursors = new MapMaker().makeComputingMap(new Function() { + cursors = MigrateMap.makeComputingMap(new Function() + { - public Position apply(ClientIdentity clientIdentity) { + public Position apply(ClientIdentity clientIdentity) + { Position position = zooKeeperMetaManager.getCursor(clientIdentity); - if (position == null) { + if (position == null) + { return nullCursor; // 返回一个空对象标识，避免出现异常 - } else { + } else + { return position; } } }); - batches = new MapMaker().makeComputingMap(new Function() { + batches = MigrateMap.makeComputingMap(new Function() + { - public MemoryClientIdentityBatch apply(ClientIdentity clientIdentity) { + public MemoryClientIdentityBatch apply(ClientIdentity clientIdentity) + { // 读取一下zookeeper信息，初始化一次 MemoryClientIdentityBatch batches = MemoryClientIdentityBatch.create(clientIdentity); Map positionRanges = zooKeeperMetaManager.listAllBatchs(clientIdentity); - for (Map.Entry entry : positionRanges.entrySet()) { + for (Map.Entry entry : positionRanges.entrySet()) + { batches.addPositionRange(entry.getValue(), entry.getKey()); // 添加记录到指定batchId } return batches; @@ -70,10 +81,12 @@ public class MixedMetaManager extends MemoryMetaManager implements CanalMetaMana }); } - public void stop() { + public void stop() + { super.stop(); - if (zooKeeperMetaManager.isStart()) { + if (zooKeeperMetaManager.isStart()) + { zooKeeperMetaManager.stop(); } @@ -82,58 +95,73 @@ public class MixedMetaManager extends MemoryMetaManager implements CanalMetaMana batches.clear(); } - public void subscribe(final ClientIdentity clientIdentity) throws CanalMetaManagerException { + public void subscribe(final ClientIdentity clientIdentity) throws CanalMetaManagerException + { super.subscribe(clientIdentity); - executor.submit(new Runnable() { + executor.submit(new Runnable() + { - public void run() { + public void run() + { zooKeeperMetaManager.subscribe(clientIdentity); } }); } - public void unsubscribe(final ClientIdentity clientIdentity) throws CanalMetaManagerException { + public void unsubscribe(final ClientIdentity clientIdentity) throws CanalMetaManagerException + { super.unsubscribe(clientIdentity); - executor.submit(new Runnable() { + executor.submit(new Runnable() + { - public void run() { + public void run() + { zooKeeperMetaManager.unsubscribe(clientIdentity); } }); } public void updateCursor(final ClientIdentity clientIdentity, final Position position) - throws CanalMetaManagerException { + throws CanalMetaManagerException + { super.updateCursor(clientIdentity, position); // 异步刷新 - executor.submit(new Runnable() { + executor.submit(new Runnable() + { - public void run() { + public void run() + { zooKeeperMetaManager.updateCursor(clientIdentity, position); } }); } @Override - public Position getCursor(ClientIdentity clientIdentity) throws CanalMetaManagerException { + public Position getCursor(ClientIdentity clientIdentity) throws CanalMetaManagerException + { Position position = super.getCursor(clientIdentity); - if (position == nullCursor) { + if (position == nullCursor) + { return null; - } else { + } else + { return position; } } public Long addBatch(final ClientIdentity clientIdentity, final PositionRange positionRange) - throws CanalMetaManagerException { + throws CanalMetaManagerException + { final Long batchId = super.addBatch(clientIdentity, positionRange); // 异步刷新 - executor.submit(new Runnable() { + executor.submit(new Runnable() + { - public void run() { + public void run() + { zooKeeperMetaManager.addBatch(clientIdentity, positionRange, batchId); } }); @@ -141,24 +169,30 @@ public class MixedMetaManager extends MemoryMetaManager implements CanalMetaMana } public void addBatch(final ClientIdentity clientIdentity, final PositionRange positionRange, final Long batchId) - throws CanalMetaManagerException { + throws CanalMetaManagerException + { super.addBatch(clientIdentity, positionRange, batchId); // 异步刷新 - executor.submit(new Runnable() { + executor.submit(new Runnable() + { - public void run() { + public void run() + { zooKeeperMetaManager.addBatch(clientIdentity, positionRange, batchId); } }); } public PositionRange removeBatch(final ClientIdentity clientIdentity, final Long batchId) - throws CanalMetaManagerException { + throws CanalMetaManagerException + { PositionRange positionRange = super.removeBatch(clientIdentity, batchId); // 异步刷新 - executor.submit(new Runnable() { + executor.submit(new Runnable() + { - public void run() { + public void run() + { zooKeeperMetaManager.removeBatch(clientIdentity, batchId); } }); @@ -166,20 +200,24 @@ public class MixedMetaManager extends MemoryMetaManager implements CanalMetaMana return positionRange; } - public void clearAllBatchs(final ClientIdentity clientIdentity) throws CanalMetaManagerException { + public void clearAllBatchs(final ClientIdentity clientIdentity) throws CanalMetaManagerException + { super.clearAllBatchs(clientIdentity); // 异步刷新 - executor.submit(new Runnable() { + executor.submit(new Runnable() + { - public void run() { + public void run() + { zooKeeperMetaManager.clearAllBatchs(clientIdentity); } }); } // =============== setter / getter ================ - public void setZooKeeperMetaManager(ZooKeeperMetaManager zooKeeperMetaManager) { + public void setZooKeeperMetaManager(ZooKeeperMetaManager zooKeeperMetaManager) + { this.zooKeeperMetaManager = zooKeeperMetaManager; } } diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManager.java index c4c978d7..24fbce0d 100644 --- a/meta/src/main/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManager.java +++ b/meta/src/main/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManager.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.meta; +import com.google.common.collect.MigrateMap; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -52,32 +53,40 @@ public class PeriodMixedMetaManager extends MemoryMetaManager implements CanalMe } executor = Executors.newScheduledThreadPool(1); - destinations = new MapMaker().makeComputingMap(new Function>() { + destinations = MigrateMap.makeComputingMap(new Function>() + { - public List apply(String destination) { + public List apply(String destination) + { return zooKeeperMetaManager.listAllSubscribeInfo(destination); } }); - cursors = new MapMaker().makeComputingMap(new Function() { + cursors = MigrateMap.makeComputingMap(new Function() + { - public Position apply(ClientIdentity clientIdentity) { + public Position apply(ClientIdentity clientIdentity) + { Position position = zooKeeperMetaManager.getCursor(clientIdentity); - if (position == null) { + if (position == null) + { return nullCursor; // 返回一个空对象标识，避免出现异常 - } else { + } else + { return position; } } }); - batches = new MapMaker().makeComputingMap(new Function() { - - public MemoryClientIdentityBatch apply(ClientIdentity clientIdentity) { + batches = MigrateMap.makeComputingMap(new Function() + { + public MemoryClientIdentityBatch apply(ClientIdentity clientIdentity) + { // 读取一下zookeeper信息，初始化一次 MemoryClientIdentityBatch batches = MemoryClientIdentityBatch.create(clientIdentity); Map positionRanges = zooKeeperMetaManager.listAllBatchs(clientIdentity); - for (Map.Entry entry : positionRanges.entrySet()) { + for (Map.Entry entry : positionRanges.entrySet()) + { batches.addPositionRange(entry.getValue(), entry.getKey()); // 添加记录到指定batchId } return batches; diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java index f731ff0c..c0f34336 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.parse.inbound.mysql.dbsync; +import com.google.common.collect.MigrateMap; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -38,17 +39,23 @@ public class TableMetaCache { public TableMetaCache(MysqlConnection con){ this.connection = con; - tableMetaCache = new MapMaker().makeComputingMap(new Function() { + tableMetaCache = MigrateMap.makeComputingMap(new Function() + { - public TableMeta apply(String name) { - try { + public TableMeta apply(String name) + { + try + { return getTableMeta0(name); - } catch (IOException e) { + } catch (IOException e) + { // 尝试做一次retry操作 - try { + try + { connection.reconnect(); return getTableMeta0(name); - } catch (IOException e1) { + } catch (IOException e1) + { throw new CanalParseException("fetch failed by table meta:" + name, e1); } } diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManager.java b/parse/src/main/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManager.java index ee1e178b..d5696857 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManager.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManager.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.parse.index; +import com.google.common.collect.MigrateMap; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; @@ -67,21 +68,27 @@ public class FileMixedLogPositionManager extends MemoryLogPositionManager { throw new CanalMetaManagerException("dir[" + dataDir.getPath() + "] can not read/write"); } - dataFileCaches = new MapMaker().makeComputingMap(new Function() { + dataFileCaches = MigrateMap.makeComputingMap(new Function() + { - public File apply(String destination) { + public File apply(String destination) + { return getDataFile(destination); } }); executor = Executors.newScheduledThreadPool(1); - positions = new MapMaker().makeComputingMap(new Function() { + positions = MigrateMap.makeComputingMap(new Function() + { - public LogPosition apply(String destination) { + public LogPosition apply(String destination) + { LogPosition logPosition = loadDataFromFile(dataFileCaches.get(destination)); - if (logPosition == null) { + if (logPosition == null) + { return nullPosition; - } else { + } else + { return logPosition; } } diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManager.java b/parse/src/main/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManager.java index 6dfc7c76..161da8e2 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManager.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManager.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.parse.index; +import com.google.common.collect.MigrateMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -34,13 +35,17 @@ public class MixedLogPositionManager extends MemoryLogPositionManager implements zooKeeperLogPositionManager.start(); } executor = Executors.newFixedThreadPool(1); - positions = new MapMaker().makeComputingMap(new Function() { + positions = MigrateMap.makeComputingMap(new Function() + { - public LogPosition apply(String destination) { + public LogPosition apply(String destination) + { LogPosition logPosition = zooKeeperLogPositionManager.getLatestIndexBy(destination); - if (logPosition == null) { + if (logPosition == null) + { return nullPosition; - } else { + } else + { return logPosition; } } diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManager.java b/parse/src/main/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManager.java index b1967163..4a12781b 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManager.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManager.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.parse.index; +import com.google.common.collect.MigrateMap; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -43,13 +44,17 @@ public class PeriodMixedLogPositionManager extends MemoryLogPositionManager impl zooKeeperLogPositionManager.start(); } executor = Executors.newScheduledThreadPool(1); - positions = new MapMaker().makeComputingMap(new Function() { + positions = MigrateMap.makeComputingMap(new Function() + { - public LogPosition apply(String destination) { + public LogPosition apply(String destination) + { LogPosition logPosition = zooKeeperLogPositionManager.getLatestIndexBy(destination); - if (logPosition == null) { + if (logPosition == null) + { return nullPosition; - } else { + } else + { return logPosition; } } diff --git a/pom.xml b/pom.xml index 95dc3d86..d1d45299 100644 --- a/pom.xml +++ b/pom.xml @@ -1,311 +1,312 @@ - - 4.0.0 - com.alibaba.otter - canal - pom - canal module for otter ${project.version} - 1.0.20-SNAPSHOT - https://github.com/alibaba/canal - - org.sonatype.oss - oss-parent - 7 - - - - agapple - http://agapple.iteye.com - jianghang115@gmail.com - 8 - - - zavakid - http://www.zavakid.com - zava.kid@gmail.com - 8 - - - in355hz - http://in355hz.iteye.com - in355hz@gmail.com - 8 - - + + 4.0.0 + com.alibaba.otter + canal + pom + canal module for otter ${project.version} + 1.0.20-SNAPSHOT + https://github.com/alibaba/canal + + org.sonatype.oss + oss-parent + 7 + + + + agapple + http://agapple.iteye.com + jianghang115@gmail.com + 8 + + + zavakid + http://www.zavakid.com + zava.kid@gmail.com + 8 + + + in355hz + http://in355hz.iteye.com + in355hz@gmail.com + 8 + + - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - git@github.com:alibaba/canal.git - scm:git:git@github.com:alibaba/canal.git - scm:git:git@github.com:alibaba/canal.git - - - - - central - http://repo1.maven.org/maven2 - - true - - - false - - - - java.net - http://download.java.net/maven/2/ - - true - - - false - - - - alibaba - http://code.alibabatech.com/mvn/releases/ - - true - - - false - - - - sonatype - sonatype - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - sonatype-release - sonatype-release - https://oss.sonatype.org/service/local/repositories/releases/content - - false - - - true - - - - - - UTF-8 - - true - true - - 1.6 - 1.6 - UTF-8 - - - - common - meta - dbsync - filter - driver - parse - sink - store - protocol - instance - server - client - deployer - example - - - - - - org.springframework - spring - 2.5.6 - + + git@github.com:alibaba/canal.git + scm:git:git@github.com:alibaba/canal.git + scm:git:git@github.com:alibaba/canal.git + + + + + central + http://repo1.maven.org/maven2 + + true + + + false + + + + java.net + http://download.java.net/maven/2/ + + true + + + false + + + + alibaba + http://code.alibabatech.com/mvn/releases/ + + true + + + false + + + + sonatype + sonatype + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + + + sonatype-release + sonatype-release + https://oss.sonatype.org/service/local/repositories/releases/content + + false + + + true + + + + + + UTF-8 + + true + true + + 1.6 + 1.6 + UTF-8 + + + + common + meta + dbsync + filter + driver + parse + sink + store + protocol + instance + server + client + deployer + example + + + + + + org.springframework + spring + 2.5.6 + - commons-lang - commons-lang - 2.6 - - - commons-io - commons-io - 2.4 - - - org.apache.zookeeper - zookeeper - 3.4.5 - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - - jline - jline - - - - - com.github.sgroschupf - zkclient - 0.1 - - - com.alibaba - fastjson - 1.1.26 - - - com.google.guava - guava - r09 - - - com.googlecode.aviator - aviator - 2.2.1 - - - oro - oro - 2.0.8 - - - org.jboss.netty - netty - 3.2.5.Final - - - com.google.protobuf - protobuf-java - 2.4.1 - + commons-lang + commons-lang + 2.6 + + + commons-io + commons-io + 2.4 + + + org.apache.zookeeper + zookeeper + 3.4.5 + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-api + + + jline + jline + + + + + com.github.sgroschupf + zkclient + 0.1 + + + com.alibaba + fastjson + 1.1.26 + + + com.google.guava + guava + 18.0 + + + com.googlecode.aviator + aviator + 2.2.1 + + + oro + oro + 2.0.8 + + + org.jboss.netty + netty + 3.2.5.Final + + + com.google.protobuf + protobuf-java + 2.4.1 + - ch.qos.logback - logback-core - 1.0.6 - - - ch.qos.logback - logback-classic - 1.0.6 - - - org.slf4j - jcl-over-slf4j - 1.6.0 - - - org.slf4j - slf4j-api - 1.6.0 - - + ch.qos.logback + logback-core + 1.1.3 + - junit - junit - 4.5 - test - - - mysql - mysql-connector-java - 5.1.12 - test - - - - - - - - org.jvnet.wagon-svn - wagon-svn - 1.9 - - - org.apache.maven.wagon - wagon-http-shared - 1.0-beta-7 - - - - - org.apache.maven.plugins - maven-source-plugin + ch.qos.logback + logback-classic + 1.1.3 + + + org.slf4j + jcl-over-slf4j + 1.7.12 + + + org.slf4j + slf4j-api + 1.7.12 + + + + junit + junit + 4.12 + test + + + mysql + mysql-connector-java + 5.1.12 + test + + + + + + + + org.jvnet.wagon-svn + wagon-svn + 1.9 + + + org.apache.maven.wagon + wagon-http-shared + 1.0-beta-7 + + + + + org.apache.maven.plugins + maven-source-plugin 2.4 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-compiler-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-compiler-plugin 3.2 - - ${java_source_version} - ${java_target_version} - ${file_encoding} - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.5.1 - - - - .settings/org.eclipse.core.resources.prefs - - =${file_encoding}${line.separator}]]> - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - **/*Test.java - - - **/*NoRunTest.java - - - + + ${java_source_version} + ${java_target_version} + ${file_encoding} + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.5.1 + + + + .settings/org.eclipse.core.resources.prefs + + =${file_encoding}${line.separator}]]> + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.5 + + + **/*Test.java + + + **/*NoRunTest.java + + + - - src/main/java - src/test/java - - - src/main/resources - - **/* - - - **/.svn/ - - - - - - src/test/resources - - **/* - - - **/.svn/ - - - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + src/main/java + src/test/java + + + src/main/resources + + **/* + + + **/.svn/ + + + + + + src/test/resources + + **/* + + + **/.svn/ + + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + diff --git a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java index 604a54b6..c23ff139 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.server.embedded; +import com.google.common.collect.MigrateMap; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -47,9 +48,11 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C public void start() { super.start(); - canalInstances = new MapMaker().makeComputingMap(new Function() { + canalInstances = MigrateMap.makeComputingMap(new Function() + { - public CanalInstance apply(String destination) { + public CanalInstance apply(String destination) + { return canalInstanceGenerator.generate(destination); } }); From fc9b616f4a0cae5beab24dee20751fef130d4f70 Mon Sep 17 00:00:00 2001 From: wener Date: Fri, 24 Apr 2015 09:36:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=81=97=E6=BC=8F?= =?UTF-8?q?=E7=9A=84=20MigrateMap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/google/common/collect/MigrateMap.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 common/src/main/java/com/google/common/collect/MigrateMap.java diff --git a/common/src/main/java/com/google/common/collect/MigrateMap.java b/common/src/main/java/com/google/common/collect/MigrateMap.java new file mode 100644 index 00000000..0f22901b --- /dev/null +++ b/common/src/main/java/com/google/common/collect/MigrateMap.java @@ -0,0 +1,17 @@ +package com.google.common.collect; + +import com.google.common.base.Function; +import java.util.concurrent.ConcurrentMap; + +public class MigrateMap +{ + public static ConcurrentMap makeComputingMap(MapMaker maker, Function computingFunction) + { + return maker.makeComputingMap(computingFunction); + } + + public static ConcurrentMap makeComputingMap(Function computingFunction) + { + return new MapMaker().makeComputingMap(computingFunction); + } +} From 596b0606491f7890b791c3d6c7f8aab1fbb8341d Mon Sep 17 00:00:00 2001 From: wener Date: Mon, 27 Apr 2015 14:57:01 +0800 Subject: [PATCH 5/5] cleanup code, extract CanalService --- .../otter/canal/client/CanalConnector.java | 13 ++++----- common/pom.xml | 1 - instance/core/pom.xml | 1 - .../manager/CanalInstanceWithManager.java | 9 +++--- .../otter/canal/meta/CanalMetaManager.java | 4 +-- parse/pom.xml | 1 - .../otter/canal/protocol/ClientIdentity.java | 4 ++- server/pom.xml | 1 - .../otter/canal/server/CanalService.java | 29 +++++++++++++++++++ .../embedded/CanalServerWithEmbedded.java | 25 +++++++++++----- .../canal/sink/entry/EntryEventSink.java | 8 ++--- 11 files changed, 63 insertions(+), 33 deletions(-) create mode 100644 server/src/main/java/com/alibaba/otter/canal/server/CanalService.java diff --git a/client/src/main/java/com/alibaba/otter/canal/client/CanalConnector.java b/client/src/main/java/com/alibaba/otter/canal/client/CanalConnector.java index b8f84395..fb0db67f 100644 --- a/client/src/main/java/com/alibaba/otter/canal/client/CanalConnector.java +++ b/client/src/main/java/com/alibaba/otter/canal/client/CanalConnector.java @@ -19,14 +19,14 @@ public interface CanalConnector { * * @throws CanalClientException */ - public void connect() throws CanalClientException; + void connect() throws CanalClientException; /** * 释放链接 * * @throws CanalClientException */ - public void disconnect() throws CanalClientException; + void disconnect() throws CanalClientException; /** * 检查下链接是否合法 @@ -43,7 +43,7 @@ public interface CanalConnector { * * @throws CanalClientException */ - public boolean checkValid() throws CanalClientException; + boolean checkValid() throws CanalClientException; /** * 客户端订阅，重复订阅时会更新对应的filter信息 @@ -56,7 +56,6 @@ public interface CanalConnector { * TODO: 后续可以考虑，如果本次提交的filter不为空，在执行过滤时，是对canal server filter + 本次filter的交集处理，达到只取1份binlog数据，多个客户端消费不同的表 * * - * @param clientIdentity * @throws CanalClientException */ void subscribe(String filter) throws CanalClientException; @@ -64,7 +63,6 @@ public interface CanalConnector { /** * 客户端订阅，不提交客户端filter，以服务端的filter为准 * - * @param clientIdentity * @throws CanalClientException */ void subscribe() throws CanalClientException; @@ -72,7 +70,6 @@ public interface CanalConnector { /** * 取消订阅 * - * @param clientIdentity * @throws CanalClientException */ void unsubscribe() throws CanalClientException; @@ -140,14 +137,14 @@ public interface CanalConnector { void ack(long batchId) throws CanalClientException; /** - * 回滚到未进行 {@link ack} 的地方，指定回滚具体的batchId + * 回滚到未进行 {@link #ack} 的地方，指定回滚具体的batchId * * @throws CanalClientException */ void rollback(long batchId) throws CanalClientException; /** - * 回滚到未进行 {@link ack} 的地方，下次fetch的时候，可以从最后一个没有 {@link ack} 的地方开始拿 + * 回滚到未进行 {@link #ack} 的地方，下次fetch的时候，可以从最后一个没有 {@link #ack} 的地方开始拿 * * @throws CanalClientException */ diff --git a/common/pom.xml b/common/pom.xml index 620ed474..b51d6961 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,6 @@ 1.0.20-SNAPSHOT ../pom.xml - com.alibaba.otter canal.common jar canal common module for otter ${project.version} diff --git a/instance/core/pom.xml b/instance/core/pom.xml index b4bb5428..2c53ef79 100644 --- a/instance/core/pom.xml +++ b/instance/core/pom.xml @@ -6,7 +6,6 @@ 1.0.20-SNAPSHOT ../../pom.xml - com.alibaba.otter canal.instance.core jar canal instance core module for otter ${project.version} diff --git a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java index 0d9c0d32..e5b84d1e 100644 --- a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java +++ b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java @@ -89,8 +89,7 @@ public class CanalInstanceWithManager extends CanalInstanceSupport implements Ca this.destination = canal.getName(); this.filter = filter; - logger.info("init CannalInstance for {}-{} with parameters:{}", - new Object[] { canalId, destination, parameters }); + logger.info("init CannalInstance for {}-{} with parameters:{}", canalId, destination, parameters); // 初始化报警机制 initAlarmHandler(); // 初始化metaManager @@ -116,8 +115,8 @@ public class CanalInstanceWithManager extends CanalInstanceSupport implements Ca public void start() { super.start(); // 初始化metaManager - logger.info("start CannalInstance for {}-{} with parameters:{}", new Object[] { canalId, destination, - parameters }); + logger.info("start CannalInstance for {}-{} with parameters:{}", canalId, destination, + parameters); if (!metaManager.isStart()) { metaManager.start(); @@ -336,7 +335,7 @@ public class CanalInstanceWithManager extends CanalInstanceSupport implements Ca } private CanalEventParser doInitEventParser(SourcingType type, List dbAddresses) { - CanalEventParser eventParser = null; + CanalEventParser eventParser; if (type.isMysql()) { MysqlEventParser mysqlEventParser = new MysqlEventParser(); mysqlEventParser.setDestination(destination); diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/CanalMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/CanalMetaManager.java index 534e6d4a..17faf395 100644 --- a/meta/src/main/java/com/alibaba/otter/canal/meta/CanalMetaManager.java +++ b/meta/src/main/java/com/alibaba/otter/canal/meta/CanalMetaManager.java @@ -35,12 +35,12 @@ public interface CanalMetaManager extends CanalLifeCycle { void unsubscribe(ClientIdentity clientIdentity) throws CanalMetaManagerException; /** - * 获取cuosr游标 + * 获取 cursor 游标 */ Position getCursor(ClientIdentity clientIdentity) throws CanalMetaManagerException; /** - * 更新cuosr游标 + * 更新 cursor 游标 */ void updateCursor(ClientIdentity clientIdentity, Position position) throws CanalMetaManagerException; diff --git a/parse/pom.xml b/parse/pom.xml index 7ce7a62c..5aad44bd 100644 --- a/parse/pom.xml +++ b/parse/pom.xml @@ -6,7 +6,6 @@ 1.0.20-SNAPSHOT ../pom.xml - com.alibaba.otter canal.parse jar canal parse module for otter ${project.version} diff --git a/protocol/src/main/java/com/alibaba/otter/canal/protocol/ClientIdentity.java b/protocol/src/main/java/com/alibaba/otter/canal/protocol/ClientIdentity.java index 52e3fb05..1eccdef4 100644 --- a/protocol/src/main/java/com/alibaba/otter/canal/protocol/ClientIdentity.java +++ b/protocol/src/main/java/com/alibaba/otter/canal/protocol/ClientIdentity.java @@ -1,5 +1,6 @@ package com.alibaba.otter.canal.protocol; +import java.io.Serializable; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ToStringBuilder; @@ -9,7 +10,8 @@ import com.alibaba.otter.canal.common.utils.CanalToStringStyle; * @author zebin.xuzb @ 2012-6-20 * @version 1.0.0 */ -public class ClientIdentity { +public class ClientIdentity implements Serializable +{ private String destination; private short clientId; diff --git a/server/pom.xml b/server/pom.xml index 27cbb50a..eb2abcc7 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,6 @@ 1.0.20-SNAPSHOT ../pom.xml - com.alibaba.otter canal.server jar canal server module for otter ${project.version} diff --git a/server/src/main/java/com/alibaba/otter/canal/server/CanalService.java b/server/src/main/java/com/alibaba/otter/canal/server/CanalService.java new file mode 100644 index 00000000..48709ab8 --- /dev/null +++ b/server/src/main/java/com/alibaba/otter/canal/server/CanalService.java @@ -0,0 +1,29 @@ +package com.alibaba.otter.canal.server; + +import com.alibaba.otter.canal.protocol.ClientIdentity; +import com.alibaba.otter.canal.protocol.Message; +import com.alibaba.otter.canal.server.exception.CanalServerException; +import java.util.concurrent.TimeUnit; + +public interface CanalService +{ + void subscribe(ClientIdentity clientIdentity) throws CanalServerException; + + void unsubscribe(ClientIdentity clientIdentity) throws CanalServerException; + + Message get(ClientIdentity clientIdentity, int batchSize) throws CanalServerException; + + Message get(ClientIdentity clientIdentity, int batchSize, Long timeout, TimeUnit unit) + throws CanalServerException; + + Message getWithoutAck(ClientIdentity clientIdentity, int batchSize) throws CanalServerException; + + Message getWithoutAck(ClientIdentity clientIdentity, int batchSize, Long timeout, TimeUnit unit) + throws CanalServerException; + + void ack(ClientIdentity clientIdentity, long batchId) throws CanalServerException; + + void rollback(ClientIdentity clientIdentity) throws CanalServerException; + + void rollback(ClientIdentity clientIdentity, Long batchId) throws CanalServerException; +} diff --git a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java index c23ff139..38ea14d8 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java @@ -28,7 +28,6 @@ import com.alibaba.otter.canal.store.model.Event; import com.alibaba.otter.canal.store.model.Events; import com.google.common.base.Function; import com.google.common.collect.Lists; -import com.google.common.collect.MapMaker; import com.google.common.collect.Maps; /** @@ -38,7 +37,8 @@ import com.google.common.collect.Maps; * @author zebin.xuzb * @version 1.0.0 */ -public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements CanalServer { +public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements CanalServer, com.alibaba.otter.canal.server.CanalService +{ private static final Logger logger = LoggerFactory.getLogger(CanalServerWithEmbedded.class); private Map canalInstances; @@ -116,6 +116,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C /** * 客户端订阅，重复订阅时会更新对应的filter信息 */ + @Override public void subscribe(ClientIdentity clientIdentity) throws CanalServerException { CanalInstance canalInstance = canalInstances.get(clientIdentity.getDestination()); if (!canalInstance.getMetaManager().isStart()) { @@ -142,6 +143,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C /** * 取消订阅 */ + @Override public void unsubscribe(ClientIdentity clientIdentity) throws CanalServerException { CanalInstance canalInstance = canalInstances.get(clientIdentity.getDestination()); canalInstance.getMetaManager().unsubscribe(clientIdentity); // 执行一下meta订阅 @@ -164,6 +166,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C * 注意： meta获取和数据的获取需要保证顺序性，优先拿到meta的，一定也会是优先拿到数据，所以需要加同步. (不能出现先拿到meta，拿到第二批数据，这样就会导致数据顺序性出现问题) * */ + @Override public Message get(ClientIdentity clientIdentity, int batchSize) throws CanalServerException { return get(clientIdentity, batchSize, null, null); } @@ -181,6 +184,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C * 注意： meta获取和数据的获取需要保证顺序性，优先拿到meta的，一定也会是优先拿到数据，所以需要加同步. (不能出现先拿到meta，拿到第二批数据，这样就会导致数据顺序性出现问题) * */ + @Override public Message get(ClientIdentity clientIdentity, int batchSize, Long timeout, TimeUnit unit) throws CanalServerException { checkStart(clientIdentity.getDestination()); @@ -215,8 +219,8 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C }); logger.info("get successfully, clientId:{} batchSize:{} real size is {} and result is [batchId:{} , position:{}]", - new Object[] { clientIdentity.getClientId(), batchSize, entrys.size(), batchId, - events.getPositionRange() }); + clientIdentity.getClientId(), batchSize, entrys.size(), batchId, + events.getPositionRange()); // 直接提交ack ack(clientIdentity, batchId); return new Message(batchId, entrys); @@ -232,6 +236,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C * 注意： meta获取和数据的获取需要保证顺序性，优先拿到meta的，一定也会是优先拿到数据，所以需要加同步. (不能出现先拿到meta，拿到第二批数据，这样就会导致数据顺序性出现问题) * */ + @Override public Message getWithoutAck(ClientIdentity clientIdentity, int batchSize) throws CanalServerException { return getWithoutAck(clientIdentity, batchSize, null, null); } @@ -250,6 +255,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C * 注意： meta获取和数据的获取需要保证顺序性，优先拿到meta的，一定也会是优先拿到数据，所以需要加同步. (不能出现先拿到meta，拿到第二批数据，这样就会导致数据顺序性出现问题) * */ + @Override public Message getWithoutAck(ClientIdentity clientIdentity, int batchSize, Long timeout, TimeUnit unit) throws CanalServerException { checkStart(clientIdentity.getDestination()); @@ -287,8 +293,8 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C }); logger.info("getWithoutAck successfully, clientId:{} batchSize:{} real size is {} and result is [batchId:{} , position:{}]", - new Object[] { clientIdentity.getClientId(), batchSize, entrys.size(), batchId, - events.getPositionRange() }); + clientIdentity.getClientId(), batchSize, entrys.size(), batchId, + events.getPositionRange()); return new Message(batchId, entrys); } @@ -316,6 +322,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C * 注意：进行反馈时必须按照batchId的顺序进行ack(需有客户端保证) * */ + @Override public void ack(ClientIdentity clientIdentity, long batchId) throws CanalServerException { checkStart(clientIdentity.getDestination()); checkSubscribe(clientIdentity); @@ -350,7 +357,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C if (positionRanges.getAck() != null) { canalInstance.getMetaManager().updateCursor(clientIdentity, positionRanges.getAck()); logger.info("ack successfully, clientId:{} batchId:{} position:{}", - new Object[] { clientIdentity.getClientId(), batchId, positionRanges }); + clientIdentity.getClientId(), batchId, positionRanges); } // 可定时清理数据 @@ -361,6 +368,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C /** * 回滚到未进行 {@link #ack} 的地方，下次fetch的时候，可以从最后一个没有 {@link #ack} 的地方开始拿 */ + @Override public void rollback(ClientIdentity clientIdentity) throws CanalServerException { checkStart(clientIdentity.getDestination()); CanalInstance canalInstance = canalInstances.get(clientIdentity.getDestination()); @@ -382,6 +390,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C /** * 回滚到未进行 {@link #ack} 的地方，下次fetch的时候，可以从最后一个没有 {@link #ack} 的地方开始拿 */ + @Override public void rollback(ClientIdentity clientIdentity, Long batchId) throws CanalServerException { checkStart(clientIdentity.getDestination()); CanalInstance canalInstance = canalInstances.get(clientIdentity.getDestination()); @@ -407,7 +416,7 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C canalInstance.getEventStore().rollback();// rollback // eventStore中的状态信息 logger.info("rollback successfully, clientId:{} batchId:{} position:{}", - new Object[] { clientIdentity.getClientId(), batchId, positionRanges }); + clientIdentity.getClientId(), batchId, positionRanges); } } diff --git a/sink/src/main/java/com/alibaba/otter/canal/sink/entry/EntryEventSink.java b/sink/src/main/java/com/alibaba/otter/canal/sink/entry/EntryEventSink.java index 8474950e..1e85eaaa 100644 --- a/sink/src/main/java/com/alibaba/otter/canal/sink/entry/EntryEventSink.java +++ b/sink/src/main/java/com/alibaba/otter/canal/sink/entry/EntryEventSink.java @@ -132,8 +132,8 @@ public class EntryEventSink extends AbstractCanalEventSink eventStore) {