Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26858/src/server
Modified Files:
sql_statement.mx
Log Message:
do the diff/union with updates before union with inserts
Inserts are allready cleaned for updates, so no need to diff/union there
U sql_statement.mx
Index: sql_statement.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_statement.mx,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- sql_statement.mx 7 Jan 2009 14:19:29 -0000 1.179
+++ sql_statement.mx 21 Jan 2009 20:30:51 -0000 1.180
@@ -1123,9 +1123,9 @@
stmt *i = stmt_bat(c, stmt_dup(basetable), RD_INS );
stmt *u = stmt_bat(c, stmt_dup(basetable), RD_UPD );
- s = stmt_union(s, i);
s = stmt_diff(s, u);
s = stmt_union(s, stmt_dup(u));
+ s = stmt_union(s, i);
}
/* even temp tables have deletes because we like to keep void heads */
if (access == RDONLY && isTable(c->t)) {
@@ -1157,9 +1157,9 @@
stmt *i = stmt_idxbat(idx, RD_INS);
stmt *u = stmt_idxbat(idx, RD_UPD);
- s = stmt_union(s, i);
s = stmt_diff(s, u);
s = stmt_union(s, stmt_dup(u));
+ s = stmt_union(s, i);
}
/* even temp tables have deletes because we like to keep void heads */
if (access == RDONLY && isTable(idx->t)) {
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
