Changeset: c506c4abcbf3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c506c4abcbf3
Modified Files:
gdk/gdk_tracer.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/wlr.c
sql/server/rel_optimizer.c
sql/server/sql_atom.c
sql/server/sql_mvc.c
sql/server/sql_privileges.c
sql/server/sql_symbol.c
sql/storage/bat/bat_table.c
Branch: default
Log Message:
reduced sql tracer components to only 5 parts
(PARSER,EXECUTION,REWRITER,TRANS,STORE)
diffs (truncated from 1210 to 300 lines):
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -114,22 +114,11 @@ typedef enum {
COMP( FITS ) \
COMP( SHP ) \
\
- COMP( SQL_ATOM_TR ) \
- COMP( SQL_STATISTICS ) \
- COMP( SQL_ORDERIDX ) \
- COMP( SQL_OPTIMIZER ) \
- COMP( SQL_WLR ) \
- COMP( SQL_USER ) \
- COMP( SQL_SCENARIO ) \
- COMP( SQL_CACHE_TR ) \
- COMP( SQL_SYMBOL ) \
- COMP( SQL_MVC ) \
+ COMP( SQL_PARSER ) \
+ COMP( SQL_TRANS ) \
+ COMP( SQL_REWRITER ) \
+ COMP( SQL_EXECUTION ) \
COMP( SQL_STORE ) \
- COMP( SQL_UPGRADES ) \
- COMP( SQL_RELATION ) \
- COMP( SQL_RESULT ) \
- COMP( SQL_STATEMENT ) \
- COMP( SQL_BAT ) \
\
COMP( MAL_WLC ) \
COMP( MAL_REMOTE ) \
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
@@ -98,7 +98,7 @@ print_stmtlist(sql_allocator *sa, stmt *
const char *rnme = table_name(sa, n->data);
const char *nme = column_name(sa, n->data);
- TRC_INFO(SQL_RELATION, "%s.%s\n", rnme ? rnme :
"(null!)", nme ? nme : "(null!)");
+ TRC_INFO(SQL_EXECUTION, "%s.%s\n", rnme ? rnme :
"(null!)", nme ? nme : "(null!)");
}
}
}
@@ -740,11 +740,11 @@ exp_bin(backend *be, sql_exp *e, stmt *l
if (s && grp)
s = stmt_project(be, ext, s);
if (!s && right) {
- TRC_CRITICAL(SQL_RELATION, "Could not find %s.%s\n",
(char*)e->l, (char*)e->r);
+ TRC_CRITICAL(SQL_EXECUTION, "Could not find %s.%s\n",
(char*)e->l, (char*)e->r);
print_stmtlist(sql->sa, left);
print_stmtlist(sql->sa, right);
if (!s) {
- TRC_ERROR(SQL_RELATION, "Query: '%s'\n",
sql->query);
+ TRC_ERROR(SQL_EXECUTION, "Query: '%s'\n",
sql->query);
}
assert(s);
return NULL;
@@ -916,7 +916,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
r2 = exp_bin(be, re2, left, right, grp, ext, cnt, sel);
if (!l || !r || (re2 && !r2)) {
- TRC_ERROR(SQL_RELATION, "Query: '%s'\n", sql->query);
+ TRC_ERROR(SQL_EXECUTION, "Query: '%s'\n", sql->query);
return NULL;
}
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -271,7 +271,7 @@ SQLshutdown_wrap(Client cntxt, MalBlkPtr
if ((msg = CLTshutdown(cntxt, mb, stk, pci)) == MAL_SUCCEED) {
/* administer the shutdown in the system log */
- TRC_INFO(SQL_MVC, "Shutdown: %s\n", *getArgReference_str(stk,
pci, 0));
+ TRC_INFO(SQL_TRANS, "Shutdown: %s\n", *getArgReference_str(stk,
pci, 0));
}
return msg;
}
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
@@ -1729,7 +1729,7 @@ mvc_export_table_prot10(backend *b, stre
assert(buf >= bs2_buffer(s).buf);
if (buf - bs2_buffer(s).buf > (lng) bsize) {
- TRC_ERROR(SQL_RESULT, "Too many bytes in the buffer\b");
+ TRC_ERROR(SQL_EXECUTION, "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
@@ -136,10 +136,10 @@ SQLprelude(Client cntxt, MalBlkPtr mb, M
tmp = SQLinit(cntxt);
if (tmp != MAL_SUCCEED) {
- TRC_CRITICAL(SQL_SCENARIO, "Fatal error during initialization:
%s\n", tmp);
+ TRC_CRITICAL(SQL_PARSER, "Fatal error during initialization:
%s\n", tmp);
freeException(tmp);
if ((tmp = GDKerrbuf) && *tmp)
- TRC_CRITICAL(SQL_SCENARIO, SQLSTATE(42000) "GDK
reported: %s\n", tmp);
+ TRC_CRITICAL(SQL_PARSER, SQLSTATE(42000) "GDK reported:
%s\n", tmp);
fflush(stderr);
exit(1);
}
@@ -425,11 +425,11 @@ SQLinit(Client c)
bstream_next(fdin);
if ( MCpushClientInput(c, fdin, 0, "") < 0)
- TRC_ERROR(SQL_SCENARIO, "Could not switch client input
stream\n");
+ TRC_ERROR(SQL_PARSER, "Could not switch client input
stream\n");
}
if ((msg = SQLprepareClient(c, 0)) != NULL) {
MT_lock_unset(&sql_contextLock);
- TRC_INFO(SQL_SCENARIO, "%s\n", msg);
+ TRC_INFO(SQL_PARSER, "%s\n", msg);
return msg;
}
be = c->sqlcontext;
@@ -545,7 +545,7 @@ SQLinit(Client c)
freeException(other);
if (msg)
- TRC_INFO(SQL_SCENARIO, "%s\n", msg);
+ TRC_INFO(SQL_PARSER, "%s\n", msg);
#endif
} else { /* handle upgrades */
if (!m->sa)
@@ -1008,7 +1008,7 @@ SQLparser(Client c)
be = (backend *) c->sqlcontext;
if (be == 0) {
/* leave a message in the log */
- TRC_ERROR(SQL_SCENARIO, "SQL state description is missing,
cannot handle client!\n");
+ TRC_ERROR(SQL_PARSER, "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;
@@ -1351,8 +1351,6 @@ SQLCacheRemove(Client c, str nme)
{
Symbol s;
- TRC_DEBUG(SQL_CACHE_TR, "SQLCache remove %s\n", nme);
-
s = findSymbolInModule(c->usermodule, nme);
if (s == NULL)
throw(MAL, "cache.remove", SQLSTATE(42000) "internal error,
symbol missing\n");
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
@@ -1441,7 +1441,7 @@ stmt_uselect(backend *be, stmt *op1, stm
op = ">=";
break;
default:
- TRC_ERROR(SQL_STATEMENT, "Unknown operator\n");
+ TRC_ERROR(SQL_EXECUTION, "Unknown operator\n");
}
if ((q = multiplex2(mb, mod, convertOperator(op), l, r,
TYPE_bit)) == NULL)
@@ -1502,7 +1502,7 @@ stmt_uselect(backend *be, stmt *op1, stm
q = pushStr(mb, q, anti?"<":">=");
break;
default:
- TRC_ERROR(SQL_STATEMENT, "Impossible select
compare\n");
+ TRC_ERROR(SQL_EXECUTION, "Impossible select
compare\n");
if (q)
freeInstruction(q);
q = NULL;
@@ -1946,7 +1946,7 @@ stmt_join(backend *be, stmt *op1, stmt *
q = op1->q;
break;
default:
- TRC_ERROR(SQL_STATEMENT, "Impossible action\n");
+ TRC_ERROR(SQL_EXECUTION, "Impossible action\n");
}
if (q) {
stmt *s = stmt_create(be->mvc->sa, st_join);
@@ -2365,7 +2365,7 @@ stmt_trans(backend *be, int type, stmt *
q = newStmt(mb, sqlRef, transaction_beginRef);
break;
default:
- TRC_ERROR(SQL_STATEMENT, "Unknown transaction type\n");
+ TRC_ERROR(SQL_EXECUTION, "Unknown transaction type\n");
}
q = pushArgument(mb, q, chain->nr);
if (name)
@@ -2440,7 +2440,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:
- TRC_ERROR(SQL_STATEMENT, "Unknown catalog operation\n");
+ TRC_ERROR(SQL_EXECUTION, "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_statistics.c
b/sql/backends/monet5/sql_statistics.c
--- a/sql/backends/monet5/sql_statistics.c
+++ b/sql/backends/monet5/sql_statistics.c
@@ -103,7 +103,7 @@ sql_analyze(Client cntxt, MalBlkPtr mb,
sch = *getArgReference_str(stk, pci, 3);
}
- TRC_DEBUG(SQL_STATISTICS, "analyze %s.%s.%s sample " LLFMT "%s\n", (sch
? sch : ""), (tbl ? tbl : " "), (col ? col : " "), samplesize,
(minmax)?"MinMax":"");
+ TRC_DEBUG(SQL_PARSER, "analyze %s.%s.%s sample " LLFMT "%s\n", (sch ?
sch : ""), (tbl ? tbl : " "), (col ? col : " "), samplesize,
(minmax)?"MinMax":"");
for (nsch = tr->schemas.set->h; nsch; nsch = nsch->next) {
sql_base *b = nsch->data;
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
@@ -2956,7 +2956,7 @@ SQLupgrades(Client c, mvc *m)
int res = 0;
if (!prev_schema) {
- TRC_CRITICAL(SQL_UPGRADES, "Allocation failure while running
SQL upgrades\n");
+ TRC_CRITICAL(SQL_PARSER, "Allocation failure while running SQL
upgrades\n");
res = -1;
}
@@ -2965,7 +2965,7 @@ SQLupgrades(Client c, mvc *m)
sql_find_subtype(&tp, "hugeint", 0, 0);
if (!sql_bind_func(m->sa, s, "var_pop", &tp, NULL, F_AGGR)) {
if ((err = sql_update_hugeint(c, m, prev_schema,
&systabfixed)) != NULL) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%s\n", err);
freeException(err);
res = -1;
}
@@ -2989,7 +2989,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) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%s\n", err);
freeException(err);
res = -1;
}
@@ -3000,7 +3000,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) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%s\n", err);
freeException(err);
res = -1;
}
@@ -3009,20 +3009,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) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%s\n", err);
freeException(err);
res = -1;
}
}
if (!res && (err = sql_update_jul2017_sp2(c)) != NULL) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%s\n", err);
freeException(err);
res = -1;
}
if (!res && (err = sql_update_jul2017_sp3(c, m, prev_schema,
&systabfixed)) != NULL) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%s\n", err);
freeException(err);
res = -1;
}
@@ -3031,7 +3031,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)
{
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%s\n", err);
freeException(err);
res = -1;
}
@@ -3040,14 +3040,14 @@ 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) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%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) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
+ TRC_ERROR(SQL_PARSER, "%s\n", err);
freeException(err);
res = -1;
}
@@ -3056,7 +3056,7 @@ SQLupgrades(Client c, mvc *m)
if (!res && sql_bind_func(m->sa, s,
"dependencies_functions_os_triggers", NULL, NULL, F_UNION)) {
if ((err = sql_update_mar2018_sp1(c, prev_schema)) != NULL) {
- TRC_ERROR(SQL_UPGRADES, "%s\n", err);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
