You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2017/06/16 08:36:22 UTC
incubator-rocketmq-externals git commit: Polish
Repository: incubator-rocketmq-externals
Updated Branches:
refs/heads/master 2d84f7035 -> 934e7bc12
Polish
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/commit/934e7bc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/tree/934e7bc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/diff/934e7bc1
Branch: refs/heads/master
Commit: 934e7bc12da8610de355afb2081a754c9b6b27dd
Parents: 2d84f70
Author: vongosling <vo...@apache.org>
Authored: Fri Jun 16 16:36:14 2017 +0800
Committer: vongosling <vo...@apache.org>
Committed: Fri Jun 16 16:36:14 2017 +0800
----------------------------------------------------------------------
rocketmq-mysql/LICENSE-BIN | 20 +++++++++++++++++++-
rocketmq-mysql/README.md | 2 +-
rocketmq-mysql/pom.xml | 4 ++--
.../java/org/apache/rocketmq/mysql/Config.java | 2 +-
.../apache/rocketmq/mysql/binlog/DataRow.java | 1 -
.../rocketmq/mysql/binlog/EventListener.java | 2 --
.../rocketmq/mysql/binlog/EventProcessor.java | 4 +---
.../rocketmq/mysql/binlog/Transaction.java | 1 -
.../rocketmq/mysql/offset/OffsetLogThread.java | 1 -
.../mysql/position/BinlogPositionManager.java | 3 ---
.../mysql/productor/RocketMQProducer.java | 9 +--------
.../apache/rocketmq/mysql/schema/Database.java | 12 ++++--------
.../apache/rocketmq/mysql/schema/Schema.java | 8 +++-----
.../org/apache/rocketmq/mysql/schema/Table.java | 1 -
.../mysql/schema/column/ColumnParser.java | 13 ++++---------
.../mysql/schema/column/IntColumnParser.java | 3 ---
.../mysql/schema/column/SetColumnParser.java | 9 ++++-----
.../mysql/schema/column/StringColumnParser.java | 12 ++++++------
.../mysql/schema/column/TimeColumnParser.java | 3 +--
.../rocketmq/mysql/BigIntColumnParserTest.java | 1 -
.../rocketmq/mysql/EnumColumnParserTest.java | 1 -
.../rocketmq/mysql/IntColumnParserTest.java | 12 +++++-------
.../rocketmq/mysql/SetColumnParserTest.java | 6 ++----
23 files changed, 54 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/LICENSE-BIN
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/LICENSE-BIN b/rocketmq-mysql/LICENSE-BIN
index 5d47613..0810a15 100644
--- a/rocketmq-mysql/LICENSE-BIN
+++ b/rocketmq-mysql/LICENSE-BIN
@@ -250,7 +250,7 @@ The source code of slf4j can be found at https://github.com/qos-ch/slf4j.
This product has a bundle fastjson, which is available under the ASL2 License.
The source code of fastjson can be found at https://github.com/alibaba/fastjson.
- Copyright 1999-2016 Alibaba Group Holding Ltd.
+ Copyright 1999-2017 Alibaba Group Holding Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -265,6 +265,24 @@ The source code of fastjson can be found at https://github.com/alibaba/fastjson.
limitations under the License.
------
+ This product has a bundle druid, which is available under the ASL2 License.
+ The source code of druid can be found at https://github.com/alibaba/druid.
+
+ Copyright 1999-2017 Alibaba Group Holding Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+------
This product has a bundle commons-codec, which is available under the ASL2 License.
The source code of commons-codec can be found at http://svn.apache.org/viewvc/commons/proper/codec/trunk/.
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/README.md
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/README.md b/rocketmq-mysql/README.md
index 2b8a63e..a2f249b 100644
--- a/rocketmq-mysql/README.md
+++ b/rocketmq-mysql/README.md
@@ -24,7 +24,7 @@ and sends it to RocketMQ in json format. Besides MySQL, other systems can also c
* 2. Create a topic in the RocketMQ to store binlog events to ensure that the downstream system consumes the data in order. Make sure the topic must have only one queue.
* 3. Configure the relevant information of MySQL and RocketMQ in the RocketMQ-MySQL.conf file.
* 4. Execute "mvn install", then start the replicator (via execute "nohup ./start.sh &").
-* 5. Subscribe to and process the messages in your system.
+* 5. Subscribe and process the messages.
## Configuration Instruction
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/pom.xml
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/pom.xml b/rocketmq-mysql/pom.xml
index 8603bdd..f1b050a 100644
--- a/rocketmq-mysql/pom.xml
+++ b/rocketmq-mysql/pom.xml
@@ -89,7 +89,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.39</version>
+ <version>6.0.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -104,7 +104,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
- <version>1.0.29</version>
+ <version>1.0.31</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/Config.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/Config.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/Config.java
index 0705946..ce4c52d 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/Config.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/Config.java
@@ -63,7 +63,7 @@ public class Config {
Class<?>[] pt = method.getParameterTypes();
if (pt != null && pt.length > 0) {
String cn = pt[0].getSimpleName();
- Object arg = null;
+ Object arg;
if (cn.equals("int") || cn.equals("Integer")) {
arg = Integer.parseInt(property);
} else if (cn.equals("long") || cn.equals("Long")) {
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/DataRow.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/DataRow.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/DataRow.java
index 3d9789f..772ffd5 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/DataRow.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/DataRow.java
@@ -28,7 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DataRow {
-
private Logger logger = LoggerFactory.getLogger(DataRow.class);
private String type;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventListener.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventListener.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventListener.java
index ecc632e..cea36a0 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventListener.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventListener.java
@@ -23,7 +23,6 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
public class EventListener implements BinlogEventListener {
-
private BlockingQueue<BinlogEventV4> queue;
public EventListener(BlockingQueue<BinlogEventV4> queue) {
@@ -32,7 +31,6 @@ public class EventListener implements BinlogEventListener {
@Override
public void onEvents(BinlogEventV4 event) {
-
try {
while (true) {
if (queue.offer(event, 100, TimeUnit.MILLISECONDS)) {
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventProcessor.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventProcessor.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventProcessor.java
index f937b6d..515bd64 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventProcessor.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/EventProcessor.java
@@ -49,7 +49,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class EventProcessor {
-
private static final Logger LOGGER = LoggerFactory.getLogger(EventProcessor.class);
private Replicator replicator;
@@ -294,8 +293,7 @@ public class EventProcessor {
}
private void initDataSource() throws Exception {
-
- Map map = new HashMap();
+ Map<String,String> map = new HashMap<>();
map.put("driverClassName", "com.mysql.jdbc.Driver");
map.put("url", "jdbc:mysql://" + config.mysqlAddr + ":" + config.mysqlPort + "?useSSL=true&verifyServerCertificate=false");
map.put("username", config.mysqlUsername);
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/Transaction.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/Transaction.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/Transaction.java
index 16aa06f..9656a04 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/Transaction.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/binlog/Transaction.java
@@ -28,7 +28,6 @@ import org.apache.rocketmq.mysql.position.BinlogPosition;
import org.apache.rocketmq.mysql.schema.Table;
public class Transaction {
-
private BinlogPosition nextBinlogPosition;
private Long xid;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/offset/OffsetLogThread.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/offset/OffsetLogThread.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/offset/OffsetLogThread.java
index 40468af..c7ab4e6 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/offset/OffsetLogThread.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/offset/OffsetLogThread.java
@@ -22,7 +22,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class OffsetLogThread extends Thread {
-
private Logger logger = LoggerFactory.getLogger(OffsetLogThread.class);
private Replicator replicator;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/position/BinlogPositionManager.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/position/BinlogPositionManager.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/position/BinlogPositionManager.java
index 67e8d9e..da4eeae 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/position/BinlogPositionManager.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/position/BinlogPositionManager.java
@@ -33,7 +33,6 @@ import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
import org.apache.rocketmq.mysql.Config;
public class BinlogPositionManager {
-
private DataSource dataSource;
private Config config;
@@ -65,7 +64,6 @@ public class BinlogPositionManager {
}
private void initPositionFromMqTail() throws Exception {
-
DefaultMQPullConsumer consumer = new DefaultMQPullConsumer("BINLOG_CONSUMER_GROUP");
consumer.setNamesrvAddr(config.mqNamesrvAddr);
consumer.setMessageModel(MessageModel.valueOf("BROADCASTING"));
@@ -94,7 +92,6 @@ public class BinlogPositionManager {
}
private void initPositionFromBinlogTail() throws SQLException {
-
String sql = "SHOW MASTER STATUS";
Connection conn = null;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/productor/RocketMQProducer.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/productor/RocketMQProducer.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/productor/RocketMQProducer.java
index fb4eb11..49ca06f 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/productor/RocketMQProducer.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/productor/RocketMQProducer.java
@@ -17,19 +17,15 @@
package org.apache.rocketmq.mysql.productor;
-import java.io.UnsupportedEncodingException;
-import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.client.producer.DefaultMQProducer;
import org.apache.rocketmq.client.producer.SendResult;
import org.apache.rocketmq.common.message.Message;
import org.apache.rocketmq.mysql.Config;
-import org.apache.rocketmq.remoting.exception.RemotingException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RocketMQProducer {
-
private static final Logger LOGGER = LoggerFactory.getLogger(RocketMQProducer.class);
private DefaultMQProducer producer;
@@ -40,15 +36,12 @@ public class RocketMQProducer {
}
public void start() throws MQClientException {
-
producer = new DefaultMQProducer("BINLOG_PRODUCER_GROUP");
producer.setNamesrvAddr(config.mqNamesrvAddr);
producer.start();
}
- public long push(
- String json) throws UnsupportedEncodingException, InterruptedException, RemotingException, MQClientException, MQBrokerException {
-
+ public long push(String json) throws Exception {
LOGGER.debug(json);
Message message = new Message(config.mqTopic, json.getBytes("UTF-8"));
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Database.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Database.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Database.java
index 604cd7f..b8e8321 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Database.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Database.java
@@ -30,9 +30,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Database {
-
private static final Logger LOGGER = LoggerFactory.getLogger(EventProcessor.class);
+ private static final String SQL = "select table_name,column_name,data_type,column_type,character_set_name " +
+ "from information_schema.columns " +
+ "where table_schema = ?";
private String name;
private DataSource dataSource;
@@ -45,11 +47,6 @@ public class Database {
}
public void init() throws SQLException {
-
- String sql = "select table_name,column_name,data_type,column_type,character_set_name " +
- "from information_schema.columns " +
- "where table_schema = ?";
-
Connection conn = null;
PreparedStatement ps = null;
ResultSet rs = null;
@@ -57,7 +54,7 @@ public class Database {
try {
conn = dataSource.getConnection();
- ps = conn.prepareStatement(sql);
+ ps = conn.prepareStatement(SQL);
ps.setString(1, name);
rs = ps.executeQuery();
@@ -79,7 +76,6 @@ public class Database {
}
} finally {
-
if (conn != null) {
conn.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Schema.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Schema.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Schema.java
index a6197a3..2baf2a2 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Schema.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Schema.java
@@ -32,9 +32,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Schema {
-
private static final Logger LOGGER = LoggerFactory.getLogger(EventProcessor.class);
+ private static final String SQL = "select schema_name from information_schema.schemata";
+
private static final List<String> IGNORED_DATABASES = new ArrayList<>(
Arrays.asList(new String[] {"information_schema", "mysql", "performance_schema", "sys"})
);
@@ -51,8 +52,6 @@ public class Schema {
dbMap = new HashMap<>();
- String sql = "select schema_name from information_schema.schemata";
-
Connection conn = null;
PreparedStatement ps = null;
ResultSet rs = null;
@@ -60,7 +59,7 @@ public class Schema {
try {
conn = dataSource.getConnection();
- ps = conn.prepareStatement(sql);
+ ps = conn.prepareStatement(SQL);
rs = ps.executeQuery();
while (rs.next()) {
@@ -112,7 +111,6 @@ public class Schema {
private void reload() {
while (true) {
-
try {
load();
break;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Table.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Table.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Table.java
index 175ec80..54592a9 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Table.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/Table.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.rocketmq.mysql.schema.column.ColumnParser;
public class Table {
-
private String database;
private String name;
private List<String> colList = new LinkedList<String>();
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/ColumnParser.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/ColumnParser.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/ColumnParser.java
index 0a63410..5f2920b 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/ColumnParser.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/ColumnParser.java
@@ -20,9 +20,6 @@ package org.apache.rocketmq.mysql.schema.column;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/**
- *
- */
public abstract class ColumnParser {
public static ColumnParser getColumnParser(String dataType, String colType, String charset) {
@@ -43,7 +40,6 @@ public abstract class ColumnParser {
case "char":
return new StringColumnParser(charset);
case "date":
- return new DateTimeColumnParser();
case "datetime":
case "timestamp":
return new DateTimeColumnParser();
@@ -61,12 +57,11 @@ public abstract class ColumnParser {
}
public static String[] extractEnumValues(String colType) {
-
- String[] enumValues;
+ String[] enumValues = {};
Matcher matcher = Pattern.compile("(enum|set)\\((.*)\\)").matcher(colType);
- matcher.matches();
-
- enumValues = matcher.group(2).replace("'", "").split(",");
+ if (matcher.matches()) {
+ enumValues = matcher.group(2).replace("'", "").split(",");
+ }
return enumValues;
}
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/IntColumnParser.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/IntColumnParser.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/IntColumnParser.java
index 1041436..96cf999 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/IntColumnParser.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/IntColumnParser.java
@@ -52,10 +52,7 @@ public class IntColumnParser extends ColumnParser {
return value;
}
-
-
if (value instanceof Integer) {
-
Integer i = (Integer) value;
if (signed || i > 0) {
return i;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/SetColumnParser.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/SetColumnParser.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/SetColumnParser.java
index 1fbb151..fb28c30 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/SetColumnParser.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/SetColumnParser.java
@@ -27,7 +27,6 @@ public class SetColumnParser extends ColumnParser {
@Override
public Object getValue(Object value) {
-
if (value == null) {
return null;
}
@@ -36,20 +35,20 @@ public class SetColumnParser extends ColumnParser {
return value;
}
- StringBuffer buffer = new StringBuffer();
+ StringBuilder builder = new StringBuilder();
long l = (Long) value;
boolean needSplit = false;
for (int i = 0; i < enumValues.length; i++) {
if (((l >> i) & 1) == 1) {
if (needSplit)
- buffer.append(",");
+ builder.append(",");
- buffer.append(enumValues[i]);
+ builder.append(enumValues[i]);
needSplit = true;
}
}
- return buffer.toString();
+ return builder.toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/StringColumnParser.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/StringColumnParser.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/StringColumnParser.java
index a76e6f1..19068c9 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/StringColumnParser.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/StringColumnParser.java
@@ -17,14 +17,14 @@
package org.apache.rocketmq.mysql.schema.column;
-import java.nio.charset.Charset;
+import org.apache.commons.codec.Charsets;
public class StringColumnParser extends ColumnParser {
private String charset;
public StringColumnParser(String charset) {
- this.charset = charset;
+ this.charset = charset.toLowerCase();
}
@Override
@@ -43,14 +43,14 @@ public class StringColumnParser extends ColumnParser {
switch (charset) {
case "utf8":
case "utf8mb4":
- return new String(bytes, Charset.forName("UTF-8"));
+ return new String(bytes, Charsets.UTF_8);
case "latin1":
case "ascii":
- return new String(bytes, Charset.forName("ISO-8859-1"));
+ return new String(bytes, Charsets.ISO_8859_1);
case "ucs2":
- return new String(bytes, Charset.forName("UTF-16"));
+ return new String(bytes, Charsets.UTF_16);
default:
- return new String(bytes, Charset.forName(charset));
+ return new String(bytes, Charsets.toCharset(charset));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/TimeColumnParser.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/TimeColumnParser.java b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/TimeColumnParser.java
index 113a4e5..384b06e 100644
--- a/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/TimeColumnParser.java
+++ b/rocketmq-mysql/src/main/java/org/apache/rocketmq/mysql/schema/column/TimeColumnParser.java
@@ -31,8 +31,7 @@ public class TimeColumnParser extends ColumnParser {
if (value instanceof Timestamp) {
- Time time = new Time(((Timestamp) value).getTime());
- return time;
+ return new Time(((Timestamp) value).getTime());
}
return value;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/BigIntColumnParserTest.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/BigIntColumnParserTest.java b/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/BigIntColumnParserTest.java
index 8f153f2..ebf0926 100644
--- a/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/BigIntColumnParserTest.java
+++ b/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/BigIntColumnParserTest.java
@@ -27,7 +27,6 @@ public class BigIntColumnParserTest {
@Test
public void testBigInt() {
-
BigIntColumnParser parser = new BigIntColumnParser("bigint(20) unsigned");
BigInteger v1 = (BigInteger) parser.getValue(Long.MIN_VALUE);
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/EnumColumnParserTest.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/EnumColumnParserTest.java b/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/EnumColumnParserTest.java
index c24af54..5c40060 100644
--- a/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/EnumColumnParserTest.java
+++ b/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/EnumColumnParserTest.java
@@ -27,7 +27,6 @@ public class EnumColumnParserTest {
@Test
public void testEnum() {
-
String colType = "enum('a','b','c','d')";
EnumColumnParser parser = new EnumColumnParser(colType);
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/IntColumnParserTest.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/IntColumnParserTest.java b/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/IntColumnParserTest.java
index 33bbc8e..4972947 100644
--- a/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/IntColumnParserTest.java
+++ b/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/IntColumnParserTest.java
@@ -29,27 +29,25 @@ public class IntColumnParserTest {
IntColumnParser parser = new IntColumnParser("int", "int(10) unsigned");
Long v1 = (Long) parser.getValue(Integer.MIN_VALUE);
- Long v2 = Long.valueOf(Integer.MAX_VALUE) + 1;
+ Long v2 = (long) Integer.MAX_VALUE + 1;
assertEquals(v1, v2);
}
@Test
public void testSmallint() {
-
IntColumnParser parser = new IntColumnParser("smallint", "smallint(5) unsigned");
- Long v1 = (Long) parser.getValue(Integer.valueOf(Short.MIN_VALUE));
- Long v2 = Long.valueOf(Short.MAX_VALUE + 1);
+ Long v1 = (Long) parser.getValue((int) Short.MIN_VALUE);
+ Long v2 = (long) (Short.MAX_VALUE + 1);
assertEquals(v1, v2);
}
@Test
public void testTinyint() {
-
IntColumnParser parser = new IntColumnParser("tinyint", "tinyint(3) unsigned");
- Long v1 = (Long) parser.getValue(Integer.valueOf(Byte.MIN_VALUE));
- Long v2 = Long.valueOf(Byte.MAX_VALUE + 1);
+ Long v1 = (Long) parser.getValue((int) Byte.MIN_VALUE);
+ Long v2 = (long) (Byte.MAX_VALUE + 1);
assertEquals(v1, v2);
}
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/934e7bc1/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/SetColumnParserTest.java
----------------------------------------------------------------------
diff --git a/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/SetColumnParserTest.java b/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/SetColumnParserTest.java
index f762364..3fbf4ba 100644
--- a/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/SetColumnParserTest.java
+++ b/rocketmq-mysql/src/test/java/org/apache/rocketmq/mysql/SetColumnParserTest.java
@@ -26,13 +26,11 @@ public class SetColumnParserTest {
@Test
public void testSet() {
-
String colType = "set('a','b','c','d')";
SetColumnParser parser = new SetColumnParser(colType);
- String v = (String)parser.getValue(1001L);
- assertEquals(v , "a,d");
+ String v = (String) parser.getValue(1001L);
+ assertEquals(v, "a,d");
}
-
}