Merge pull request #25 from alibaba/master

merge

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": {

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

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

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;