Merge pull request #1385 from magicdoom/1.6

binlog value null and change to 1.6.5 beta
MyCATApache · Feb 26, 2017 · 2bb57bb · 2bb57bb
2 parents de2d150 + 1019d0c
commit 2bb57bb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mycat</groupId>
 	<artifactId>Mycat-server</artifactId>
-	<version>1.6.5-DEV</version>
+	<version>1.6.5-BETA</version>
 	<packaging>jar</packaging>
 	<name>Mycat-server</name>
 	<description>The project of Mycat-server</description>

diff --git a/src/main/java/io/mycat/migrate/BinlogStream.java b/src/main/java/io/mycat/migrate/BinlogStream.java
@@ -487,12 +487,18 @@ private void handleUpdateRowsEvent(Event event) {
                     int column=includedColumnsBeforeUpdate.nextSetBit(i);
                     Map<String, Object> coumnMap=   xxx.get(column+1);
                     sb.append(coumnMap.get("COLUMN_NAME"));
-                    sb.append("=");
-                    String dataType= (String) coumnMap.get("DATA_TYPE");
-                    sb.append(convertBinlogValue(key[i],dataType));
+                    Serializable value1 = key[i];
+                    if(value1==null){
+                        sb.append(" is null");
+                    } else {
+                        sb.append("=");
+                        String dataType = (String) coumnMap.get("DATA_TYPE");
+
+                        sb.append(convertBinlogValue(value1, dataType));
+                    }
                     String columnName= (String) coumnMap.get("COLUMN_NAME");
                     if("_slot".equalsIgnoreCase(columnName)){
-                        slot= key[i] instanceof  BigInteger?((BigInteger) key[i]).intValue():((Integer) key[i]);
+                        slot= value1 instanceof  BigInteger?((BigInteger) value1).intValue():((Integer) value1);
                     }
                     if(i!=size-1){
                         sb.append(" and ");
@@ -528,12 +534,18 @@ private void handleDeleteRowsEvent(Event event) {
                     int column=inculudeColumn.nextSetBit(i);
                     Map<String, Object> coumnMap=   xxx.get(column+1);
                     sb.append(coumnMap.get("COLUMN_NAME"));
-                    sb.append("=");
-                    String dataType= (String) coumnMap.get("DATA_TYPE");
-                    sb.append(convertBinlogValue(value[i],dataType));
+                    Serializable value1 = value[i];
+                    if(value1==null){
+                        sb.append(" is null");
+                    }     else {
+                        sb.append("=");
+                        String dataType = (String) coumnMap.get("DATA_TYPE");
+
+                        sb.append(convertBinlogValue(value1, dataType));
+                    }
                     String columnName= (String) coumnMap.get("COLUMN_NAME");
                     if("_slot".equalsIgnoreCase(columnName)){
-                        slot= value[i] instanceof  BigInteger?((BigInteger) value[i]).intValue():((Integer) value[i]);
+                        slot= value1 instanceof  BigInteger?((BigInteger) value1).intValue():((Integer) value1);
                     }
                     if(i!=size-1){
                         sb.append(" and ");