Changeset: 70c3e94a3a64 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/70c3e94a3a64
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/mal/mal_profiler.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_scenario.c
Branch: sql_profiler
Log Message:
Make sql event more inline with mal events.
diffs (177 lines):
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -209,7 +209,7 @@ MCexitClient(Client c)
}
if(malProfileMode > 0)
- genericEvent("End client connection.",
+ genericEvent("client_connection",
(struct GenericEvent)
{ &c->idx,
(oid)NULL,
@@ -313,7 +313,7 @@ MCinitClient(oid user, bstream *fin, str
assert(NULL == setClientContext(c));
c = MCinitClientRecord(c, user, fin, fout);
if(malProfileMode > 0)
- genericEvent("Start client connection.",
+ genericEvent("client_connection",
(struct GenericEvent)
{ &c->idx,
(oid)NULL,
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -184,30 +184,38 @@ logadd(struct logbuf *logbuf, const char
* Profiling a generic event follows the same implementation of ProfilerEvent.
*/
static str
-prepareGenericEvent(str msg, struct GenericEvent e, int state)
+prepareGenericEvent(str face, struct GenericEvent e, int state)
{
struct logbuf logbuf = {0};
lng clk = GDKusec();
+ uint64_t mclk = (uint64_t)clk - ((uint64_t)startup_time.tv_sec*1000000
- (uint64_t)startup_time.tv_usec);
if (logadd(&logbuf,
"{"
- "\"clk\":"LLFMT
- ",\"msg\":\"%s\""
+ "\"version\":\""MONETDB_VERSION" (hg id: %s)\""
+ /* ",\"user\":"OIDFMT */
+ ",\"clk\":"LLFMT
+ ",\"mclk\":%"PRIu64""
+ ",\"thread\":%d"
+ ",\"face\":\"%s\""
+ ",\"state\":\"%s\""
",\"client_id\":\"%d\""
+ ",\"transaction_id\":\"%d\""
",\"tag\":\""OIDFMT
- ",\"transaction_id\":\"%d\""
",\"query\":\"%s\""
",\"error\":\"%s\""
- ",\"state\":\"%s\""
"}\n",
+ mercurial_revision(),
clk,
- msg ? msg : "",
+ mclk,
+ THRgettid(),
+ face,
+ state ? "done" : "start",
e.client_id ? *(e.client_id) : -1,
+ e.transaction_id ? *e.transaction_id : 0,
e.tag ? e.tag : (oid)-1,
- e.transaction_id ? *e.transaction_id : 0,
e.query ? e.query : "none",
- e.error ? "true" : "false",
- state ? "done" : "start"))
+ e.error ? "true" : "false"))
return logbuf.logbuffer;
else {
logdel(&logbuf);
@@ -277,7 +285,7 @@ prepareProfilerEvent(Client cntxt, MalBl
if(malprofileruser!= MAL_ADMIN && malprofileruser != cntxt->user)
return NULL;
-/* align the variable namings with EXPLAIN and TRACE */
+ /* align the variable namings with EXPLAIN and TRACE */
if( pci->pc == 1 && start)
renameVariables(mb);
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
@@ -130,7 +130,7 @@ sql_symbol2relation(backend *be, symbol
Client c = getClientContext();
if(malProfileMode > 0 )
- genericEvent("Start SQL compiler",
+ genericEvent("sql_to_rel",
(struct GenericEvent)
{ &(c->idx),
c->curprg->def->tag,
@@ -142,7 +142,7 @@ sql_symbol2relation(backend *be, symbol
rel = rel_semantic(query, sym);
if(malProfileMode > 0 ) {
- genericEvent("End SQL compiler",
+ genericEvent("sql_to_rel",
(struct GenericEvent)
{ &(c->idx),
c->curprg->def->tag,
@@ -150,7 +150,7 @@ sql_symbol2relation(backend *be, symbol
NULL,
rel ? 1 : 0 },
1);
- genericEvent("Start relational optimizer",
+ genericEvent("rel_opt",
(struct GenericEvent)
{ &(c->idx),
c->curprg->def->tag,
@@ -171,7 +171,7 @@ sql_symbol2relation(backend *be, symbol
be->reloptimizer = GDKusec() - Tbegin;
if(malProfileMode > 0)
- genericEvent("End relational optimizer.",
+ genericEvent("rel_opt",
(struct GenericEvent)
{ &c->idx,
c->curprg->def->tag,
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
@@ -1111,7 +1111,7 @@ SQLparser(Client c)
(void) tag;
if(malProfileMode > 0)
- genericEvent("Start SQL parser.",
+ genericEvent("sql_parse",
(struct GenericEvent)
{ &c->idx,
c->curprg->def->tag,
@@ -1147,7 +1147,7 @@ SQLparser(Client c)
c->query = query_cleaned(m->sa, QUERY(m->scanner));
if(malProfileMode > 0)
- genericEvent("End SQL parser.",
+ genericEvent("sql_parse",
(struct GenericEvent)
{ &c->idx,
c->curprg->def->tag,
@@ -1212,7 +1212,7 @@ SQLparser(Client c)
}
if(malProfileMode > 0)
- genericEvent("Start MAL compiler.",
+ genericEvent("rel_to_mal",
(struct GenericEvent)
{ &c->idx,
c->curprg->def->tag,
@@ -1227,7 +1227,7 @@ SQLparser(Client c)
opt = (m->emod & mod_exec) == 0;//1;
if(malProfileMode > 0)
- genericEvent("End MAL compiler.",
+ genericEvent("rel_to_mal",
(struct GenericEvent)
{ &c->idx,
c->curprg->def->tag,
@@ -1314,7 +1314,7 @@ SQLparser(Client c)
if (msg == MAL_SUCCEED && opt ) {
if(malProfileMode > 0)
- genericEvent("Start MAL optimizer.",
+ genericEvent("mal_opt",
(struct GenericEvent)
{ &c->idx,
c->curprg->def->tag,
@@ -1326,7 +1326,7 @@ SQLparser(Client c)
msg = SQLoptimizeQuery(c, c->curprg->def);
if(malProfileMode > 0)
- genericEvent("End MAL optimizer.",
+ genericEvent("mal_opt",
(struct GenericEvent)
{ &c->idx,
c->curprg->def->tag,
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
