Changeset: 9b1097d52b0f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b1097d52b0f
Modified Files:
gdk/gdk_system.h
gdk/gdk_tracer.h
gdk/gdk_utils.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/bam/bam_db_interface.h
sql/backends/monet5/vaults/bam/bam_globals.h
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/vaults/bam/bam_wrapper.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/shp/shp.c
sql/backends/monet5/wlr.c
sql/server/sql_atom.c
sql/server/sql_env.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/storage/bat/bat_table.c
sql/storage/store.c
tools/mserver/mserver5.c
Branch: tracer
Log Message:
Various modifications
- Removed GDKverbose from gdk_system.h and mserver5
- CRITICAL, ERROR and WARNING messages belong to M_ALL (component should not
matter for those types)
- Added GDKtracer to sql_mvc and removed debug var from struct (in progress)
- INFO messages should correspond to a layer and not specific component
- Added GDKtracer to lidar.c and removed unecessary functions and flags for
DEBUG logging
- DEBUG messages should always use a specific component for filtering later
- Added GDKtracer to bam vault and removed unecessary functions and flags for
DEBUG logging
diffs (truncated from 2345 to 300 lines):
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -110,8 +110,6 @@
/* debug and errno integers */
gdk_export int GDKdebug;
gdk_export void GDKsetdebug(int debug);
-gdk_export int GDKverbose;
-gdk_export void GDKsetverbose(int verbosity);
gdk_export int GDKnr_threads;
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -25,16 +25,20 @@
// COMPONENTS
typedef enum {
// ALL
- ALL,
+ M_ALL,
ALLOC,
// SQL
SQL_ALL,
+
+
SQL_ATOM_TR,
SQL_STATISTICS,
SQL_ORDERIDX,
- SQL_N,
+ SQL_OPTIMIZER,
+ SQL_FITS,
SQL_WLR,
+ SQL_USER,
SQL_SCENARIO,
SQL_CACHE_TR,
SQL_PARSER,
@@ -43,6 +47,8 @@ typedef enum {
SQL_MVC,
SQL_STORE,
SQL_STORE_FLUSHER,
+ SQL_LIDAR,
+ SQL_BAM,
// MAL
MAL_ALL,
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -24,7 +24,6 @@
static BAT *GDKkey = NULL;
static BAT *GDKval = NULL;
int GDKdebug = 0;
-int GDKverbose = 0;
#include <signal.h>
@@ -517,12 +516,6 @@ GDKsetdebug(int debug)
GDKdebug = debug;
}
-void
-GDKsetverbose(int verbose)
-{
- GDKverbose = verbose;
-}
-
gdk_return
GDKinit(opt *set, int setlen)
{
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -725,7 +725,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
if (s && grp)
s = stmt_project(be, ext, s);
if (!s && right) {
- CRITICAL(SQL_ALL, "Could not find %s.%s\n",
(char*)e->l, (char*)e->r);
+ CRITICAL(M_ALL, "Could not find %s.%s\n", (char*)e->l,
(char*)e->r);
print_stmtlist(sql->sa, left);
print_stmtlist(sql->sa, right);
assert(s);
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -109,7 +109,7 @@ SQLgetSpace(mvc *m, MalBlkPtr mb, int pr
space += size; // accumulate once per table
//lasttable = tname; invalidate this attempt
if( !prepare && size == 0 && ! t->system){
- DEBUG(SQL_ALL, "Found empty column
%s.%s.%s prepare %d size "LLFMT"\n", sname, tname, cname, prepare, size);
+ DEBUG(SQL_OPTIMIZER, "Found empty
column %s.%s.%s prepare %d size "LLFMT"\n", sname, tname, cname, prepare, size);
setFunctionId(p, emptybindRef);
}
}
@@ -136,7 +136,7 @@ SQLgetSpace(mvc *m, MalBlkPtr mb, int pr
if( !prepare && size == 0 && !
i->t->system){
setFunctionId(p,
emptybindidxRef);
- DEBUG(SQL_ALL, "Found
empty column %s.%s.%s prepare %d size "LLFMT"\n", sname, tname, idxname,
prepare, size);
+ DEBUG(SQL_OPTIMIZER,
"Found empty column %s.%s.%s prepare %d size "LLFMT"\n", sname, tname, idxname,
prepare, size);
}
BBPunfix(b->batCacheid);
}
@@ -179,7 +179,7 @@ addOptimizers(Client c, MalBlkPtr mb, ch
if(space && (pipe == NULL || strcmp(pipe,"default_pipe")== 0)){
if( space > (lng)(0.8 * MT_npages() * MT_pagesize()) &&
GDKnr_threads > 1){
pipe = "volcano_pipe";
- DEBUG(SQL_ALL, "Use volcano optimizer pipeline? Space:
%zu\n", space);
+ DEBUG(SQL_OPTIMIZER, "Use volcano optimizer pipeline?
Space: %zu\n", space);
}else
pipe = "default_pipe";
} else
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1731,7 +1731,7 @@ mvc_export_table_prot10(backend *b, stre
assert(buf >= bs2_buffer(s).buf);
if (buf - bs2_buffer(s).buf > (lng) bsize) {
- ERROR(SQL_ALL, "Too many bytes in the buffer\b");
+ ERROR(M_ALL, "Too many bytes in the buffer\b");
fres = -1;
goto cleanup;
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -141,10 +141,10 @@ SQLprelude(Client cntxt, MalBlkPtr mb, M
tmp = SQLinit(cntxt);
if (tmp != MAL_SUCCEED) {
- CRITICAL(SQL_ALL, "Fatal error during initialization: %s\n",
tmp);
+ CRITICAL(M_ALL, "Fatal error during initialization: %s\n", tmp);
freeException(tmp);
if ((tmp = GDKerrbuf) && *tmp)
- CRITICAL(SQL_ALL, SQLSTATE(42000) "GDK reported: %s\n",
tmp);
+ CRITICAL(M_ALL, SQLSTATE(42000) "GDK reported: %s\n",
tmp);
fflush(stderr);
exit(1);
}
@@ -440,7 +440,7 @@ SQLinit(Client c)
bstream_next(fdin);
if( MCpushClientInput(c, fdin, 0, "") < 0)
- ERROR(SQL_ALL, "Could not switch client input
stream\n");
+ ERROR(M_ALL, "Could not switch client input stream\n");
}
if ((msg = SQLprepareClient(c, 0)) != NULL) {
MT_lock_unset(&sql_contextLock);
@@ -1043,7 +1043,7 @@ SQLparser(Client c)
be = (backend *) c->sqlcontext;
if (be == 0) {
/* leave a message in the log */
- ERROR(SQL_ALL, "SQL state description is missing, cannot handle
client!\n");
+ ERROR(M_ALL, "SQL state description is missing, cannot handle
client!\n");
/* stop here, instead of printing the exception below to the
* client in an endless loop */
c->mode = FINISHCLIENT;
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1442,7 +1442,7 @@ stmt_uselect(backend *be, stmt *op1, stm
op = ">=";
break;
default:
- ERROR(SQL_ALL, "Unknown operator\n");
+ ERROR(M_ALL, "Unknown operator\n");
}
if ((q = multiplex2(mb, mod, convertOperator(op), l, r,
TYPE_bit)) == NULL)
@@ -1503,7 +1503,7 @@ stmt_uselect(backend *be, stmt *op1, stm
q = pushStr(mb, q, anti?"<":">=");
break;
default:
- ERROR(SQL_ALL, "Impossible select compare\n");
+ ERROR(M_ALL, "Impossible select compare\n");
if (q)
freeInstruction(q);
q = NULL;
@@ -1958,7 +1958,7 @@ stmt_join(backend *be, stmt *op1, stmt *
q = op1->q;
break;
default:
- ERROR(SQL_ALL, "Impossible action\n");
+ ERROR(M_ALL, "Impossible action\n");
}
if (q) {
stmt *s = stmt_create(be->mvc->sa, st_join);
@@ -2347,7 +2347,7 @@ stmt_trans(backend *be, int type, stmt *
q = newStmt(mb, sqlRef, transaction_beginRef);
break;
default:
- ERROR(SQL_ALL, "Unknown transaction type\n");
+ ERROR(M_ALL, "Unknown transaction type\n");
}
q = pushArgument(mb, q, chain->nr);
if (name)
@@ -2422,7 +2422,7 @@ stmt_catalog(backend *be, int type, stmt
case ddl_rename_table: q = newStmt(mb, sqlcatalogRef, rename_tableRef);
break;
case ddl_rename_column: q = newStmt(mb, sqlcatalogRef,
rename_columnRef); break;
default:
- ERROR(SQL_ALL, "Unknown catalog operation\n");
+ ERROR(M_ALL, "Unknown catalog operation\n");
}
// pass all arguments as before
for (n = args->op4.lval->h; n; n = n->next) {
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
@@ -2397,7 +2397,7 @@ SQLupgrades(Client c, mvc *m)
int res = 0;
if (!prev_schema) {
- CRITICAL(SQL_ALL, "Allocation failure while running SQL
upgrades\n");
+ CRITICAL(M_ALL, "Allocation failure while running SQL
upgrades\n");
res = -1;
}
@@ -2406,7 +2406,7 @@ SQLupgrades(Client c, mvc *m)
sql_find_subtype(&tp, "hugeint", 0, 0);
if (!sql_bind_aggr(m->sa, s, "var_pop", &tp)) {
if ((err = sql_update_hugeint(c, m, prev_schema,
&systabfixed)) != NULL) {
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
@@ -2430,7 +2430,7 @@ SQLupgrades(Client c, mvc *m)
/* type sys.point exists: this is an old geom-enabled
* database */
if ((err = sql_update_geom(c, m, 1, prev_schema)) != NULL) {
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
@@ -2441,7 +2441,7 @@ SQLupgrades(Client c, mvc *m)
&tp, NULL, F_FUNC)) {
/* ... but the database is not geom-enabled */
if ((err = sql_update_geom(c, m, 0, prev_schema)) !=
NULL) {
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
@@ -2450,20 +2450,20 @@ SQLupgrades(Client c, mvc *m)
if (!res && mvc_bind_table(m, s, "function_languages") == NULL) {
if ((err = sql_update_jul2017(c, prev_schema)) != NULL) {
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
}
if (!res && (err = sql_update_jul2017_sp2(c)) != NULL) {
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
if (!res && (err = sql_update_jul2017_sp3(c, m, prev_schema,
&systabfixed)) != NULL) {
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
@@ -2472,7 +2472,7 @@ SQLupgrades(Client c, mvc *m)
(col = mvc_bind_column(m, t, "coord_dimension")) != NULL &&
strcmp(col->type.type->sqlname, "int") != 0) {
if ((err = sql_update_mar2018_geom(c, t, prev_schema)) != NULL)
{
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
@@ -2481,21 +2481,21 @@ SQLupgrades(Client c, mvc *m)
if (!res && mvc_bind_schema(m, "wlc") == NULL &&
!sql_bind_func(m->sa, s, "master", NULL, NULL, F_PROC)) {
if ((err = sql_update_mar2018(c, m, prev_schema, &systabfixed))
!= NULL) {
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
#ifdef HAVE_NETCDF
if (mvc_bind_table(m, s, "netcdf_files") != NULL &&
(err = sql_update_mar2018_netcdf(c, prev_schema)) != NULL) {
- ERROR(SQL_ALL, "%s\n", err);
+ ERROR(M_ALL, "%s\n", err);
freeException(err);
res = -1;
}
#endif
#ifdef HAVE_SAMTOOLS
if ((err = sql_update_mar2018_samtools(c, m, prev_schema)) !=
NULL) {
- ERROR(SQL_ALL, "%s\n", err);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
