Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10695
Modified Files:
sql.mx sql_gencode.mx sql_scenario.mx
Log Message:
Fix profile step 1...
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- sql_scenario.mx 25 Mar 2008 11:23:54 -0000 1.299
+++ sql_scenario.mx 25 Mar 2008 14:28:20 -0000 1.300
@@ -464,7 +464,7 @@
SQLcacheRefresh(mvc *m){
if (m && !m->session->active) {
int schema_changed = mvc_trans(m);
- if (m->cache && (schema_changed || m->qc->id > 1000)){
+ if (m->cache && (schema_changed || m->qc->id > 10000)){
if (m->qc)
qc_destroy(m->qc);
m->qc = qc_create(m->clientid);
@@ -881,7 +881,6 @@
backend *be;
mvc *m;
int oldvtop,oldstop;
- lng T0 = 0;
int pstatus = 0;
int err = 0;
@@ -971,13 +970,6 @@
throw(SQL, "SQLparser", "Unrecognized language prefix");
}
- if( be->mvc->mode == m_profile ) {
- T0 = GDKusec();
-#ifdef HAVE_TIMES
- times(&be->mvc->times);
-#endif
- }
-
if ((err = sqlparse(m)) && m->debug&1){
/* switch to different language mode */
char oldlang= be->language;
@@ -1090,7 +1082,7 @@
SQLsetTimer(c, FALSE);
if (be->mvc->mode == m_profile ) {
- be->Tparse = GDKusec() - T0;
+ be->mvc->Tparse = GDKusec() - be->mvc->Tparse;
be->qry = sql_escape_str(QUERY(m->scanner));
}
scanner_query_processed(&(m->scanner));
@@ -1250,7 +1242,7 @@
(void)ret;
c->mode = mode;
c->explain = explain;
- be->Tparse= be->Toptimize = be->Tschedule = be->Texec = 0;
+ be->mvc->Tparse= be->mvc->Toptimize = be->mvc->Tschedule =
be->mvc->Texec = 0;
return msg;
}
@@ -1369,9 +1361,9 @@
if (m->mode== m_profile) {
int tcks_per_sec = sysconf(_SC_CLK_TCK);
struct tms t1;
- lng tot = be->Tparse;
+ lng tot = be->mvc->Tparse;
- tot += be->Texec = GDKusec() - T0;
+ tot += be->mvc->Texec = GDKusec() - T0;
#ifdef HAVE_TIMES
times(&t1);
stream_printf(
@@ -1382,7 +1374,7 @@
(lng) (t1.tms_stime - be->mvc->times.tms_stime),
tcks_per_sec);
#endif
- msg = backend_profile(be, be->qry, be->Tparse-be->Toptimize,
be->Toptimize, be->Texec, tot);
+ msg = backend_profile(be, be->qry,
be->mvc->Tparse-be->mvc->Toptimize, be->mvc->Toptimize, be->mvc->Texec, tot);
be->qry = NULL;
}
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- sql_gencode.mx 21 Mar 2008 09:39:35 -0000 1.271
+++ sql_gencode.mx 25 Mar 2008 14:28:20 -0000 1.272
@@ -1911,9 +1911,9 @@
pushEndInstruction(curBlk);
if (cq){
- be->Toptimize = GDKusec();
+ be->mvc->Toptimize = GDKusec();
addQueryToCache(c);
- be->Toptimize = GDKusec()- be->Toptimize;
+ be->mvc->Toptimize = GDKusec()- be->mvc->Toptimize;
}
/* not yet used
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- sql.mx 21 Mar 2008 09:39:32 -0000 1.260
+++ sql.mx 25 Mar 2008 14:28:20 -0000 1.261
@@ -680,12 +680,6 @@
sql_idx *currIndex;
int vtop; /* top of the variable stack before the current
function */
cq *q; /* pointer to the cached query */
[EMAIL PROTECTED]
-Some statistics are gathered during the execution of a query
-and added to the SQL history table for post analysis when the
-query has been successfully executed.
[EMAIL PROTECTED]
- lng Tparse, Toptimize, Tschedule, Texec;
str qry;
} backend;
@@ -895,7 +889,6 @@
b->currKey = NULL;
b->currIndex = NULL;
b->vtop = 0;
- b->Tparse = b->Toptimize = b->Tschedule = b->Texec = 0;
b->qry = NULL;
b->q = NULL;
return b;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
