Changeset: f0447bbb66c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0447bbb66c3
Modified Files:
sql/backends/monet5/sql_upgrades.c
Branch: Nov2019
Log Message:
Make sure we always have the correct name in errors, even after copy-paste.
diffs (216 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -37,7 +37,7 @@ sql_fix_system_tables(Client c, mvc *sql
sql_schema *s;
if (buf == NULL)
- throw(SQL, "sql_fix_system_tables", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
s = mvc_bind_schema(sql, "sys");
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
@@ -195,7 +195,7 @@ sql_update_hugeint(Client c, mvc *sql, c
*systabfixed = true;
if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_update_hugeint", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
@@ -277,12 +277,12 @@ sql_update_geom(Client c, mvc *sql, int
geomupgrade = (*fixfunc)(olddb);
if (geomupgrade == NULL)
- throw(SQL, "sql_update_geom", SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
bufsize = strlen(geomupgrade) + 512;
buf = GDKmalloc(bufsize);
if (buf == NULL) {
GDKfree(geomupgrade);
- throw(SQL, "sql_update_geom", SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
pos += snprintf(buf + pos, bufsize - pos, "%s", geomupgrade);
@@ -320,7 +320,7 @@ sql_update_jul2017(Client c, const char
BAT *b;
if( buf == NULL)
- throw(SQL, "sql_update_jul2017", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
pos += snprintf(buf + pos, bufsize - pos,
@@ -444,7 +444,7 @@ sql_update_jul2017_sp2(Client c)
char *buf = GDKmalloc(bufsize);
if (buf == NULL)
- throw(SQL, "sql_update_jul2017_sp2",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001)
MAL_MALLOC_FAIL);
/* 51_sys_schema_extensions.sql and 25_debug.sql */
pos += snprintf(buf + pos, bufsize - pos,
@@ -502,7 +502,7 @@ sql_update_jul2017_sp3(Client c, mvc *sq
size_t bufsize = 1024, pos = 0;
char *buf = GDKmalloc(bufsize);
if (buf == NULL)
- throw(SQL, "sql_update_jul2017_sp3", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(
buf + pos,
bufsize - pos,
@@ -525,7 +525,7 @@ sql_update_mar2018_geom(Client c, sql_ta
char *buf = GDKmalloc(bufsize), *err = NULL;
if (buf == NULL)
- throw(SQL, "sql_update_mar2018_geom", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
t->system = 0;
@@ -585,7 +585,7 @@ sql_update_mar2018(Client c, mvc *sql, c
buf = GDKmalloc(bufsize);
if (buf == NULL)
- throw(SQL, "sql_update_mar2018", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
s = mvc_bind_schema(sql, "sys");
t = mvc_create_table(sql, s, "comments", tt_table, 1, SQL_PERSIST, 0,
-1, 0);
@@ -1040,7 +1040,7 @@ sql_update_mar2018_netcdf(Client c, cons
char *buf = GDKmalloc(bufsize), *err;
if (buf == NULL)
- throw(SQL, "sql_update_mar2018_netcdf", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
@@ -1077,7 +1077,7 @@ sql_update_mar2018_samtools(Client c, mv
buf = GDKmalloc(bufsize);
if (buf == NULL)
- throw(SQL, "sql_update_mar2018_samtools", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
@@ -1146,7 +1146,7 @@ sql_update_mar2018_sp1(Client c, const c
char *buf = GDKmalloc(bufsize), *err = NULL;
if (buf == NULL)
- throw(SQL, "sql_update_mar2018_sp1", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos,
"set schema \"sys\";\n"
"drop function
sys.dependencies_functions_os_triggers();\n"
@@ -1173,7 +1173,7 @@ sql_update_remote_tables(Client c, mvc *
BAT *tbl = NULL, *uri = NULL;
if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_update_remote_tables", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
/* Create the SQL function needed to dump the remote table credentials
*/
pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
@@ -1259,7 +1259,7 @@ sql_replace_Mar2018_ids_view(Client c, m
sql_table *t = mvc_bind_table(sql, s, "ids");
if (buf == NULL)
- throw(SQL, "sql_replace_Mar2018_ids_view", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
t->system = 0; /* make it non-system else the drop view will fail */
t = mvc_bind_table(sql, s, "dependencies_vw"); /* dependencies_vw uses
view sys.ids so must be removed first */
@@ -1321,7 +1321,7 @@ sql_update_gsl(Client c, const char *pre
char *buf = GDKmalloc(bufsize), *err = NULL;
if (buf == NULL)
- throw(SQL, "sql_update_gsl", SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos,
"set schema \"sys\";\n"
"drop function sys.chi2prob(double, double);\n");
@@ -1342,7 +1342,7 @@ sql_update_aug2018(Client c, mvc *sql, c
char *buf, *err;
if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_update_aug2018", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
pos += snprintf(buf + pos, bufsize - pos,
@@ -1375,7 +1375,7 @@ sql_update_aug2018_sp2(Client c, const c
BAT *b;
if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_update_aug2018_sp2", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
/* required update for changeset 23e1231ada99 */
pos += snprintf(buf + pos, bufsize - pos,
@@ -1413,7 +1413,7 @@ sql_drop_functions_dependencies_Xs_on_Ys
char *err = NULL, *buf = GDKmalloc(bufsize);
if (buf == NULL)
- throw(SQL, "sql_drop_functions_dependencies_Xs_on_Ys",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
/* remove functions which were created in
sql/scripts/21_dependency_functions.sql */
pos += snprintf(buf + pos, bufsize - pos,
@@ -1454,7 +1454,7 @@ sql_update_apr2019(Client c, mvc *sql, c
sql_table *t;
if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_update_apr2019", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
@@ -1549,7 +1549,7 @@ sql_update_storagemodel(Client c, mvc *s
sql_table *t;
if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_update_storagemodel", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
/* set views and tables internally to non-system to allow drop commands
to succeed without error */
if ((t = mvc_bind_table(sql, s, "storage")) != NULL)
@@ -1891,7 +1891,7 @@ sql_update_apr2019_sp2(Client c, mvc *sq
char *buf = GDKmalloc(bufsize), *err;
if (buf == NULL)
- throw(SQL, "sql_update_apr2019_sp2", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
if (!*systabfixed) {
sql_fix_system_tables(c, sql, prev_schema);
@@ -1937,7 +1937,7 @@ sql_update_nov2019_missing_dependencies(
bool first = true;
if (buf == NULL)
- throw(SQL, "sql_update_nov2019_missing_dependencies",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
if (!(sql->sa = sa_create())) {
err = createException(SQL, "sql.catalog", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
@@ -2074,7 +2074,7 @@ sql_update_nov2019(Client c, mvc *sql, c
BAT *b;
if (buf == NULL)
- throw(SQL, "sql_update_nov2019", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos,
"select id from sys.args where func_id in (select id
from sys.functions where schema_id = (select id from sys.schemas where name =
'sys') and name = 'second' and func = 'sql_seconds') and number = 0 and
type_scale = 3;\n");
@@ -2328,7 +2328,7 @@ sql_update_nov2019_sp1_hugeint(Client c,
*systabfixed = true;
if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_update_hugeint", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, __func__, SQLSTATE(HY001) MAL_MALLOC_FAIL);
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
