Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5307
Modified Files:
sql.mx sql_optimizer.mx sql_scenario.mx
Log Message:
Patches for Niels
U sql_scenario.mx
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- sql_scenario.mx 7 Aug 2008 09:05:35 -0000 1.315
+++ sql_scenario.mx 12 Aug 2008 09:56:40 -0000 1.316
@@ -614,7 +614,7 @@
#ifdef _SQL_COMPILE
stream_printf(c->fdout,"result of sql.eval()\n");
- printFunction(c->fdout, c->curprg->def, c->listing);
+ printFunction(c->fdout, c->curprg->def, 0, c->listing);
#endif
if ( execute) {
@@ -1119,7 +1119,7 @@
@c
finalize:
if (m->emode == m_explain && be->q && be->q->code)
- printFunction(GDKout, ((Symbol)(be->q->code))->def,
LIST_MAL_INSTR | LIST_MAL_PROPS | LIST_MAPI );
+ printFunction(GDKout, ((Symbol)(be->q->code))->def, 0,
LIST_MAL_INSTR | LIST_MAL_PROPS | LIST_MAPI );
@-
Gather the statistics for post analysis. It should preferably
be stored in an SQL table
@@ -1151,7 +1151,7 @@
#ifdef DEBUG_CALLMAL
stream_printf(GDKout,"SQLexecute\n");
- printFunction(GDKout, ((Symbol)q->code)->def, LIST_MAL_ALL);
+ printFunction(GDKout, ((Symbol)q->code)->def, 0, LIST_MAL_ALL);
#endif
mb = ((Symbol)q->code)->def;
pci = getInstrPtr(mb,0);
@@ -1199,7 +1199,7 @@
glb = (MalStkPtr)(q->stk);
ret= callMAL(c, mb, &glb, argv, (m->emod & mod_debug?'n':0));
if (ret && SQLdebug&16)
- printFunction(c->fdout, mb,
+ printFunction(c->fdout, mb, 0,
LIST_MAL_INSTR | LIST_MAL_PROPS | LIST_MAPI);
/* cleanup the arguments */
for(i=pci->retc; i<pci->argc; i++) {
@@ -1324,7 +1324,7 @@
InstrPtr p;
p = getInstrPtr(c->curprg->def,1);
if (p->blk)
- printFunction(c->fdout, p->blk, c->listing |
LIST_MAPI );
+ printFunction(c->fdout, p->blk, 0, c->listing |
LIST_MAPI );
}
c->curprg->def->errors = -1; /* don;t execute */
}
U sql_optimizer.mx
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- sql_optimizer.mx 7 Aug 2008 09:05:34 -0000 1.190
+++ sql_optimizer.mx 12 Aug 2008 09:56:40 -0000 1.191
@@ -171,7 +171,7 @@
#ifdef _SQL_OPTIMIZER_DEBUG
stream_printf(GDKout, "First call to FXoptimizer\n");
- printFunction(GDKout, mb, LIST_MAL_ALL);
+ printFunction(GDKout, mb, stk, LIST_MAL_ALL);
#endif
(void) cntxt;
(void)stk;
@@ -269,7 +269,7 @@
the cache when the underlying table is changed.
@c
#ifdef _SQL_OPTIMIZER_DEBUG
- printFunction(GDKout, mb, LIST_MAL_INSTR);
+ printFunction(GDKout, mb, stk, LIST_MAL_INSTR);
#endif
return MAL_SUCCEED;
}
@@ -454,7 +454,8 @@
"coercions,"
"emptySet,"
/* "joinselect," */
- "accessmode,"
+ /* "accessmode," not needed after patches to BKCappend */
+ /*"mitosis,"*/
"aliases,"
/* "crack," */
/*"joinPath,"*/
@@ -465,8 +466,8 @@
"deadcode,"
/*"recycle,"*/
"reduce,"
- "garbageCollector,"
- "dataflow,"
+ /* "garbageCollector," */
+ "dataflow,"
"multiplex";
static str minimalPlan=
"multiplex";
@@ -528,7 +529,7 @@
chkProgram(c->nspace, mb);
#ifdef _SQL_OPTIMIZER_DEBUG
printf("ADD QUERY TO CACHE\n");
- printFunction(GDKout,mb,LIST_MAL_ALL);
+ printFunction(GDKout,mb,0,LIST_MAL_ALL);
#endif
@-
An error in the compilation should be reported to the user.
@@ -541,7 +542,7 @@
showErrors(c);
if (c->listing)
- printFunction(c->fdout, mb, c->listing);
+ printFunction(c->fdout, mb,0, c->listing);
if ( m->debug )
runMALDebugger(c,c->curprg);
return;
@@ -611,7 +612,7 @@
(void) c;
#ifdef _SQL_OPTIMIZER_DEBUG
stream_printf(GDKout, "SQLoptimizer\n");
- printFunction(c->fdout, c->curprg->def, LIST_MAL_INSTR);
+ printFunction(c->fdout, c->curprg->def,0, LIST_MAL_INSTR);
stream_printf(GDKout, "done\n");
#endif
return MAL_SUCCEED;
U sql.mx
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- sql.mx 7 Aug 2008 09:05:32 -0000 1.274
+++ sql.mx 12 Aug 2008 09:56:38 -0000 1.275
@@ -115,19 +115,27 @@
address mvc_restart_seq
comment "restart the sequence with value start";
-pattern bind_dbat(sname:str, tname:str, access:int):bat[:oid,:oid]
+pattern bind_dbat(schema:str, table:str, access:int):bat[:oid,:oid]
address mvc_bind_dbat_wrap
-comment "Bind the table deletes bat, tname.delete
- with specific access modes";
+comment "Bind to 'schema.table' BAT with deleted objecs
+and with specific access kind:
+ 0 - base table
+ 1 - inserts
+ 2 - updates";
-pattern bind_idxbat(sname:str, tname:str, iname:str,
access:int):bat[:oid,:any_1]
+pattern bind_idxbat(schema:str, table:str, index:str,
access:int):bat[:oid,:any_1]
address mvc_bind_idxbat_wrap
-comment "Bind the idx bat, tname.idx
- with specific accsess modes";
+comment "Bind the 'schema.table.index' BAT with access kind:
+ 0 - base table
+ 1 - inserts
+ 2 - updates";
-pattern bind(sname:str, tname:str, cname:str, access:int ):bat[:oid,:any_1]
+pattern bind(schema:str, table:str, column:str, access:int ):bat[:oid,:any_1]
address mvc_bind_wrap
-comment "Bind the bat tname.cname into the focus with specific access mode";
+comment "Bind the 'schema.table.column' BAT with access kind:
+ 0 - base table
+ 1 - inserts
+ 2 - updates";
pattern append{unsafe}(sname:str, tname:str, cname:str, ins:any ):void
address mvc_append_wrap
-------------------------------------------------------------------------
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
