MonetDB: sw_ew_c_sorting - COLnew needs to be called with the sa...
Changeset: df9bda849f4b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/df9bda849f4b
Modified Files:
monetdb5/modules/atoms/str.c
Branch: sw_ew_c_sorting
Log Message:
COLnew needs to be called with the same size
diffs (12 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -6158,7 +6158,7 @@ STRjoin(bat *rl_id, bat *rr_id, const ba
rl = COLnew(0, TYPE_oid, BATcount(l), TRANSIENT);
if (rr_id)
- rr = COLnew(0, TYPE_oid, BATcount(r), TRANSIENT);
+ rr = COLnew(0, TYPE_oid, BATcount(l), TRANSIENT);
if (!rl || (rr_id && !rr)) {
BBPnreclaim(6, l, r, cl, cr, rl, rr);
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: ascii-flag - Merge with default branch.
Changeset: b35d66612032 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b35d66612032
Branch: ascii-flag
Log Message:
Merge with default branch.
diffs (truncated from 2731 to 300 lines):
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -43,7 +43,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
-uses: actions/checkout@v3
+uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
@@ -129,7 +129,7 @@ jobs:
- name: Tar files
run: tar -cvf mtests.tar mTests
- name: Publish mtest results
-uses: actions/upload-artifact@v3
+uses: actions/upload-artifact@v4
with:
name: mtest-${{ github.sha }}-${{ matrix.os }}-${{ matrix.c_compiler
}}
path: mtests.tar
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -50440,7 +50440,12 @@ SQLwindow_bound;
computes window ranges for each row
sqlcatalog
alter_add_range_partition
-pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int):void
+pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int, X_8:bat[:lng]):void
+SQLalter_add_range_partition;
+Catalog operation alter_add_range_partition
+sqlcatalog
+alter_add_range_partition
+pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int, X_8:lng):void
SQLalter_add_range_partition;
Catalog operation alter_add_range_partition
sqlcatalog
@@ -50450,12 +50455,22 @@ SQLalter_add_table;
Catalog operation alter_add_table
sqlcatalog
alter_add_value_partition
-pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int):void
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:bat[:lng]):void
SQLalter_add_value_partition;
Catalog operation alter_add_value_partition
sqlcatalog
alter_add_value_partition
-pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:any...):void
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:bat[:lng], X_7:any...):void
+SQLalter_add_value_partition;
+Catalog operation alter_add_value_partition
+sqlcatalog
+alter_add_value_partition
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:lng):void
+SQLalter_add_value_partition;
+Catalog operation alter_add_value_partition
+sqlcatalog
+alter_add_value_partition
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:lng, X_7:any...):void
SQLalter_add_value_partition;
Catalog operation alter_add_value_partition
sqlcatalog
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -38765,7 +38765,12 @@ SQLwindow_bound;
computes window ranges for each row
sqlcatalog
alter_add_range_partition
-pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int):void
+pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int, X_8:bat[:lng]):void
+SQLalter_add_range_partition;
+Catalog operation alter_add_range_partition
+sqlcatalog
+alter_add_range_partition
+pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int, X_8:lng):void
SQLalter_add_range_partition;
Catalog operation alter_add_range_partition
sqlcatalog
@@ -38775,12 +38780,22 @@ SQLalter_add_table;
Catalog operation alter_add_table
sqlcatalog
alter_add_value_partition
-pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int):void
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:bat[:lng]):void
SQLalter_add_value_partition;
Catalog operation alter_add_value_partition
sqlcatalog
alter_add_value_partition
-pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:any...):void
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:bat[:lng], X_7:any...):void
+SQLalter_add_value_partition;
+Catalog operation alter_add_value_partition
+sqlcatalog
+alter_add_value_partition
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str,
X_3:str, X_4:bit, X_5:int, X_6:lng):void
+SQLalter_add_value_partition;
+Catalog operation alter_add_value_partition
MonetDB: default - Merge with Dec2023 branch.
Changeset: 20f8777d533f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/20f8777d533f
Modified Files:
monetdb5/modules/atoms/str.c
sql/server/sql_scan.c
sql/test/BugTracker-2024/Tests/All
sql/test/copy/Tests/nonutf8.test
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (242 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -985,6 +985,7 @@ const struct UTF8_lower_upper {
{0x2C5C, 0x2C2C,},
{0x2C5D, 0x2C2D,},
{0x2C5E, 0x2C2E,},
+ {0x2C5F, 0x2C2F,},
{0x2C61, 0x2C60,},
{0x2C65, 0x023A,},
{0x2C66, 0x023E,},
@@ -1188,9 +1189,13 @@ const struct UTF8_lower_upper {
{0xA7BB, 0xA7BA,},
{0xA7BD, 0xA7BC,},
{0xA7BF, 0xA7BE,},
+ {0xA7C1, 0xA7C0,},
{0xA7C3, 0xA7C2,},
{0xA7C8, 0xA7C7,},
{0xA7CA, 0xA7C9,},
+ {0xA7D1, 0xA7D0,},
+ {0xA7D7, 0xA7D6,},
+ {0xA7D9, 0xA7D8,},
{0xA7F6, 0xA7F5,},
{0xAB53, 0xA7B3,},
{0xAB70, 0x13A0,},
@@ -1375,6 +1380,41 @@ const struct UTF8_lower_upper {
{0x104F9, 0x104D1,},
{0x104FA, 0x104D2,},
{0x104FB, 0x104D3,},
+ {0x10597, 0x10570,},
+ {0x10598, 0x10571,},
+ {0x10599, 0x10572,},
+ {0x1059A, 0x10573,},
+ {0x1059B, 0x10574,},
+ {0x1059C, 0x10575,},
+ {0x1059D, 0x10576,},
+ {0x1059E, 0x10577,},
+ {0x1059F, 0x10578,},
+ {0x105A0, 0x10579,},
+ {0x105A1, 0x1057A,},
+ {0x105A3, 0x1057C,},
+ {0x105A4, 0x1057D,},
+ {0x105A5, 0x1057E,},
+ {0x105A6, 0x1057F,},
+ {0x105A7, 0x10580,},
+ {0x105A8, 0x10581,},
+ {0x105A9, 0x10582,},
+ {0x105AA, 0x10583,},
+ {0x105AB, 0x10584,},
+ {0x105AC, 0x10585,},
+ {0x105AD, 0x10586,},
+ {0x105AE, 0x10587,},
+ {0x105AF, 0x10588,},
+ {0x105B0, 0x10589,},
+ {0x105B1, 0x1058A,},
+ {0x105B3, 0x1058C,},
+ {0x105B4, 0x1058D,},
+ {0x105B5, 0x1058E,},
+ {0x105B6, 0x1058F,},
+ {0x105B7, 0x10590,},
+ {0x105B8, 0x10591,},
+ {0x105B9, 0x10592,},
+ {0x105BB, 0x10594,},
+ {0x105BC, 0x10595,},
{0x10CC0, 0x10C80,},
{0x10CC1, 0x10C81,},
{0x10CC2, 0x10C82,},
@@ -2480,6 +2520,7 @@ const struct UTF8_lower_upper {
{0x2C2C, 0x2C5C,},
{0x2C2D, 0x2C5D,},
{0x2C2E, 0x2C5E,},
+ {0x2C2F, 0x2C5F,},
{0x2C60, 0x2C61,},
{0x2C62, 0x026B,},
{0x2C63, 0x1D7D,},
@@ -2660,12 +2701,16 @@ const struct UTF8_lower_upper {
{0xA7BA, 0xA7BB,},
{0xA7BC, 0xA7BD,},
{0xA7BE, 0xA7BF,},
+ {0xA7C0, 0xA7C1,},
{0xA7C2, 0xA7C3,},
{0xA7C4, 0xA794,},
{0xA7C5, 0x0282,},
{0xA7C6, 0x1D8E,},
{0xA7C7, 0xA7C8,},
{0xA7C9, 0xA7CA,},
+ {0xA7D0, 0xA7D1,},
+ {0xA7D6, 0xA7D7,},
+ {0xA7D8, 0xA7D9,},
{0xA7F5, 0xA7F6,},
{0xFF21, 0xFF41,},
{0xFF22, 0xFF42,},
@@ -2769,6 +2814,41 @@ const struct UTF8_lower_upper {
{0x104D1, 0x104F9,},
{0x104D2, 0x104FA,},
{0x104D3, 0x104FB,},
+ {0x10570, 0x10597,},
+ {0x10571, 0x10598,},
+ {0x10572, 0x10599,},
+ {0x10573, 0x1059A,},
+ {0x10574, 0x1059B,},
+ {0x10575, 0x1059C,},
+ {0x10576, 0x1059D,},
+ {0x10577, 0x1059E,},
+ {0x10578, 0x1059F,},
+ {0x10579, 0x105A0,},
+ {0x1057A, 0x105A1,},
+ {0x1057C, 0x105A3,},
+ {0x1057D, 0x105A4,},
+ {0x1057E, 0x105A5,},
+ {0x1057F, 0x105A6,},
+ {0x10580, 0x105A7,},
+ {0x10581, 0x105A8,},
+ {0x10582, 0x105A9,},
+ {0x10583, 0x105AA,},
+ {0x10584, 0x105AB,},
+ {0x10585, 0x105AC,},
+ {0x10586, 0x105AD,},
+ {0x10587, 0x105AE,},
+ {0x10588, 0x105AF,},
+ {0x10589, 0x105B0,},
+ {0x1058A, 0x105B1,},
+ {0x1058C, 0x105B3,},
+ {0x1058D, 0x105B4,},
+ {0x1058E, 0x105B5,},
+ {0x1058F, 0x105B6,},
+ {0x10590, 0x105B7,},
+ {0x10591, 0x105B8,},
+ {0x10592, 0x105B9,},
+ {0x10594, 0x105BB,},
+ {0x10595, 0x105BC,},
{0x10C80, 0x10CC0,},
{0x10C81, 0x10CC1,},
{0x10C82, 0x10CC2,},
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -1504,9 +1504,12 @@ sql_get_next_token(YYSTYPE *yylval, void
case 'e':
case 'E':
assert(yylval->sval[1] == '\'');
- GDKstrFromStr((unsigned char *) str,
- (unsigned char *)
yylval->sval + 2,
- lc->yycur-lc->yysval - 2,
'\'');
+ if (GDKstrFromStr((unsigned char *) str,
+ (unsigne
MonetDB: default - Remove CURL from the stream library (and henc...
Changeset: ae88bcf369c5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ae88bcf369c5
Removed Files:
common/stream/url_stream.c
Modified Files:
clients/Tests/exports.stable.out
clients/examples/C/CMakeLists.txt
clients/examples/C/streamcat.c
clients/mapiclient/CMakeLists.txt
clients/mapiclient/mclient.c
common/stream/CMakeLists.txt
common/stream/ChangeLog
common/stream/memio.c
common/stream/monetdb-stream.pc.in
common/stream/stream.h
Branch: default
Log Message:
Remove CURL from the stream library (and hence mserver5), but keep in mclient.
The server didn't use CURL but carried it along (with a ton of
supporting libraries). Support has now been moved directly into mclient
(and streamcat, the test program). Instead of a url stream, they now
use a buffer stream, but in either case, the data was copied completely
before getting processed.
diffs (truncated from 578 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1728,7 +1728,6 @@ int mnstr_writeShtArray(stream *restrict
int mnstr_writeStr(stream *restrict s, const char *restrict val);
stream *open_rastream(const char *filename);
stream *open_rstream(const char *filename);
-stream *open_urlstream(const char *url);
stream *open_wastream(const char *filename);
stream *open_wstream(const char *filename);
stream *openssl_rstream(const char *hostname, BIO *bio);
diff --git a/clients/examples/C/CMakeLists.txt
b/clients/examples/C/CMakeLists.txt
--- a/clients/examples/C/CMakeLists.txt
+++ b/clients/examples/C/CMakeLists.txt
@@ -46,7 +46,8 @@ add_executable(streamcat
target_link_libraries(streamcat
PRIVATE
monetdb_config_header
- stream)
+ stream
+ $<$:CURL::libcurl>)
add_executable(testcondvar
testcondvar.c)
diff --git a/clients/examples/C/streamcat.c b/clients/examples/C/streamcat.c
--- a/clients/examples/C/streamcat.c
+++ b/clients/examples/C/streamcat.c
@@ -436,6 +436,71 @@ opener_rastream(char *filename)
return s;
}
+#ifdef HAVE_CURL
+#include
+
+static size_t
+write_callback(char *buffer, size_t size, size_t nitems, void *userp)
+{
+ stream *s = userp;
+
+ /* size is expected to always be 1 */
+
+ ssize_t sz = mnstr_write(s, buffer, size, nitems);
+ if (sz < 0)
+ return CURL_WRITEFUNC_ERROR; /* indicate failure to library */
+ return (size_t) sz * size;
+}
+
+static stream *
+open_urlstream(const char *url)
+{
+ CURL *handle;
+ stream *s;
+ CURLcode ret;
+ char errbuf[CURL_ERROR_SIZE];
+
+ s = buffer_wastream(NULL, url);
+ if (s == NULL) {
+ return NULL;
+ }
+
+ if ((handle = curl_easy_init()) == NULL) {
+ mnstr_destroy(s);
+ return NULL;
+ }
+
+ errbuf[0] = 0;
+
+ if ((ret = curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, errbuf)) !=
CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_URL, url)) != CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_WRITEDATA, s)) != CURLE_OK
||
+ (ret = curl_easy_setopt(handle, CURLOPT_VERBOSE, 0)) != CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1)) != CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_FAILONERROR, 1)) !=
CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION,
write_callback)) != CURLE_OK ||
+ (ret = curl_easy_perform(handle)) != CURLE_OK) {
+ curl_easy_cleanup(handle);
+ mnstr_destroy(s);
+ if (errbuf[0])
+ fprintf(stderr, "%s\n", errbuf);
+ else
+ fprintf(stderr, "%s\n", curl_easy_strerror(ret));
+ return NULL;
+ }
+ curl_easy_cleanup(handle);
+ (void) mnstr_get_buffer(s); /* switch to read-only */
+ return s;
+}
+#else
+static stream *
+open_urlstream(const char *url)
+{
+ (void) url;
+ return NULL;
+}
+#endif
+
static stream *
opener_urlstream(char *url)
{
diff --git a/clients/mapiclient/CMakeLists.txt
b/clients/mapiclient/CMakeLists.txt
--- a/clients/mapiclient/CMakeLists.txt
+++ b/clients/mapiclient/CMakeLists.txt
@@ -54,6 +54,7 @@ target_link_libraries(mclient
mapi
stream
$<$:Readline::Readline>
+ $<$:CURL::libcurl>
$<$:Iconv::Iconv>
$<$:${GETOPT_LIB}>)
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3072,10 +3072,70 @@ doFile(Mapi mid, stream *fp, bool useins
return errseen;
}
+#ifdef HAVE_CURL
+#include
+
+static size_t
+write_callback(char *buffer, size_t size, size_t nitems, void *userp)
+{
+ stream *s = userp;
+
+ /* size is expected to always be 1 */
+
+ ssize_t sz = mnstr_write(s
MonetDB: sw_ew_c_sorting - Rename test to be more descriptive an...
Changeset: abcf5e28eadc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/abcf5e28eadc Added Files: sql/test/strimps/Tests/strimps_stable_counts_starts_ends_contains.test Removed Files: sql/test/strimps/Tests/strimps_stable_counts2.test Modified Files: sql/test/strimps/Tests/All Branch: sw_ew_c_sorting Log Message: Rename test to be more descriptive and disable it for now diffs (truncated from 1366 to 300 lines): 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 @@ -1,5 +1,5 @@ strimps_stable_counts -strimps_stable_counts2 +# strimps_stable_counts_starts_ends_contains persisted_strimp strimps_not_like small_string_crash diff --git a/sql/test/strimps/Tests/strimps_stable_counts2.test b/sql/test/strimps/Tests/strimps_stable_counts2.test deleted file mode 100644 --- a/sql/test/strimps/Tests/strimps_stable_counts2.test +++ /dev/null @@ -1,673 +0,0 @@ -statement ok -CREATE TABLE fal(x STRING) - -statement ok -CREATE TABLE f(y STRING) - -statement ok -COPY 100 RECORDS INTO fal FROM STDIN - -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 -Leah Holland -Megan Warren - -statement ok -COPY 100 RECORDS INTO f FROM STDIN - -Noah -Ronald -Mary -Jennifer -Tanya -Ivan -Randy -Erin -Ryan -Scott -Kathryn -Brandi -Rebecca -Katie -Diane -Stephen -Michael -Jeremiah -Timothy -James -Mark -Thomas -Leslie -Robert -Joel -James -Anna -Alan -Janet -Samuel -Tanya -Russell -Alexis -Scott -Jenna -Eric -Andrew -Sandra -Stephanie -Jeremy -Don -Lisa -Jacqueline -Melissa -Patricia -Ana -Danielle -Cheryl -Justin -Karen -Pamela -Beverly -Becky -Caitlin -Michael -Emma -Darlene -Darrell -David -Wanda -Sydney -Susan -Louis -Brittany -William -Daniel -Laura -Kevin -Jonathon -James -Robert -Denise -Cassandra -Stephanie -Samuel -Kaitlyn -David -Katrina -Nathan -Jessica -Michelle -Veronica -Rachel -Andrew -Jennifer -William -Melanie -Larry -Ronald -Sally -Joshua -Chelsea -Ashley -Johnny -Chad -Nicole -Joshua -Michele -Joseph -Carolyn - -query TT -SELECT * FROM fal,f WHERE [fal.x] startswith [f.y] ORDER BY x - -Andrew Alvarado -Andrew -Andrew Alvarado -Andrew -Ashley Taylor -Ashley -Ashley Waters -Ashley -Daniel Sims -Daniel -Daniel Sullivan -Daniel -David Carter -David -David Carter -David -David Clark -David -David Clark -David -Donna Anderson -Don -Donna Rivera -Don -Emma Abbott -Emma -James Ballard -James -James Ballard -James -James Ballard -James -James Whitney -James -James Whitney -James -James Whitney -James -James Woodard -James -James Woodard -James -James Woodard -James -Jessica Miller -Jessica -Johnny Gibson -Johnny -Karen Jones -Karen -Laura Gonzalez -Laura -Laura Holland -Laura -Lisa Matthews -Lisa -Mark Cook -Mark -Mary Garcia -Mary -Mary Miller -Mary -Michael Mendoza -Michael -Michael Mendoza -Michael -Michael Nguyen -Michael ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: sw_ew_c_sorting - Fix startswith_join loop
Changeset: 72268efde28b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/72268efde28b
Modified Files:
monetdb5/modules/atoms/str.c
Branch: sw_ew_c_sorting
Log Message:
Fix startswith_join loop
diffs (119 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -5616,7 +5616,7 @@ STRcontainsselect(Client cntxt, MalBlkPt
#define STARTSWITH_SORTED_LOOP(STR_CMP, STR_LEN, FNAME)
\
do {
\
canditer_init(&rci, sorted_r, sorted_cr);
\
- for (BUN ridx = 0; ridx < rci.ncand; ridx++) {
\
+ for (BUN lidx = 0,ridx = 0; ridx < rci.ncand; ridx++) {
\
GDK_CHECK_TIMEOUT(timeoffset, counter,
GOTO_LABEL_TIMEOUT_HANDLER(exit)); \
ro = canditer_next(&rci);
\
vr = VALUE(r, ro - rbase);
\
@@ -5625,7 +5625,7 @@ STRcontainsselect(Client cntxt, MalBlkPt
vr_len = STR_LEN;
\
matches = 0;
\
canditer_init(&lci, sorted_l, sorted_cl);
\
- for (BUN lidx = 0; lidx < lci.ncand; lidx++) {
\
+ for (n = lidx; n < lci.ncand; n++) {
\
lo = canditer_next(&lci);
\
vl = VALUE(l, lo - lbase);
\
if (strNil(vl))
\
@@ -5644,7 +5644,7 @@ STRcontainsselect(Client cntxt, MalBlkPt
BATsetcount(rr, BATcount(rr));
\
if (BATextend(rl, newcap) !=
GDK_SUCCEED || \
(rr && BATextend(rr, newcap) !=
GDK_SUCCEED)) { \
- msg = createException(MAL,
FNAME, SQLSTATE(HY013) MAL_MALLOC_FAIL); \
+ msg = createException(MAL,
FNAME, SQLSTATE(HY013) MAL_MALLOC_FAIL); \
goto exit;
\
}
\
assert(!rr || BATcapacity(rl) ==
BATcapacity(rr)); \
@@ -6064,85 +6064,14 @@ startswith_join(BAT **rl_ptr, BAT **rr_p
*lvars = li.vh->base,
*rvars = ri.vh->base,
*vl, *vr;
- BUN matches, newcap;
+ BUN matches, newcap, n = 0;
int rskipped = 0, vr_len = 0, cmp = 0;
size_t counter = 0;
if (anti)
STR_JOIN_NESTED_LOOP((str_cmp(vl, vr, vr_len) != 0),
str_strlen(vr), fname);
- else {
- /* STARTSWITH_SORTED_LOOP(str_cmp(vl, vr, vr_len),
str_strlen(vr), fname); */
- canditer_init(&rci, sorted_r, sorted_cr);
- for (BUN lidx = 0,ridx = 0; ridx < rci.ncand; ridx++) {
- GDK_CHECK_TIMEOUT(timeoffset, counter,
GOTO_LABEL_TIMEOUT_HANDLER(exit));
- ro = canditer_next(&rci);
- vr = VALUE(r, ro - rbase);
- if (strNil(vr))
- continue;
- vr_len = str_strlen(vr);
- matches = 0;
- canditer_init(&lci, sorted_l, sorted_cl);
- for (BUN n = lidx; lidx < lci.ncand; n++) {
- lo = canditer_next(&lci);
- vl = VALUE(l, lo - lbase);
- if (strNil(vl))
- continue;
- cmp = str_cmp(vl, vr, vr_len);
- if (cmp < 0) {
- lidx++;
- continue;
- }
- else if (cmp > 0)
-
MonetDB: sw_ew_c_sorting - Missing important increment
Changeset: 399ead013981 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/399ead013981
Modified Files:
monetdb5/modules/atoms/str.c
Branch: sw_ew_c_sorting
Log Message:
Missing important increment
diffs (97 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -5631,8 +5631,10 @@ STRcontainsselect(Client cntxt, MalBlkPt
if (strNil(vl))
\
continue;
\
cmp = STR_CMP;
\
- if (cmp < 0)
\
+ if (cmp < 0) {
\
+ lidx++;
\
continue;
\
+ }
\
else if (cmp > 0)
\
break;
\
if (BATcount(rl) == BATcapacity(rl)) {
\
@@ -6068,8 +6070,79 @@ startswith_join(BAT **rl_ptr, BAT **rr_p
if (anti)
STR_JOIN_NESTED_LOOP((str_cmp(vl, vr, vr_len) != 0),
str_strlen(vr), fname);
- else
- STARTSWITH_SORTED_LOOP(str_cmp(vl, vr, vr_len), str_strlen(vr),
fname);
+ else {
+ /* STARTSWITH_SORTED_LOOP(str_cmp(vl, vr, vr_len),
str_strlen(vr), fname); */
+ canditer_init(&rci, sorted_r, sorted_cr);
+ for (BUN lidx = 0,ridx = 0; ridx < rci.ncand; ridx++) {
+ GDK_CHECK_TIMEOUT(timeoffset, counter,
GOTO_LABEL_TIMEOUT_HANDLER(exit));
+ ro = canditer_next(&rci);
+ vr = VALUE(r, ro - rbase);
+ if (strNil(vr))
+ continue;
+ vr_len = str_strlen(vr);
+ matches = 0;
+ canditer_init(&lci, sorted_l, sorted_cl);
+ for (BUN n = lidx; lidx < lci.ncand; n++) {
+ lo = canditer_next(&lci);
+ vl = VALUE(l, lo - lbase);
+ if (strNil(vl))
+ continue;
+ cmp = str_cmp(vl, vr, vr_len);
+ if (cmp < 0) {
+ lidx++;
+ continue;
+ }
+ else if (cmp > 0)
+ break;
+ if (BATcount(rl) == BATcapacity(rl)) {
+ newcap = BATgrows(rl);
+ BATsetcount(rl, BATcount(rl));
+ if (rr)
+ BATsetcount(rr, BATcount(rr));
+ if (BATextend(rl, newcap) !=
GDK_SUCCEED ||
+ (rr && BATextend(rr, newcap) !=
GDK_SUCCEED)) {
+ msg = createException(MAL,
fname, SQLSTATE(HY013) MAL_MALLOC_FAIL);
+ goto exit;
+ }
+ assert(!rr || BATcapacity(rl) ==
BATcapacity(rr));
+ }
+ if (BATcount(rl) > 0) {
+ if (last_lo + 1 != lo)
+ rl->tseqbase = oid_nil;
+ if (matches == 0) {
+ if (rr)
+ rr->trevsorted = false;
+ if (last_lo > lo) {
+ rl->tsorted = false;
+ rl->tkey = false;
+ } else if (last_lo < l
MonetDB: Dec2023 - Approve slight change in error message.
Changeset: 0ae5fc17d8c5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0ae5fc17d8c5 Modified Files: sql/test/copy/Tests/nonutf8.test Branch: Dec2023 Log Message: Approve slight change in error message. diffs (12 lines): diff --git a/sql/test/copy/Tests/nonutf8.test b/sql/test/copy/Tests/nonutf8.test --- a/sql/test/copy/Tests/nonutf8.test +++ b/sql/test/copy/Tests/nonutf8.test @@ -1,7 +1,7 @@ statement ok create table nonutf8 (s string) -statement error GDK reported error: GDKstrFromStr: not a proper UTF-8 sequence +statement error !ERROR: GDKstrFromStr: not a proper UTF-8 sequence insert into nonutf8 values (E'\x7A\x77\x61\x61\x72\x20\x6C\x61\x6E\x67\x65\x20\x67\x6F\x6C\x66\x20\x70\x69\x65\x6B\x20\x2D\x64\x61\x6C\x20\xB1\x31\x30\x63\x6D\x20\x76\x61\x6B\x35') statement error Failed to import table 'nonutf8', line 1: column 1 s: 'clob' expected in '\x7A\x77\x61\x61\x72\x20\x6C\x61\x6E\x67\x65\x20\x67\x6F\x6C\x66\x20\x70\x69\x65\x6B\x20\x2D\x64\x61\x6C\x20\xB1\x31\x30\x63\x6D\x20\x76\x61\x6B\x35\x0A\xB1\x31\x37\x20\x25' ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: literal_features - Merge with default
Changeset: 60e5746a185a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/60e5746a185a
Modified Files:
sql/backends/monet5/rel_bin.c
sql/include/sql_catalog.h
sql/server/rel_schema.c
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_tokens.h
Branch: literal_features
Log Message:
Merge with default
diffs (truncated from 121999 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.48.0
+current_version = 11.50.0
commit = False
tag = False
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -43,7 +43,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
-uses: actions/checkout@v3
+uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
@@ -129,7 +129,7 @@ jobs:
- name: Tar files
run: tar -cvf mtests.tar mTests
- name: Publish mtest results
-uses: actions/upload-artifact@v3
+uses: actions/upload-artifact@v4
with:
name: mtest-${{ github.sha }}-${{ matrix.os }}-${{ matrix.c_compiler
}}
path: mtests.tar
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -815,3 +815,8 @@ 6f88424ebfd9d82c072cf21d89070e04321983da
6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release
e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13
5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
+c5b17681b55e6ca155db28be59913699e561502a Dec2023_root
+c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
+c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_SP3_release
+1230526af30f40eeea30fb87c47c3e414920561f Dec2023_1
+1230526af30f40eeea30fb87c47c3e414920561f Dec2023_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
+# Copyright 2024 MonetDB Foundation;
+# Copyright August 2008 - 2023 MonetDB B.V.;
+# Copyright 1997 - July 2008 CWI.
#]]
cmake_minimum_required(VERSION 3.12)
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Mon Oct 30 2023 Sjoerd Mullender
-- The ranges of merge partitions are now pushed down into the low
- level GDK operations, giving them a handle to sometimes execute more
- efficiently.
-
-* Thu Jul 27 2023 Niels Nes
-- Removed the PYTHON MAP external language option, as after a fork the
- synchronization primitives could be in any state, leading to deadlocks.
- During the upgrade function definitions will fallback to the normal
- PYTHON language option.
-
-* Mon Jul 17 2023 Panagiotis Koutsourakis
-- Implemented direct masking for strimp construction. The strimps
- datastructure now keeps an array of 65K 64-bit integers that is zero
- everywhere except at the indexes that correspond to header pairs. The
- entry for the nth pair in order has the nth bit of the bitstring
- on. These can be used to quickly construct bitstrings.
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,28 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Dec 1 2023 Sjoerd Mullender - 11.49.1-20231221
+- All binary packages are now signed with a new key with key fingerprint
+ DBCE 5625 94D7 1959 7B54 CE85 3F1A D47F 5521 A603.
+
+* Mon Oct 30 2023 Sjoerd Mullender - 11.49.1-20231221
+- The ranges of merge partitions are now pushed down into the low
+ level GDK operations, giving them a handle to sometimes execute more
+ efficiently.
+
+* Thu Jul 27 2023 Niels Nes - 11.49.1-20231221
+- Removed the PYTHON MAP external language option, as after a fork the
+ synchronization primitives could be in any state, leading to deadlocks.
+ During the upgrade function definitions will fallback to the normal
+ PYTHON language option.
+
+* Mon Jul 17 2023 Panagiotis Koutsourakis -
11.49.1-20231221
+- Implemented direct masking for strimp construction. The strimps
+ datastructure now keeps an array of 65K 64-bit integers that is zero
+ everywhere except at the indexes that correspond to header pairs. The
+ entry for the nth pair in order has the nth bit of the bitstring
+ on. These can be used to quickly construct bitstrings.
+
* Fri Sep 29 2023 Sjoerd Mullender - 11.47.11-20230929
- Fixed an installation issue on Debian and Ubuntu introduced in the
last build.
diff --git a/ChangeLog b/ChangeLog.Dec2023
copy from ChangeLog
copy to ChangeLog.Dec2023
--- a/ChangeLog
+++ b/ChangeLog.Dec2023
@@ -1,20 +1,3 @@
# ChangeLog file for devel
# This
MonetDB: Dec2023 - Make failure to SIGHUP in 'monetdbd set' non-...
Changeset: 05d60f0249c5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/05d60f0249c5
Modified Files:
tools/merovingian/daemon/argvcmds.c
Branch: Dec2023
Log Message:
Make failure to SIGHUP in 'monetdbd set' non-fatal
Maybe monetdbd crashed or got killed and did not get the chance to
clean up the pid file
diffs (16 lines):
diff --git a/tools/merovingian/daemon/argvcmds.c
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -441,10 +441,9 @@ command_set(confkeyval *ckv, int argc, c
(meropid = atoi(buf)) != 0 &&
kill(meropid, SIGHUP) == -1)
{
- fprintf(stderr, "sending SIGHUP to monetdbd[%d] failed:
%s\n",
+ /* maybe monetdbd crashed and did not get the chance to
clean up */
+ fprintf(stderr, "WARNING: sending SIGHUP to
monetdbd[%d] failed: %s\n",
(int)meropid, strerror(errno));
- fclose(pfile);
- return(1);
}
fclose(pfile);
}
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
