Skip to content

Commit 7a0dd9d

Browse files
committed
fix: LIKE string comparisons now match DF main, based upon changes brought in with DF main's arrow-rs upgrade to 53.3.0 on Nov 20th: apache@a2811fc
1 parent 3bdfa90 commit 7a0dd9d

File tree

1 file changed

+51
-45
lines changed

1 file changed

+51
-45
lines changed

datafusion/sqllogictest/test_files/string/string_literal.slt

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,9 @@ SELECT
890890
----
891891
false false false false false
892892

893+
# on our DF patched branch, we are getting the latest correct behavior
894+
# which only occurred on DF main with the upgrade to arrow 53.3.0
895+
# refer to <https://github.com/apache/datafusion/blame/9f530dd1987d863dd4de99198df5b2c3e242bf6e/datafusion/sqllogictest/test_files/string/string_literal.slt#L924>
893896
# escape before non-wildcard matches the escape itself
894897
query BBBBBBB
895898
SELECT
@@ -901,7 +904,7 @@ SELECT
901904
'\' LIKE '\\',
902905
'\\' LIKE '\\'
903906
----
904-
false true false true false false true
907+
true false false true false true false
905908

906909
# if "%%" in the pattern was simplified to "%", the pattern semantics would change
907910
query BBBBB
@@ -931,6 +934,9 @@ SELECT a, a LIKE '\%%' FROM inputs
931934
statement ok
932935
drop table inputs;
933936

937+
# on our DF patched branch, we are getting the latest correct behavior
938+
# which only occurred on DF main with the upgrade to arrow 53.3.0
939+
# refer to <https://github.com/apache/datafusion/commit/a2811fc85d469c879e3d4db6ceb3fa13fbf263be>
934940
# constant folding and expression simplification cannot kick in
935941
query TTB
936942
WITH data(a) AS (VALUES
@@ -1002,18 +1008,18 @@ NULL \%abc NULL
10021008
\ NULL NULL
10031009
\ (empty) false
10041010
\ \ true
1005-
\ \\ false
1011+
\ \\ true
10061012
\ \\\ false
10071013
\ \\\\ false
10081014
\ a false
10091015
\ \a false
10101016
\ \\a false
10111017
\ % true
10121018
\ \% false
1013-
\ \\% false
1019+
\ \\% true
10141020
\ %% true
10151021
\ \%% false
1016-
\ \\%% false
1022+
\ \\%% true
10171023
\ _ true
10181024
\ \_ false
10191025
\ \\_ false
@@ -1028,21 +1034,21 @@ NULL \%abc NULL
10281034
\\ NULL NULL
10291035
\\ (empty) false
10301036
\\ \ false
1031-
\\ \\ true
1032-
\\ \\\ false
1033-
\\ \\\\ false
1037+
\\ \\ false
1038+
\\ \\\ true
1039+
\\ \\\\ true
10341040
\\ a false
10351041
\\ \a false
10361042
\\ \\a false
10371043
\\ % true
10381044
\\ \% false
1039-
\\ \\% false
1045+
\\ \\% true
10401046
\\ %% true
10411047
\\ \%% false
1042-
\\ \\%% false
1048+
\\ \\%% true
10431049
\\ _ false
10441050
\\ \_ false
1045-
\\ \\_ false
1051+
\\ \\_ true
10461052
\\ __ true
10471053
\\ \__ false
10481054
\\ \\__ false
@@ -1055,23 +1061,23 @@ NULL \%abc NULL
10551061
\\\ (empty) false
10561062
\\\ \ false
10571063
\\\ \\ false
1058-
\\\ \\\ true
1064+
\\\ \\\ false
10591065
\\\ \\\\ false
10601066
\\\ a false
10611067
\\\ \a false
10621068
\\\ \\a false
10631069
\\\ % true
10641070
\\\ \% false
1065-
\\\ \\% false
1071+
\\\ \\% true
10661072
\\\ %% true
10671073
\\\ \%% false
1068-
\\\ \\%% false
1074+
\\\ \\%% true
10691075
\\\ _ false
10701076
\\\ \_ false
10711077
\\\ \\_ false
10721078
\\\ __ false
10731079
\\\ \__ false
1074-
\\\ \\__ false
1080+
\\\ \\__ true
10751081
\\\ abc false
10761082
\\\ a_c false
10771083
\\\ a\_c false
@@ -1082,16 +1088,16 @@ NULL \%abc NULL
10821088
\\\\ \ false
10831089
\\\\ \\ false
10841090
\\\\ \\\ false
1085-
\\\\ \\\\ true
1091+
\\\\ \\\\ false
10861092
\\\\ a false
10871093
\\\\ \a false
10881094
\\\\ \\a false
10891095
\\\\ % true
10901096
\\\\ \% false
1091-
\\\\ \\% false
1097+
\\\\ \\% true
10921098
\\\\ %% true
10931099
\\\\ \%% false
1094-
\\\\ \\%% false
1100+
\\\\ \\%% true
10951101
\\\\ _ false
10961102
\\\\ \_ false
10971103
\\\\ \\_ false
@@ -1110,7 +1116,7 @@ a \\ false
11101116
a \\\ false
11111117
a \\\\ false
11121118
a a true
1113-
a \a false
1119+
a \a true
11141120
a \\a false
11151121
a % true
11161122
a \% false
@@ -1136,17 +1142,17 @@ a \%abc false
11361142
\a \\\ false
11371143
\a \\\\ false
11381144
\a a false
1139-
\a \a true
1140-
\a \\a false
1145+
\a \a false
1146+
\a \\a true
11411147
\a % true
11421148
\a \% false
1143-
\a \\% false
1149+
\a \\% true
11441150
\a %% true
11451151
\a \%% false
1146-
\a \\%% false
1152+
\a \\%% true
11471153
\a _ false
11481154
\a \_ false
1149-
\a \\_ false
1155+
\a \\_ true
11501156
\a __ true
11511157
\a \__ false
11521158
\a \\__ false
@@ -1163,19 +1169,19 @@ a \%abc false
11631169
\\a \\\\ false
11641170
\\a a false
11651171
\\a \a false
1166-
\\a \\a true
1172+
\\a \\a false
11671173
\\a % true
11681174
\\a \% false
1169-
\\a \\% false
1175+
\\a \\% true
11701176
\\a %% true
11711177
\\a \%% false
1172-
\\a \\%% false
1178+
\\a \\%% true
11731179
\\a _ false
11741180
\\a \_ false
11751181
\\a \\_ false
11761182
\\a __ false
11771183
\\a \__ false
1178-
\\a \\__ false
1184+
\\a \\__ true
11791185
\\a abc false
11801186
\\a a_c false
11811187
\\a a\_c false
@@ -1224,7 +1230,7 @@ a \%abc false
12241230
\% \\%% true
12251231
\% _ false
12261232
\% \_ false
1227-
\% \\_ false
1233+
\% \\_ true
12281234
\% __ true
12291235
\% \__ false
12301236
\% \\__ false
@@ -1244,16 +1250,16 @@ a \%abc false
12441250
\\% \\a false
12451251
\\% % true
12461252
\\% \% false
1247-
\\% \\% false
1253+
\\% \\% true
12481254
\\% %% true
12491255
\\% \%% false
1250-
\\% \\%% false
1256+
\\% \\%% true
12511257
\\% _ false
12521258
\\% \_ false
12531259
\\% \\_ false
12541260
\\% __ false
12551261
\\% \__ false
1256-
\\% \\__ false
1262+
\\% \\__ true
12571263
\\% abc false
12581264
\\% a_c false
12591265
\\% a\_c false
@@ -1296,7 +1302,7 @@ a \%abc false
12961302
\%% \\a false
12971303
\%% % true
12981304
\%% \% false
1299-
\%% \\% false
1305+
\%% \\% true
13001306
\%% %% true
13011307
\%% \%% false
13021308
\%% \\%% true
@@ -1305,7 +1311,7 @@ a \%abc false
13051311
\%% \\_ false
13061312
\%% __ false
13071313
\%% \__ false
1308-
\%% \\__ false
1314+
\%% \\__ true
13091315
\%% abc false
13101316
\%% a_c false
13111317
\%% a\_c false
@@ -1322,10 +1328,10 @@ a \%abc false
13221328
\\%% \\a false
13231329
\\%% % true
13241330
\\%% \% false
1325-
\\%% \\% false
1331+
\\%% \\% true
13261332
\\%% %% true
13271333
\\%% \%% false
1328-
\\%% \\%% false
1334+
\\%% \\%% true
13291335
\\%% _ false
13301336
\\%% \_ false
13311337
\\%% \\_ false
@@ -1374,10 +1380,10 @@ _ \%abc false
13741380
\_ \\a false
13751381
\_ % true
13761382
\_ \% false
1377-
\_ \\% false
1383+
\_ \\% true
13781384
\_ %% true
13791385
\_ \%% false
1380-
\_ \\%% false
1386+
\_ \\%% true
13811387
\_ _ false
13821388
\_ \_ false
13831389
\_ \\_ true
@@ -1400,16 +1406,16 @@ _ \%abc false
14001406
\\_ \\a false
14011407
\\_ % true
14021408
\\_ \% false
1403-
\\_ \\% false
1409+
\\_ \\% true
14041410
\\_ %% true
14051411
\\_ \%% false
1406-
\\_ \\%% false
1412+
\\_ \\%% true
14071413
\\_ _ false
14081414
\\_ \_ false
14091415
\\_ \\_ false
14101416
\\_ __ false
14111417
\\_ \__ false
1412-
\\_ \\__ false
1418+
\\_ \\__ true
14131419
\\_ abc false
14141420
\\_ a_c false
14151421
\\_ a\_c false
@@ -1452,10 +1458,10 @@ __ \%abc false
14521458
\__ \\a false
14531459
\__ % true
14541460
\__ \% false
1455-
\__ \\% false
1461+
\__ \\% true
14561462
\__ %% true
14571463
\__ \%% false
1458-
\__ \\%% false
1464+
\__ \\%% true
14591465
\__ _ false
14601466
\__ \_ false
14611467
\__ \\_ false
@@ -1478,10 +1484,10 @@ __ \%abc false
14781484
\\__ \\a false
14791485
\\__ % true
14801486
\\__ \% false
1481-
\\__ \\% false
1487+
\\__ \\% true
14821488
\\__ %% true
14831489
\\__ \%% false
1484-
\\__ \\%% false
1490+
\\__ \\%% true
14851491
\\__ _ false
14861492
\\__ \_ false
14871493
\\__ \\_ false
@@ -1608,7 +1614,7 @@ a\_c \%abc false
16081614
\%abc \\a false
16091615
\%abc % true
16101616
\%abc \% false
1611-
\%abc \\% false
1617+
\%abc \\% true
16121618
\%abc %% true
16131619
\%abc \%% false
16141620
\%abc \\%% true

0 commit comments

Comments
 (0)