Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29111/src/server
Modified Files:
sql_mvc.mx sql_env.mx
Log Message:
in sql_env.mx we only set history if the keep and call query functions are
there.
in sql_mvc.mx we only need Tparse (Toptimize/Texec etc were not used anymore)
sql/src/history.sql don't include the init* hacks
sql.mx cleanup (removed no longer used code and qry field in backend structure)
sql_scenario.mx more cleanup (backend_record wasn't used anymore)
sql_gencode.mx
put call too queryid and keepquery in comments after the sql generated
function
initialize the keepquery and callquery procs once (when they are needed)
U sql_mvc.mx
Index: sql_mvc.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_mvc.mx,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- sql_mvc.mx 3 Nov 2008 15:32:04 -0000 1.212
+++ sql_mvc.mx 4 Nov 2008 11:38:15 -0000 1.213
@@ -124,7 +124,7 @@
and added to the SQL history table for post analysis when the
query has been successfully executed.
@h
- lng Tstart, Tparse, Toptimize, Tschedule, Texec;
+ lng Tparse;
} mvc;
extern int mvc_init(int debug, store_type store, backend_stack stk);
U sql_env.mx
Index: sql_env.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_env.mx,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- sql_env.mx 3 Nov 2008 15:32:04 -0000 1.73
+++ sql_env.mx 4 Nov 2008 11:38:16 -0000 1.74
@@ -55,7 +55,6 @@
extern str sql_update_var(mvc *sql, char *name);
extern int sql_create_env(mvc *sql, sql_schema *s);
-extern int sql_create_history(mvc *sql, sql_schema *tmp);
#endif /* _SQL_ENV_H_ */
@@ -110,9 +109,14 @@
assert((lng) GDK_int_min <= sgn && sgn <= (lng) GDK_int_max);
m->cache = (int) sgn;
} else if (strcmp(name, "history") == 0) {
+ sql_schema *sys = mvc_bind_schema(m, "sys");
+
sgn = stack_get_number(m, "history");
assert((lng) GDK_int_min <= sgn && sgn <= (lng) GDK_int_max);
- m->history = (int) sgn;
+ if (!sql_find_func(sys, "keepquery", 4) ||
+ !sql_find_func(sys, "keepcall", 6))
+ return sql_message( "Cannot activate history because
the keepQuery and keepCall procedures are not available\n" );
+ m->history = (int) (sgn)?1:0;
}
return NULL;
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
