mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 18:49:14 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Fixed TINYBLOB errors with specific inputs

Browse Source
This commit is contained in:
Daylon Wilkins
2021-04-13 05:53:31 -07:00
committed by Daylon Wilkins
parent 2c48987908
commit 75e69ee5e7
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
go/store/types/tuple.go
View File

@@ -739,6 +739,24 @@ func (t Tuple) TupleLess(nbf *NomsBinFormat, otherTuple Tuple) (bool, error) {
return tm.Before(otherTm), nil
}
case BlobKind:
// readValue expects the Kind to still be there, so we put it back by decrementing the offset
dec.offset--
otherDec.offset--
v, err := dec.readValue(nbf)
if err != nil {
return false, err
}
otherV, err := otherDec.readValue(nbf)
if err != nil {
return false, err
}
if v.Equals(otherV) {
continue
} else {
return v.Less(nbf, otherV)
}
default:
v, err := dec.readValue(nbf)

21
integration-tests/bats/regression-tests.bats
View File

@@ -54,6 +54,27 @@ SELECT DISTINCT YM.YW AS YW, (SELECT YW FROM YF WHERE YF.XB = YM.XB) AS YF_YW,
[[ "${#lines[@]}" = "2" ]] || false
}
@test "regression-tests: TINYBLOB skipping BlobKind for some values" {
# caught by fuzzer
dolt sql <<SQL
CREATE TABLE ClgialBovK (
CIQgW0 TINYBLOB,
Hg6qI0 DECIMAL(19,12),
UJ46Q1 VARCHAR(2) COLLATE utf8mb4_0900_ai_ci,
YEGomx TINYINT,
PRIMARY KEY (CIQgW0, Hg6qI0)
);
REPLACE INTO ClgialBovK VALUES ("WN4*Zx.NI4a|MLLwRc:A9|rsl%3:r_gxLb-YY3c*OaTyuL=-ui!PBRhF0ymVW6!Uey*5DNM9O-Qo=0@#nkK","9993429.437834949734","",-104);
REPLACE INTO ClgialBovK VALUES ("z$=kjmZtGlCbJ:=o9vRCZe70a:1o6tMrV% 2np! CK@NytnPE9BU03iu1@f@Uch=CwB$3|8RLXfnnKh.+H:9oy6X1*IyU_jP|ji4KuG .DOsiO.hk~lBlm5hBxeBQXe-NzNmj=%2c!:V7%asxX!A6Kg@l+Uxd9^9t3a^NUsr3GD5xc=hqyb*QbZk||frmQ+_:","3475975.285903026799","",-9);
SQL
run dolt sql -q "SELECT * FROM ClgialBovK;" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "CIQgW0,Hg6qI0,UJ46Q1,YEGomx" ]] || false
[[ "$output" =~ 'WN4*Zx.NI4a|MLLwRc:A9|rsl%3:r_gxLb-YY3c*OaTyuL=-ui!PBRhF0ymVW6!Uey*5DNM9O-Qo=0@#nkK,9993429.437834949734,"",-104' ]] || false
[[ "$output" =~ 'z$=kjmZtGlCbJ:=o9vRCZe70a:1o6tMrV% 2np! CK@NytnPE9BU03iu1@f@Uch=CwB|8RLXfnnKh.+H:9oy6X1*IyU_jP|ji4KuG .DOsiO.hk~lBlm5hBxeBQXe-NzNmj=%2c!:V7%asxX!A6Kg@l+Uxd9^9t3a^NUsr3GD5xc=hqyb*QbZk||frmQ+_:,3475975.285903026799,"",-9' ]] || false
[[ "${#lines[@]}" = "3" ]] || false
}
@test "regression-tests: VARBINARY incorrect length reading" {
# caught by fuzzer
dolt sql <<SQL