lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-23 19:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql : 修复读写负数导致溢出处错误 (#1182)

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

* 注释增加字段类型 _binary_parser 参考 enum_field_types
This commit is contained in:
yxt945
2020-04-23 17:56:35 +08:00
committed by GitHub
parent 949d943c32
commit 87cde31c28
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lualib/skynet/db/mysql.lua
View File

@@ -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,