Skip to content

Commit 1a00be1

Browse files
agappleagapple
committed
fixed format
1 parent 5a968b3 commit 1a00be1

File tree

7 files changed

+30
-63
lines changed

7 files changed

+30
-63
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
# enable gtid use true/false
66
canal.instance.gtidon=false
77

8+
# rds oss binlog
9+
canal.instance.rds.accesskey=
10+
canal.instance.rds.secretkey=
11+
canal.instance.rds.instanceId=
12+
813
# position info
914
canal.instance.master.address=127.0.0.1:3306
1015
canal.instance.master.journal.name=
@@ -13,18 +18,15 @@ canal.instance.master.timestamp=
1318
canal.instance.master.gtid=
1419

1520
# ssl
21+
#canal.instance.master.sslMode=DISABLED
22+
#canal.instance.master.tlsVersions=
1623
#canal.instance.master.trustCertificateKeyStoreType=
1724
#canal.instance.master.trustCertificateKeyStoreUrl=
1825
#canal.instance.master.trustCertificateKeyStorePassword=
1926
#canal.instance.master.clientCertificateKeyStoreType=
2027
#canal.instance.master.clientCertificateKeyStoreUrl=
2128
#canal.instance.master.clientCertificateKeyStorePassword=
2229

23-
# rds oss binlog
24-
canal.instance.rds.accesskey=
25-
canal.instance.rds.secretkey=
26-
canal.instance.rds.instanceId=
27-
2830
# table meta tsdb info
2931
canal.instance.tsdb.enable=true
3032
#canal.instance.tsdb.url=jdbc:mysql://127.0.0.1:3306/canal_tsdb

‎driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnector.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ private void printSslStatus() {
107107
sslVersion,
108108
sslCipher);
109109
} catch (Exception e) {
110-
logger.info("Can't show SSL status, server may not standard MySQL server: {}", e.toString());
111-
logger.debug("show SSL status exception", e);
110+
logger.warn("Can't show SSL status, server may not standard MySQL server", e);
112111
}
113112
}
114113

‎driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/BioSocketChannelPool.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ private static SSLContext getSSLContext(String clientCertificateKeyStoreUrl, Str
147147
ksIS.close();
148148
} catch (IOException e) {
149149
// can't close input stream, but keystore can be properly initialized so we
150-
// shouldn't throw
151-
// this exception
150+
// shouldn't throw this exception
152151
}
153152
}
154153
}
@@ -194,8 +193,7 @@ private static SSLContext getSSLContext(String clientCertificateKeyStoreUrl, Str
194193
trustStoreIS.close();
195194
} catch (IOException e) {
196195
// can't close input stream, but keystore can be properly initialized so we
197-
// shouldn't throw this
198-
// exception
196+
// shouldn't throw this exception
199197
}
200198
}
201199
}

‎driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/socket/SocketChannelPool.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ public static SocketChannel open(SocketAddress address) throws Exception {
2929

3030
public static SocketChannel connectSsl(SocketChannel channel, SslInfo sslInfo) throws IOException {
3131
SslMode sslMode = sslInfo.getSslMode();
32-
3332
String type = chooseSocketChannel();
3433
if ("netty".equalsIgnoreCase(type)) {
35-
throw new UnsupportedOperationException("canal.socketChannel netty not support ssl mode: " + sslMode);
34+
throw new UnsupportedOperationException("canal socketChannel netty not support ssl mode: " + sslMode);
3635
} else {
3736
SocketAddress remoteSocketAddress = channel.getRemoteSocketAddress();
3837
try {

‎parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DdlResult.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public class DdlResult {
1010

1111
private String schemaName;
1212
private String tableName;
13-
private String oriSchemaName; // rename ddl中的源表
14-
private String oriTableName; // rename ddl中的目标表
13+
private String oriSchemaName; // rename ddl中的源表
14+
private String oriTableName; // rename ddl中的目标表
1515
private EventType type;
1616
private DdlResult renameTableResult; // 多个rename table的存储
1717

@@ -102,7 +102,8 @@ public String toString() {
102102
DdlResult ddlResult = this;
103103
StringBuilder sb = new StringBuilder();
104104
do {
105-
sb.append(String.format("DdlResult [schemaName=%s , tableName=%s , oriSchemaName=%s , oriTableName=%s , type=%s ];",
105+
sb.append(String.format(
106+
"DdlResult [schemaName=%s , tableName=%s , oriSchemaName=%s , oriTableName=%s , type=%s ];",
106107
ddlResult.schemaName,
107108
ddlResult.tableName,
108109
ddlResult.oriSchemaName,

‎parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,18 @@
44
import java.util.Arrays;
55
import java.util.List;
66

7+
import org.apache.commons.lang.StringUtils;
8+
9+
import com.alibaba.otter.canal.protocol.CanalEntry.EventType;
710
import com.alibaba.polardbx.druid.sql.SQLUtils;
811
import com.alibaba.polardbx.druid.sql.ast.SQLExpr;
912
import com.alibaba.polardbx.druid.sql.ast.SQLStatement;
1013
import com.alibaba.polardbx.druid.sql.ast.expr.SQLIdentifierExpr;
1114
import com.alibaba.polardbx.druid.sql.ast.expr.SQLPropertyExpr;
12-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLAlterTableAddConstraint;
13-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLAlterTableAddIndex;
14-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLAlterTableDropConstraint;
15-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLAlterTableDropIndex;
16-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLAlterTableDropKey;
17-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLAlterTableItem;
18-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLAlterTableRename;
19-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLAlterTableStatement;
20-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLConstraint;
21-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLCreateDatabaseStatement;
22-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLCreateIndexStatement;
23-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLCreateTableStatement;
24-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLDeleteStatement;
25-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLDropDatabaseStatement;
26-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLDropIndexStatement;
27-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLDropTableStatement;
28-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLExprTableSource;
29-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLInsertStatement;
30-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLTableSource;
31-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLTruncateStatement;
32-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLUnique;
33-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLUpdateStatement;
15+
import com.alibaba.polardbx.druid.sql.ast.statement.*;
3416
import com.alibaba.polardbx.druid.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement;
3517
import com.alibaba.polardbx.druid.sql.parser.ParserException;
3618
import com.alibaba.polardbx.druid.util.JdbcConstants;
37-
import org.apache.commons.lang.StringUtils;
38-
39-
import com.alibaba.otter.canal.protocol.CanalEntry.EventType;
4019

4120
/**
4221
* @author agapple 2017年7月27日 下午4:05:34

‎parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta.java‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,22 @@
33
import java.util.*;
44
import java.util.concurrent.ConcurrentHashMap;
55

6+
import org.apache.commons.lang.StringUtils;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
10+
import com.alibaba.otter.canal.parse.inbound.TableMeta;
11+
import com.alibaba.otter.canal.parse.inbound.TableMeta.FieldMeta;
12+
import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DruidDdlParser;
13+
import com.alibaba.otter.canal.protocol.position.EntryPosition;
614
import com.alibaba.polardbx.druid.DbType;
715
import com.alibaba.polardbx.druid.sql.SQLUtils;
816
import com.alibaba.polardbx.druid.sql.ast.SQLDataType;
917
import com.alibaba.polardbx.druid.sql.ast.SQLDataTypeImpl;
1018
import com.alibaba.polardbx.druid.sql.ast.SQLExpr;
1119
import com.alibaba.polardbx.druid.sql.ast.SQLStatement;
12-
import com.alibaba.polardbx.druid.sql.ast.expr.SQLCharExpr;
13-
import com.alibaba.polardbx.druid.sql.ast.expr.SQLIdentifierExpr;
14-
import com.alibaba.polardbx.druid.sql.ast.expr.SQLMethodInvokeExpr;
15-
import com.alibaba.polardbx.druid.sql.ast.expr.SQLNullExpr;
16-
import com.alibaba.polardbx.druid.sql.ast.expr.SQLPropertyExpr;
17-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLColumnConstraint;
18-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLColumnDefinition;
19-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLColumnPrimaryKey;
20-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLColumnUniqueKey;
21-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLCreateTableStatement;
22-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLNotNullConstraint;
23-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLNullConstraint;
24-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLSelectOrderByItem;
25-
import com.alibaba.polardbx.druid.sql.ast.statement.SQLTableElement;
20+
import com.alibaba.polardbx.druid.sql.ast.expr.*;
21+
import com.alibaba.polardbx.druid.sql.ast.statement.*;
2622
import com.alibaba.polardbx.druid.sql.dialect.mysql.ast.MySqlPrimaryKey;
2723
import com.alibaba.polardbx.druid.sql.dialect.mysql.ast.MySqlUnique;
2824
import com.alibaba.polardbx.druid.sql.dialect.mysql.ast.expr.MySqlOrderingExpr;
@@ -32,13 +28,6 @@
3228
import com.alibaba.polardbx.druid.sql.visitor.SQLASTOutputVisitor;
3329
import com.alibaba.polardbx.druid.sql.visitor.VisitorFeature;
3430
import com.alibaba.polardbx.druid.util.JdbcConstants;
35-
import org.apache.commons.lang.StringUtils;
36-
import org.slf4j.Logger;
37-
import org.slf4j.LoggerFactory;
38-
import com.alibaba.otter.canal.parse.inbound.TableMeta;
39-
import com.alibaba.otter.canal.parse.inbound.TableMeta.FieldMeta;
40-
import com.alibaba.otter.canal.parse.inbound.mysql.ddl.DruidDdlParser;
41-
import com.alibaba.otter.canal.protocol.position.EntryPosition;
4231

4332
/**
4433
* 基于DDL维护的内存表结构
@@ -50,7 +39,7 @@ public class MemoryTableMeta implements TableMetaTSDB {
5039

5140
private Logger logger = LoggerFactory.getLogger(MemoryTableMeta.class);
5241
private Map<List<String>, TableMeta> tableMetas = new ConcurrentHashMap<>();
53-
private SchemaRepository repository;
42+
private SchemaRepository repository;
5443

5544
public MemoryTableMeta(){
5645
repository = new SchemaRepository(JdbcConstants.MYSQL);

0 commit comments

Comments
 (0)