Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18927/backends/monet5
Modified Files:
Makefile.ag sql.mx sql_scenario.mx
Log Message:
use the new ro,su, and suro storage variants
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- sql_scenario.mx 11 Jan 2008 10:51:58 -0000 1.291
+++ sql_scenario.mx 15 Jan 2008 10:42:53 -0000 1.292
@@ -224,8 +224,11 @@
(void) tz;
if (debug_str)
SQLdebug = strtol(debug_str,NULL,10);
- if (((SQLdebug&16)!=0 && mvc_init(FALSE, store_bpm, 0) < 0) ||
- ((SQLdebug&16)==0 && mvc_init(FALSE, store_bat, 0) < 0))
+ if (((SQLdebug&16)==16 && mvc_init(FALSE, store_bpm, 0) < 0) ||
+ ((SQLdebug&96)==96 && mvc_init(FALSE, store_suro, 0) < 0) ||
+ ((SQLdebug&96)==64 && mvc_init(FALSE, store_su, 0) < 0) ||
+ ((SQLdebug&96)==32 && mvc_init(FALSE, store_ro, 0) < 0) ||
+ ((SQLdebug&112)==0 && mvc_init(FALSE, store_bat, 0) < 0))
throw(SQL, "SQLinit", "Catalogue initialization failed");
SQLinitialized = TRUE;
if (!GDKembedded && MT_create_thread(&sqllogthread, (void (*)(void *))
mvc_logmanager, NULL) < 0) {
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/Makefile.ag,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.ag 11 Jan 2008 10:51:57 -0000 1.54
+++ Makefile.ag 15 Jan 2008 10:42:52 -0000 1.55
@@ -32,7 +32,7 @@
sql_result.mx \
sql_readline.mx \
sql_bpm.mx
- LIBS = ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/bpm/libbpmstore
../../common/libsqlcommon \
+ LIBS = ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/restrict/librestrictstore
../../storage/bpm/libbpmstore ../../common/libsqlcommon \
$(MONETDB5_MODS) -l_blob -l_logger -l_mtime -l_bat5
-l_optimizer -l_tablet -l_bpm $(MONETDB5_LIBS) -lmal \
$(MONETDB_LIBS) -lbat -lstream $(READLINE_LIBS) $(PTHREAD_LIBS)
}
@@ -40,14 +40,14 @@
lib_embeddedsql5 = {
SOURCES = embeddedclient.mx
- LIBS = ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/bpm/libbpmstore
../../common/libsqlcommon \
+ LIBS = ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/restrict/librestrictstore
../../storage/bpm/libbpmstore ../../common/libsqlcommon \
$(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet -l_bpm
$(MONETDB5_LIBS) -lmal \
$(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(READLINE_LIBS) $(PTHREAD_LIBS)
}
bin_Mbeddedsql5 = {
SOURCES = prog.c
- LIBS = libembeddedsql5 ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/bpm/libbpmstore
../../common/libsqlcommon \
+ LIBS = libembeddedsql5 ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/restrict/librestrictstore
../../storage/bpm/libbpmstore ../../common/libsqlcommon \
$(MONETDB5_MODS) -l_logger -l_bat5 -l_tablet -l_bpm
$(MONETDB5_LIBS) -lmal \
$(CLIENTS_LIBS) $(MONETDB_LIBS) -lbat -lMapi -lmutils -lstream
$(READLINE_LIBS) $(PTHREAD_LIBS)
}
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- sql.mx 11 Jan 2008 10:51:58 -0000 1.246
+++ sql.mx 15 Jan 2008 10:42:52 -0000 1.247
@@ -938,15 +938,23 @@
if (s){
stmt *opt;
+ if (mvc_debug_on(c,128))
+ stmt2dot(s, 1, "/tmp/g1.dot");
opt = optimize(c, s);
stmt_destroy(s);
s = opt;
+ if (mvc_debug_on(c,128))
+ stmt2dot(s, 2, "/tmp/g2.dot");
opt = rel2bin(c, s);
stmt_destroy(s);
s = opt;
+ if (mvc_debug_on(c,128))
+ stmt2dot(s, 3, "/tmp/g3.dot");
opt = bin_optimizer(c, s);
stmt_destroy(s);
s = opt;
+ if (mvc_debug_on(c,128))
+ stmt2dot(s, 4, "/tmp/g4.dot");
}
return s;
}
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
