Changeset: 014bcd279dbd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/014bcd279dbd
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_embedded.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_private.h
monetdb5/mal/mal_session.c
sql/backends/monet5/sql_gencode.c
Branch: simplify_scenario
Log Message:
merged with default
diffs (truncated from 3611 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -793,3 +793,5 @@ 41ca60d96bd0198ca5d74937630a442a5fbaf1cd
41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_SP1_release
e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_13
e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_SP2_release
+8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31
+8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release
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
@@ -750,11 +750,9 @@ MALfcn MANIFOLDtypecheck(Client cntxt, M
int MCactiveClients(void);
str MCawakeClient(int id);
void MCcloseClient(Client c);
-Client MCforkClient(Client father);
Client MCgetClient(int id);
Client MCinitClient(oid user, bstream *fin, stream *fout);
-size_t MCmemoryClaim(void);
-int MCpushClientInput(Client c, bstream *new_input, int listing, char *prompt);
+int MCpushClientInput(Client c, bstream *new_input, int listing, const char
*prompt);
void MCstopClients(Client c);
str MCsuspendClient(int id);
int MCvalid(Client c);
@@ -944,7 +942,6 @@ int getBitConstant(MalBlkPtr mb, bit val
int getBlockBegin(MalBlkPtr mb, int pc);
int getBlockExit(MalBlkPtr mb, int pc);
int getBteConstant(MalBlkPtr mb, bte val);
-Client getClientContext(void);
int getDblConstant(MalBlkPtr mb, dbl val);
str getExceptionMessage(const char *);
str getExceptionMessageAndState(const char *);
diff --git a/clients/examples/C/testcondvar.c b/clients/examples/C/testcondvar.c
--- a/clients/examples/C/testcondvar.c
+++ b/clients/examples/C/testcondvar.c
@@ -12,8 +12,6 @@
#include "gdk.h"
#include "gdk_system.h"
-#include <assert.h>
-
#define NN (3)
volatile int timeout = 100; // set this to 0 during interactive debugging
diff --git a/clients/odbc/driver/SQLExecute.c b/clients/odbc/driver/SQLExecute.c
--- a/clients/odbc/driver/SQLExecute.c
+++ b/clients/odbc/driver/SQLExecute.c
@@ -424,9 +424,6 @@ MNDBExecute(ODBCStmt *stmt)
return SQL_ERROR;
}
- /* internal state correctness checks */
- assert(stmt->State == PREPARED0 || stmt->State == EXECUTED0 ||
stmt->ImplRowDescr->descRec != NULL);
-
assert(stmt->Dbc);
assert(stmt->Dbc->mid);
hdl = stmt->hdl;
diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022
--- a/gdk/ChangeLog.Sep2022
+++ b/gdk/ChangeLog.Sep2022
@@ -1,6 +1,10 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
+* Fri Mar 24 2023 Sjoerd Mullender <[email protected]>
+- When processing the WAL, if a to-be-destroyed object cannot be found,
+ don't stop, but keep processing the rest of the WAL.
+
* Mon Feb 20 2023 Sjoerd Mullender <[email protected]>
- A race condition was fixed where certain write-ahead log messages
could get intermingled, resulting in a corrupted WAL file.
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -364,6 +364,7 @@ gdk_export _Noreturn void GDKfatal(_In_z
#define GDKisspace(c) isspace((unsigned char) (c))
#define GDKisalnum(c) isalnum((unsigned char) (c))
#define GDKisdigit(c) isdigit((unsigned char) (c))
+#define GDKisxdigit(c) isxdigit((unsigned char) (c))
#define BATDIR "bat"
#define TEMPDIR_NAME "TEMP_DATA"
diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c
--- a/gdk/gdk_analytic_bounds.c
+++ b/gdk/gdk_analytic_bounds.c
@@ -116,20 +116,20 @@ GDKanalyticaldiff(BAT *r, BAT *b, BAT *p
ANALYTICAL_DIFF_IMP(hge);
break;
#endif
- case TYPE_flt: {
+ case TYPE_flt:
if (bi.nonil) {
ANALYTICAL_DIFF_IMP(flt);
} else { /* Because of NaN values, use this path */
ANALYTICAL_DIFF_FLOAT_IMP(flt);
}
- } break;
- case TYPE_dbl: {
+ break;
+ case TYPE_dbl:
if (bi.nonil) {
ANALYTICAL_DIFF_IMP(dbl);
} else { /* Because of NaN values, use this path */
ANALYTICAL_DIFF_FLOAT_IMP(dbl);
}
- } break;
+ break;
default:{
const void *v = BUNtail(bi, 0), *next;
int (*atomcmp) (const void *, const void *) = ATOMcompare(tpe);
@@ -714,57 +714,57 @@ GDKanalyticalpeers(BAT *r, BAT *b, BAT *
bool last = false;
switch (ATOMbasetype(bi.type)) {
- case TYPE_bte: {
+ case TYPE_bte:
if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_PRECEDING,
bte, NO_NAN_CHECK);
} else {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_FOLLOWING,
bte, NO_NAN_CHECK);
}
- } break;
- case TYPE_sht: {
+ break;
+ case TYPE_sht:
if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_PRECEDING,
sht, NO_NAN_CHECK);
} else {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_FOLLOWING,
sht, NO_NAN_CHECK);
}
- } break;
- case TYPE_int: {
+ break;
+ case TYPE_int:
if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_PRECEDING,
int, NO_NAN_CHECK);
} else {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_FOLLOWING,
int, NO_NAN_CHECK);
}
- } break;
- case TYPE_lng: {
+ break;
+ case TYPE_lng:
if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_PRECEDING,
lng, NO_NAN_CHECK);
} else {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_FOLLOWING,
lng, NO_NAN_CHECK);
}
- } break;
+ break;
#ifdef HAVE_HGE
- case TYPE_hge: {
+ case TYPE_hge:
if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_PRECEDING,
hge, NO_NAN_CHECK);
} else {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_FOLLOWING,
hge, NO_NAN_CHECK);
}
- } break;
+ break;
#endif
- case TYPE_flt: {
+ case TYPE_flt:
if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_PRECEDING,
flt, && (!is_flt_nil(next) || !is_flt_nil(prev)));
} else {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_FOLLOWING,
flt, && (!is_flt_nil(next) || !is_flt_nil(prev)));
}
- } break;
- case TYPE_dbl: {
+ break;
+ case TYPE_dbl:
if (preceding) {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_PRECEDING,
dbl, && (!is_dbl_nil(next) || !is_dbl_nil(prev)));
} else {
ANALYTICAL_WINDOW_BOUNDS_BRANCHES_PEERS(_FOLLOWING,
dbl, && (!is_dbl_nil(next) || !is_dbl_nil(prev)));
}
- } break;
+ break;
default: {
const void *prev, *next;
int (*atomcmp) (const void *, const void *) =
ATOMcompare(bi.type);
@@ -941,7 +941,8 @@ GDKanalyticalrowbounds(BAT *r, BAT *b, B
#else
limit = (lng) (*(lng *) bound);
#endif
- } break;
+ break;
+ }
#ifdef HAVE_HGE
case TYPE_hge: {
hge nval = *(hge *) bound;
@@ -1160,7 +1161,7 @@ GDKanalyticalrangebounds(BAT *r, BAT *b,
break;
}
default:
- assert(0);
+ MT_UNREACHABLE();
}
if (is_lng_nil(limit) || limit < 0 ||
is_int_nil(int_limit) || int_limit < 0) {
goto invalid_bound;
@@ -1386,7 +1387,8 @@ GDKanalyticalgroupsbounds(BAT *r, BAT *b
#else
limit = (lng) (*(lng *) bound);
#endif
- } break;
+ break;
+ }
#ifdef HAVE_HGE
case TYPE_hge: {
hge nval = *(hge *) bound;
@@ -1444,7 +1446,7 @@ GDKanalyticalwindowbounds(BAT *r, BAT *b
case 2:
return GDKanalyticalgroupsbounds(r, b, p, l, bound, tp2,
preceding);
default:
- assert(0);
+ MT_UNREACHABLE();
}
GDKerror("42000!unit type %d not supported (this is a bug).\n", unit);
return GDK_FAIL;
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -1280,25 +1280,25 @@ GDKanalytical##OP(BAT *r, BAT *p, BAT *o
\
if (cnt > 0) { \
switch (frame_type) { \
- case 3: /* unbounded until current row */ { \
+ case 3: /* unbounded until current row */ \
ANALYTICAL_MIN_MAX_BRANCHES(MIN_MAX, GT_LT,
UNBOUNDED_TILL_CURRENT_ROW); \
- } break; \
- case 4: /* current row until unbounded */ { \
+ break; \
+ case 4: /* current row until unbounded */ \
ANALYTICAL_MIN_MAX_BRANCHES(MIN_MAX, GT_LT,
CURRENT_ROW_TILL_UNBOUNDED); \
- } break; \
- case 5: /* all rows */ { \
+ break; \
+ case 5: /* all rows */ \
ANALYTICAL_MIN_MAX_BRANCHES(MIN_MAX, GT_LT, ALL_ROWS); \
- } break; \
- case 6: /* current row */ { \
+ break; \
+ case 6: /* current row */ \
ANALYTICAL_MIN_MAX_BRANCHES(MIN_MAX, GT_LT,
CURRENT_ROW); \
- } break; \
- default: { \
+ break; \
+ default: \
if (!(st = GDKinitialize_segment_tree())) { \
res = GDK_FAIL; \
goto cleanup; \
} \
ANALYTICAL_MIN_MAX_BRANCHES(MIN_MAX, GT_LT, OTHERS); \
- } \
+ break; \
} \
} \
\
@@ -1640,25 +1640,25 @@ GDKanalyticalcount(BAT *r, BAT *p, BAT *
if (cnt > 0) {
switch (frame_type) {
- case 3: /* unbounded until current row */ {
+ case 3: /* unbounded until current row */
ANALYTICAL_COUNT_BRANCHES(UNBOUNDED_TILL_CURRENT_ROW);
- } break;
- case 4: /* current row until unbounded */ {
+ break;
+ case 4: /* current row until unbounded */
ANALYTICAL_COUNT_BRANCHES(CURRENT_ROW_TILL_UNBOUNDED);
- } break;
- case 5: /* all rows */ {
+ break;
+ case 5: /* all rows */
ANALYTICAL_COUNT_BRANCHES(ALL_ROWS);
- } break;
- case 6: /* current row */ {
+ break;
+ case 6: /* current row */
ANALYTICAL_COUNT_BRANCHES(CURRENT_ROW);
- } break;
- default: {
+ break;
+ default:
if (!count_all && !(st = GDKinitialize_segment_tree()))
{
res = GDK_FAIL;
goto cleanup;
}
ANALYTICAL_COUNT_BRANCHES(OTHERS);
- }
+ break;
}
}
@@ -1968,25 +1968,25 @@ GDKanalyticalsum(BAT *r, BAT *p, BAT *o,
if (cnt > 0) {
switch (frame_type) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
