diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java
index e86b4802..bc910d09 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java
@@ -191,9 +191,7 @@ public class DatabaseTableMeta implements TableMetaTSDB {
         try {
             ResultSetPacket packet = connection.query("show databases");
             List<String> schemas = new ArrayList<>();
-            for (String schema : packet.getFieldValues()) {
-                schemas.add(schema);
-            }
+            schemas.addAll(packet.getFieldValues());
 
             for (String schema : schemas) {
                 // filter views
diff --git a/sink/src/main/java/com/alibaba/otter/canal/sink/entry/HeartBeatEntryEventHandler.java b/sink/src/main/java/com/alibaba/otter/canal/sink/entry/HeartBeatEntryEventHandler.java
index e74e3e5e..bd93cc48 100644
--- a/sink/src/main/java/com/alibaba/otter/canal/sink/entry/HeartBeatEntryEventHandler.java
+++ b/sink/src/main/java/com/alibaba/otter/canal/sink/entry/HeartBeatEntryEventHandler.java
@@ -20,6 +20,7 @@ public class HeartBeatEntryEventHandler extends AbstractCanalEventDownStreamHand
         for (Event event : events) {
             if (event.getEntryType() == EntryType.HEARTBEAT) {
                 existHeartBeat = true;
+                break;
             }
         }