Changeset: e43e5ddf3ca3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e43e5ddf3ca3
Modified Files:
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_querylog.c
Branch: default
Log Message:
Add missing space in "actions=1" output to get same alignment as other
"actions=%2d" outputs
For instance in query: explain select count(*) from keywords; now produces
correct aligmnet for #profiler and #candidates lines:
sql>explain select count(*) from keywords;
+-----------------------------------------------------------------------------------------------------------+
| mal
|
+===========================================================================================================+
| function user.s8_1():void;
|
| X_1:void := querylog.define("explain select count(*) from keywords;":str,
"default_pipe":str, 9:int); |
| barrier X_66:bit := language.dataflow();
|
| X_4:int := sql.mvc();
|
| C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "keywords":str);
|
| X_8:bat[:str] := sql.bind(X_4:int, "sys":str, "keywords":str,
"keyword":str, 0:int); |
| X_11:bat[:str] := algebra.projection(C_5:bat[:oid], X_8:bat[:str]);
|
| X_12:lng := aggr.count(X_11:bat[:str]);
|
| exit X_66:bit;
|
| sql.resultSet("sys.L3":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_12:lng); |
| end user.s8_1;
|
| #inline actions= 0 time=1 usec
|
| #remap actions= 0 time=1 usec
|
| #costmodel actions= 1 time=1 usec
|
| #coercion actions= 0 time=1 usec
|
| #evaluate actions= 0 time=4 usec
|
| #emptybind actions= 0 time=0 usec
|
| #pushselect actions= 0 time=5 usec
|
| #aliases actions= 0 time=0 usec
|
| #mergetable actions= 0 time=27 usec
|
| #deadcode actions= 0 time=5 usec
|
| #aliases actions= 0 time=0 usec
|
| #constants actions= 0 time=3 usec
|
| #commonTerms actions= 0 time=3 usec
|
| #projectionpath actions= 0 time=2 usec
|
| #deadcode actions= 0 time=5 usec
|
| #reorder actions= 1 time=18 usec
|
| #matpack actions= 0 time=1 usec
|
| #dataflow actions= 1 time=12 usec
|
| #multiplex actions= 0 time=1 usec
|
| #profiler actions= 1 time=1 usec
|
| #candidates actions= 1 time=1 usec
|
| #deadcode actions= 0 time=4 usec
|
| #wlc actions= 0 time=0 usec
|
| #garbagecollector actions= 1 time=44 usec
|
| #total actions=28 time=272 usec
|
+-----------------------------------------------------------------------------------------------------------+
36 tuples
sql
diffs (76 lines):
diff --git a/monetdb5/optimizer/opt_candidates.c
b/monetdb5/optimizer/opt_candidates.c
--- a/monetdb5/optimizer/opt_candidates.c
+++ b/monetdb5/optimizer/opt_candidates.c
@@ -82,11 +82,11 @@ OPTcandidatesImplementation(Client cntxt
//chkTypes(cntxt->usermodule, mb, FALSE);
//chkFlow(mb);
//chkDeclarations(mb);
- /* keep all actions taken as a post block comment */
+
+ /* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","candidates",usec);
- newComment(mb,buf);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT "
usec","candidates",usec);
+ newComment(mb,buf);
addtoMalBlkHistory(mb);
-
return MAL_SUCCEED;
}
diff --git a/monetdb5/optimizer/opt_macro.c b/monetdb5/optimizer/opt_macro.c
--- a/monetdb5/optimizer/opt_macro.c
+++ b/monetdb5/optimizer/opt_macro.c
@@ -510,7 +510,7 @@ str OPTmacro(Client cntxt, MalBlkPtr mb,
chkDeclarations(mb);
usec += GDKusec() - clk;
/* keep all actions taken as a post block comment */
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","macro",usec);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT " usec","macro",usec);
newComment(mb,buf);
addtoMalBlkHistory(mb);
if (mb->errors)
@@ -553,7 +553,7 @@ str OPTorcam(Client cntxt, MalBlkPtr mb,
usec += GDKusec() - clk;
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","orcam",usec);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT " usec","orcam",usec);
newComment(mb,buf);
addtoMalBlkHistory(mb);
if (mb->errors)
diff --git a/monetdb5/optimizer/opt_profiler.c
b/monetdb5/optimizer/opt_profiler.c
--- a/monetdb5/optimizer/opt_profiler.c
+++ b/monetdb5/optimizer/opt_profiler.c
@@ -110,11 +110,11 @@ OPTprofilerImplementation(Client cntxt,
//chkTypes(cntxt->usermodule, mb, FALSE);
//chkFlow(mb);
//chkDeclarations(mb);
- //
- /* keep all actions taken as a post block comment */
+
+ /* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","profiler", usec);
- newComment(mb,buf);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT " usec","profiler",
usec);
+ newComment(mb,buf);
addtoMalBlkHistory(mb);
return MAL_SUCCEED;
}
diff --git a/monetdb5/optimizer/opt_querylog.c
b/monetdb5/optimizer/opt_querylog.c
--- a/monetdb5/optimizer/opt_querylog.c
+++ b/monetdb5/optimizer/opt_querylog.c
@@ -195,10 +195,10 @@ OPTquerylogImplementation(Client cntxt,
chkFlow(mb);
chkDeclarations(mb);
}
- /* keep all actions taken as a post block comment */
+ /* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","querylog", usec);
- newComment(mb,buf);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT " usec","querylog",
usec);
+ newComment(mb,buf);
addtoMalBlkHistory(mb);
return msg;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
