Changeset: 4ee9901db3f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4ee9901db3f9
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
Remove timestamp leftovers from profilerEvent calls
diffs (79 lines):
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
@@ -137,16 +137,13 @@ sql_symbol2relation(backend *be, symbol
{
sql_rel *rel;
sql_query *query = query_create(be->mvc);
- lng Tbegin, Tend;
int value_based_opt = be->mvc->emode != m_prepare, storage_based_opt;
int profile = be->mvc->emode == m_plan;
- Tbegin = GDKusec();
rel = rel_semantic(query, sym);
- Tend = GDKusec();
-
+
+ lng t_begin = GDKusec();
storage_based_opt = value_based_opt && rel && !is_ddl(rel->op);
- Tbegin = Tend;
if (rel && !(rel->op == op_ddl && rel->card == CARD_ATOM && rel->flag
== ddl_psm && (be->mvc->emod & mod_exec) != 0)) { /* no need to optimize exec */
if (rel)
rel = sql_processrelation(be->mvc, rel, profile, 1,
value_based_opt, storage_based_opt);
@@ -155,8 +152,7 @@ sql_symbol2relation(backend *be, symbol
if (rel)
rel = rel_physical(be->mvc, rel);
}
- Tend = GDKusec();
- be->reloptimizer = Tend - Tbegin;
+ be->reloptimizer = GDKusec() - t_begin;
return rel;
}
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
@@ -1394,7 +1394,6 @@ SQLparser_body(Client c, backend *be)
{
str msg = MAL_SUCCEED;
mvc *m = be->mvc;
- lng Tbegin = 0, Tend = 0;
int pstatus = m->session->status;
@@ -1403,7 +1402,7 @@ SQLparser_body(Client c, backend *be)
m->emode = m_normal;
m->emod = mod_none;
c->query = NULL;
- c->qryctx.starttime = Tbegin = Tend = GDKusec();
+ c->qryctx.starttime = GDKusec();
c->qryctx.endtime = c->querytimeout ? c->qryctx.starttime +
c->querytimeout : 0;
if ((err = sqlparse(m)) ||
@@ -1505,8 +1504,6 @@ SQLparser_body(Client c, backend *be)
be->subbackend->reset(be->subbackend);
}
- Tbegin = GDKusec();
-
int opt = 0;
if (m->emode == m_prepare && (m->emod & mod_exec)) {
/* generated the named parameters for the
placeholders */
@@ -1530,7 +1527,6 @@ SQLparser_body(Client c, backend *be)
} else
opt = ((m->emod & mod_exec) == 0); /* no need
to optimize prepare - execute */
- Tend = GDKusec();
if (err)
m->session->status = -10;
if (err == 0) {
@@ -1542,9 +1538,7 @@ SQLparser_body(Client c, backend *be)
msg = chkTypes(c->usermodule,
c->curprg->def, TRUE);
if (msg == MAL_SUCCEED && opt) {
- Tbegin = Tend;
msg = SQLoptimizeQuery(c,
c->curprg->def);
- Tend = GDKusec();
if (msg != MAL_SUCCEED) {
str other =
c->curprg->def->errors;
c->curprg->def->errors = 0;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
