Changeset: 788ee4055df0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=788ee4055df0
Modified Files:
        clients/mapiclient/mclient.c
Branch: Jan2014
Log Message:

Just print timer information when using -ftimer for update queries.


diffs (38 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1483,6 +1483,7 @@ format_result(Mapi mid, MapiHdl hdl, cha
                        continue;
                }
 
+               timerHumanStop();
                switch (mapi_get_querytype(hdl)) {
                case Q_BLOCK:
                case Q_PARSE:
@@ -1493,8 +1494,9 @@ format_result(Mapi mid, MapiHdl hdl, cha
                        if (formatter == RAWformatter ||
                            formatter == TESTformatter)
                                mnstr_printf(toConsole, "[ " LLFMT "\t]\n", 
mapi_rows_affected(hdl));
+                       else if (formatter == TIMERformatter)
+                               printf("%s\n", timerHuman());
                        else {
-                               timerHumanStop();
                                aff = mapi_rows_affected(hdl);
                                lid = mapi_get_last_id(hdl);
                                mnstr_printf(toConsole,
@@ -1515,7 +1517,6 @@ format_result(Mapi mid, MapiHdl hdl, cha
                        continue;
                case Q_SCHEMA:
                        SQLqueryEcho(hdl);
-                       timerHumanStop();
                        if (formatter == TABLEformatter) {
                                mnstr_printf(toConsole, "operation successful");
                                if (singleinstr)
@@ -1541,7 +1542,6 @@ format_result(Mapi mid, MapiHdl hdl, cha
                                             mapi_get_tableid(hdl));
                        /* fall through */
                case Q_TABLE:
-                       timerHumanStop();
                        break;
                default:
                        if (formatter == TABLEformatter && specials != 
DEBUGmodifier) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to