Changeset: c3dca2c13397 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c3dca2c13397 Modified Files: .hgtags Branch: default Log Message:
merged with jun2023 diffs (164 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -806,3 +806,4 @@ 8b736d6dcfd63d0560c99fc5427b504c116b74b0 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_SP3_release aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1 79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_3 +79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_release diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c --- a/gdk/gdk_strimps.c +++ b/gdk/gdk_strimps.c @@ -212,6 +212,10 @@ STRMPmakebitstring(const char *s, Strimp pi.pos = 0; pi.lim = strlen(s); + if (pi.lim < 2) { + return ret; + } + while(pair_at(&pi, &cp)) { pair_idx = STRMPpairLookup(r, &cp); if (pair_idx >= 0) @@ -324,6 +328,9 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai pi.s = cs; pi.pos = 0; pi.lim = strlen(pi.s); + if (pi.lim < 2) { + continue; + } while (pair_at(pip, cpp)) { if(ignored(cpp, 1)) { /* Skip this AND the next pair diff --git a/sql/test/strimps/Tests/All b/sql/test/strimps/Tests/All --- a/sql/test/strimps/Tests/All +++ b/sql/test/strimps/Tests/All @@ -2,3 +2,4 @@ strimps_stable_counts strimps_stable_counts2 persisted_strimp strimps_not_like +small_string_crash diff --git a/sql/test/strimps/Tests/small_string_crash.test b/sql/test/strimps/Tests/small_string_crash.test new file mode 100644 --- /dev/null +++ b/sql/test/strimps/Tests/small_string_crash.test @@ -0,0 +1,119 @@ +statement ok +CREATE TABLE fal(x STRING) + +statement ok +COPY 100 RECORDS INTO fal FROM STDIN USING DELIMITERS ',','\n','"' +<COPY_INTO_DATA> +Mary Garcia +James Ballard +Alexandria Harris +Dakota Howell +Tracy Glover +Mark Cook +James Woodard +Sophia Stone +Jeffrey Ramirez +Ryan Knight +Taylor Lane +Christopher Russell +Daniel Sims +Tony Watts +Dwayne Johnson +Jason Dunlap +Abigail Burton +Maria Lewis +Ashley Taylor +Emma Abbott +James Whitney +Philip Maldonado +Rachel Taylor +Tina Singleton +Ricky Johnson +Anthony Peterson +Eugene Mata +Tyler Terry +Thomas Morales +Kathy Moore +William Franco +Christopher Williams +David Carter +Andrew Alvarado +John Jenkins +Anthony Charles +Jose Tran +Amy Stafford +Vincent Malone +Ashley Waters +Cindy Huffman +Anthony Hernandez +Brett Hardy +Lisa Matthews +Jeffrey Ingram +Jessica Miller +Karen Jones +Terry Sanders +Aaron Rodriguez +Kyle Ortega +David Clark +Brent Garrett +Scott Young +Shannon Edwards +Tiffany Macias +Ricky Gonzalez +Devin Logan +Russell Walker +Michael Nguyen +Heather Robinson +April Lawrence +Christopher Williams +Laura Gonzalez +Patrick Ortiz +Sylvia Phillips +Cynthia Kemp +Stephanie Gillespie +Elizabeth Joseph +Jay Collins +Johnny Gibson +Dr. Audrey Sellers MD +Desiree Li +Heather Brown +Shelly Bauer +Donna Anderson +Amy Sharp +Olivia Howell +Margaret Tran +Alexandra Jarvis +Glen Ray +Michael Mendoza +Sarah Hall +Dennis Moss +Wanda Brooks +Debra Powers +Shannon Nguyen +Daisy Mcdonald +Donna Rivera +Samuel Jackson +Wendy Howe +Connor Howell +Jeffrey Newman +Daniel Sullivan +Megan Dunn +Laura Holland +Brendan Bates +Mary Miller +Thomas Ramirez +a +"" + + +statement ok +ALTER TABLE fal SET READ ONLY + +statement ok +CREATE IMPRINTS INDEX fal_index ON fal(x) + +query T +SELECT * FROM fal WHERE x LIKE 'Daniel%' +---- +Daniel Sims +Daniel Sullivan _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org