merge tsdb meta support and refactor

deployer/src/main/resources/example/instance.properties

@@ -9,15 +9,10 @@ canal.instance.master.timestamp=1506088042
 
 
 # tsdb info
-canal.instance.tsdb.address=127.0.0.1:3306
 canal.instance.tsdb.enable=true
+canal.instance.tsdb.url=jdbc:mysql://127.0.0.1:3306/tsdb
 canal.instance.tsdb.dbUsername=canal
 canal.instance.tsdb.dbPassword=canal
-#  tsdb关联的目标db，和canal.instance.defaultDatabaseName意义相同
-canal.instance.tsdb.defaultDatabaseName=test
-canal.instance.tsdb.connectionCharset=UTF-8
-canal.instance.tsdb.driverClassName=com.mysql.jdbc.Driver
-canal.instance.tsdb.url=jdbc:mysql://127.0.0.1:3306/tsdb
 
 
 #canal.instance.standby.address =
@@ -31,6 +26,6 @@ canal.instance.defaultDatabaseName=test
 canal.instance.connectionCharset=UTF-8
 # table regex
 canal.instance.filter.regex=.*\\..*
-# table black regex , 默认过滤表结构管理的数据
+# table black regex
 canal.instance.filter.black.regex=tsdb\\..*
 #################################################

deployer/src/main/resources/spring/file-instance.xml

@@ -180,13 +180,10 @@
 	<!--tsdb related-->
 	<bean id="dataSource" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DataSourceFactoryTSDB"
 		  factory-method="getDataSource">
-		<constructor-arg index="0" value="${canal.instance.tsdb.address}"/>
+		<constructor-arg index="0" value="${canal.instance.tsdb.url}"/>
 		<constructor-arg index="1" value="${canal.instance.tsdb.dbUsername}"/>
 		<constructor-arg index="2" value="${canal.instance.tsdb.dbPassword}"/>
 		<constructor-arg index="3" value="${canal.instance.tsdb.enable:true}"/>
-		<constructor-arg index="4" value="${canal.instance.tsdb.defaultDatabaseName}"/>
-		<constructor-arg index="5" value="${canal.instance.tsdb.url}"/>
-		<constructor-arg index="6" value="${canal.instance.tsdb.driverClassName}"/>
 	</bean>
 
 	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
@@ -210,5 +207,4 @@
 	<bean id="metaSnapshotDAO" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.dao.MetaSnapshotDAO">
 		<property name="sqlMapClient" ref="sqlMapClient"/>
 	</bean>
-
 </beans>

deployer/src/main/resources/spring/tsdb/dal-dao.xml

@@ -9,13 +9,10 @@
 
     <bean id="dataSource" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DataSourceFactoryTSDB"
           factory-method="getDataSource">
-        <constructor-arg index="0" value="${canal.instance.tsdb.address}"/>
+        <constructor-arg index="0" value="${canal.instance.tsdb.url}"/>
         <constructor-arg index="1" value="${canal.instance.tsdb.dbUsername}"/>
         <constructor-arg index="2" value="${canal.instance.tsdb.dbPassword}"/>
         <constructor-arg index="3" value="${canal.instance.tsdb.enable:true}"/>
-        <constructor-arg index="4" value="${canal.instance.tsdb.defaultDatabaseName}"/>
-        <constructor-arg index="5" value="${canal.instance.tsdb.url}"/>
-        <constructor-arg index="6" value="${canal.instance.tsdb.driverClassName}"/>
     </bean>
 
     <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">

deployer/src/main/resources/spring/tsdb/sql-map/sqlmap_history.xml

@@ -6,18 +6,14 @@
 
     <sql id="allColumns">
         <![CDATA[
-
 		gmt_create,gmt_modified,binlog_file,binlog_offest,binlog_master_id,binlog_timestamp,use_schema,`schema`,`table`,`sql`,`type`,`extra`
-
         ]]>
     </sql>
     <sql id="allVOColumns">
         <![CDATA[
-
 		a.id as id,a.gmt_create as gmtCreate,a.gmt_modified as gmtModified,
 		a.binlog_file as binlogFile,a.binlog_offest as binlogOffest,a.binlog_master_id as binlogMasterId,a.binlog_timestamp as binlogTimestamp,
 		a.use_schema as useSchema,a.`schema` as `schema`,a.`table` as `table`,a.`sql` as `sql`,a.`type` as `type`,a.`extra` as `extra`
-
         ]]>
     </sql>
 
@@ -42,10 +38,8 @@
 
     <delete id="deleteByGmtModified" parameterClass="java.util.Map">
         <![CDATA[
-
 		delete from `canal_table_meta_history`
 		where gmt_modified < date_sub(now(),interval #interval# second)
-
         ]]>
     </delete>