From 87cde31c28c16b622c3a66ed086b95476a89b480 Mon Sep 17 00:00:00 2001
From: yxt945 <yxt945@hotmail.com>
Date: Thu, 23 Apr 2020 17:56:35 +0800
Subject: [PATCH] =?UTF-8?q?mysql=20:=20=E4=BF=AE=E5=A4=8D=E8=AF=BB?=
 =?UTF-8?q?=E5=86=99=E8=B4=9F=E6=95=B0=E5=AF=BC=E8=87=B4=E6=BA=A2=E5=87=BA?=
 =?UTF-8?q?=E5=A4=84=E9=94=99=E8=AF=AF=20(#1182)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* mysql : 修复读写负数导致益处错误

* 注释增加字段类型 _binary_parser 参考 enum_field_types
---
 lualib/skynet/db/mysql.lua | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/lualib/skynet/db/mysql.lua b/lualib/skynet/db/mysql.lua
index 6ac2797d..fc8ffcfd 100644
--- a/lualib/skynet/db/mysql.lua
+++ b/lualib/skynet/db/mysql.lua
@@ -100,10 +100,18 @@ local function _get_byte1(data, i)
     return strbyte(data, i), i + 1
 end
 
+local function _get_int1(data, i)
+    return strunpack("<i1", data, i)
+end
+
 local function _get_byte2(data, i)
     return strunpack("<I2", data, i)
 end
 
+local function _get_int2(data, i)
+    return strunpack("<i2", data, i)
+end
+
 local function _get_byte3(data, i)
     return strunpack("<I3", data, i)
 end
@@ -112,10 +120,18 @@ local function _get_byte4(data, i)
     return strunpack("<I4", data, i)
 end
 
+local function _get_int4(data, i)
+    return strunpack("<i4", data, i)
+end
+
 local function _get_byte8(data, i)
     return strunpack("<I8", data, i)
 end
 
+local function _get_int8(data, i)
+    return strunpack("<i8", data, i)
+end
+
 local function _get_float(data, i)
     return strunpack("<f", data, i)
 end
@@ -140,6 +156,10 @@ local function _set_byte8(n)
     return strpack("<I8", n)
 end
 
+local function _set_int8(n)
+    return strpack("<i8", n)
+end
+
 local function _set_float(n)
     return strpack("<f", n)
 end
@@ -500,7 +520,7 @@ local store_types = {
         if not tointeger(v) then
             return _set_byte2(0x05), _set_double(v)
         else
-            return _set_byte2(0x08), _set_byte8(v)
+            return _set_byte2(0x08), _set_int8(v)
         end
     end,
     string = function(v)
@@ -783,14 +803,15 @@ local function _get_datetime(data, pos)
     return value, pos
 end
 
+-- 字段类型参考 https://dev.mysql.com/doc/dev/mysql-server/8.0.12/binary__log__types_8h.html enum_field_types 枚举类型定义
 local _binary_parser = {
-    [0x01] = _get_byte1,
-    [0x02] = _get_byte2,
-    [0x03] = _get_byte4,
+    [0x01] = _get_int1,
+    [0x02] = _get_int2,
+    [0x03] = _get_int4,
     [0x04] = _get_float,
     [0x05] = _get_double,
     [0x07] = _get_datetime,
-    [0x08] = _get_byte8,
+    [0x08] = _get_int8,
     [0x0c] = _get_datetime,
     [0x0f] = _from_length_coded_str,
     [0x10] = _from_length_coded_str,