From 91b036a4fcc135d5727993fb5b18f4779af695ae Mon Sep 17 00:00:00 2001
From: DinoZhang <victordinozhang@gmail.com>
Date: Tue, 27 Nov 2018 17:34:08 +0800
Subject: [PATCH 1/2] fix   Datasource named ${DS_PROMETHEUS} was not found

---
 deployer/src/main/resources/metrics/Canal_instances_tmpl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployer/src/main/resources/metrics/Canal_instances_tmpl.json b/deployer/src/main/resources/metrics/Canal_instances_tmpl.json
index 141810c0..89fd3329 100644
--- a/deployer/src/main/resources/metrics/Canal_instances_tmpl.json
+++ b/deployer/src/main/resources/metrics/Canal_instances_tmpl.json
@@ -826,7 +826,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "$datasource",
       "description": "client 请求的GET与ACK包的QPS。",
       "fill": 1,
       "gridPos": {

From 46b65282735bcb52360ab5f381657a707a49c97e Mon Sep 17 00:00:00 2001
From: agapple <jianghang115@gmail.com>
Date: Tue, 27 Nov 2018 19:33:25 +0800
Subject: [PATCH 2/2] fixed tablemeta check

---
 docker/build.sh                                          | 9 ++-------
 docker/run.sh                                            | 2 +-
 .../parse/inbound/mysql/tsdb/DatabaseTableMeta.java      | 7 ++++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/docker/build.sh b/docker/build.sh
index 6b42e3a4..4d838620 100644
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -19,11 +19,6 @@ if [ "$1" == "base" ] ; then
 else 
     rm -rf $BASE/canal.*.tar.gz ; 
     cd $BASE/../ && mvn clean package -Dmaven.test.skip -Denv=release && cd $current_path ;
-    if [ "$1" == "kafka" ] ; then
-	   cp $BASE/../target/canal-kafka-*.tar.gz $BASE/
-	   docker build --no-cache -t canal/canal-server $BASE/
-    else 
-	   cp $BASE/../target/canal.deployer-*.tar.gz $BASE/
-	   docker build --no-cache -t canal/canal-server $BASE/
-    fi
+    cp $BASE/../target/canal.deployer-*.tar.gz $BASE/
+    docker build --no-cache -t canal/canal-server $BASE/
 fi
diff --git a/docker/run.sh b/docker/run.sh
index 28f32411..7dbdb682 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -87,6 +87,6 @@ done
 
 MEMORY="-m 4096m"
 LOCALHOST=`getMyIp`
-cmd="docker run -it -h $LOCALHOST $CONFIG --name=canal-server $VOLUMNS $NET_MODE $PORTS $MEMORY canal/canal-server"
+cmd="docker run -d -it -h $LOCALHOST $CONFIG --name=canal-server $VOLUMNS $NET_MODE $PORTS $MEMORY canal/canal-server"
 echo $cmd
 eval $cmd
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 033dcae5..953cca5d 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
@@ -529,9 +529,10 @@ public class DatabaseTableMeta implements TableMetaTSDB {
                 return false;
             }
 
-            if (!StringUtils.equalsIgnoreCase(sourceField.getDefaultValue(), targetField.getDefaultValue())) {
-                return false;
-            }
+            // if (!StringUtils.equalsIgnoreCase(sourceField.getDefaultValue(),
+            // targetField.getDefaultValue())) {
+            // return false;
+            // }
 
             if (sourceField.isNullable() != targetField.isNullable()) {
                 return false;