fix decimal negative number

Author: zhao.zhiqiang

bin/BinLogPack.php

@@ -311,21 +311,46 @@ public function read_length_coded_pascal_string($size)
         return $this->read($length);
     }
 
+    /**
+     * @param $size
+     * @return float|int
+     */
     public function read_int_be_by_size($size) {
         //Read a big endian integer values based on byte number
         if ($size == 1) {
-            return unpack('c', $this->read($size))[1];
-        } elseif( $size == 2)
-            return unpack('n', $this->read($size))[1];
+            $re = unpack('c', $this->read($size))[1];
+            if($re>127) {
+                return $re-pow(2,8);
+            }
+            return $re;
+        } elseif( $size == 2) {
+            $re = unpack('n', $this->read($size))[1];
+            if($re>32767) {
+                return $re-pow(2,16);
+            }
+            return $re;
+        }
         elseif( $size == 3)
             return $this->read_int24_be();
-        elseif( $size == 4)
-            return unpack('N', $this->read($size))[1];
+        elseif( $size == 4){
+            $re = unpack('N', $this->read($size))[1];
+            if($re > 2147483647) {
+                return ($re-pow(2,32));
+            }
+            return $re;
+
+        }
         elseif( $size == 5)
             return $this->read_int40_be();
         //TODO
-        elseif( $size == 8)
-            return unpack('N', $this->read($size))[1];
+        elseif($size == 8) {
+            $re = unpack('N', $this->read($size))[1];
+            return $re;
+            if($re > 2147483647) {
+                return ($re-pow(2,64));
+            }
+            return $re;
+        }
     }
 
     /**

pack/RowEvent.php

@@ -500,28 +500,30 @@ private static function _read_new_decimal($column) {
         self::$PACK->unread(pack('C', $value ^ 0x80));
         $size = $compressed_bytes[$comp_integral];
         if ($size > 0) {
-            $value =  self::$PACK->read_int_be_by_size($size) ^ $mask;
+            $f = self::$PACK->read_int_be_by_size($size);
+            $value = $f  ^ $mask;
             $res .= (string)$value;
         }
 
-
         for($i=0;$i<$uncomp_integral;$i++) {
-            $value = unpack('N', self::$PACK->read(4))[1] ^ $mask;
+            $value = self::$PACK->read_int_be_by_size(4) ^ $mask;
             $res .= sprintf('%09d' , $value);
         }
 
+
         $res .= ".";
         for($i=0;$i<$uncomp_fractional;$i++) {
-            $value = unpack('N', self::$PACK->read(4))[1] ^ $mask;
+            $value = self::$PACK->read_int_be_by_size(4) ^ $mask;
             $res .= sprintf('%09d' , $value);
         }
 
         $size = $compressed_bytes[$comp_fractional];
         if ($size > 0) {
-            $value = self::$PACK->read_int_be_by_size($size) ^ $mask;
-
+            $f = self::$PACK->read_int_be_by_size($size);
+            $value = $f  ^ $mask;
             $res.=sprintf('%0'.$comp_fractional.'d' , $value);
         }
+        //todo 超过int范围无法解析此函数 ex:11111111111199876665554567.001
         return number_format($res,$comp_fractional,'.','');
     }
 
@@ -531,7 +533,7 @@ private static function _getUpdateRows($result, $len) {
         $rows = [];
         while(!self::$PACK->isComplete(self::$PACK_SIZE)) {
 
-            $value['beform'] = self::_read_column_data($result['bitmap1'], $len);
+            $value['before'] = self::_read_column_data($result['bitmap1'], $len);
             $value['after'] = self::_read_column_data($result['bitmap2'], $len);
             $rows[] = $value['after'];
         }