Changeset: 3e28d3ec0e1b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e28d3ec0e1b
Modified Files:
sql/src/backends/monet5/sql_scenario.mx
sql/src/sql/Makefile.ag
sql/src/sql/createdb.mx
Branch: Jun2010
Log Message:
drop createdb stuff that accidentially ended up in Jun2010 branch
diffs (145 lines):
diff -r b26bbecdb91e -r 3e28d3ec0e1b sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx Fri Jul 09 13:52:40 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx Fri Jul 09 16:20:59 2010 +0200
@@ -407,7 +407,6 @@
mvc *m;
str schema;
backend *be;
- bstream *bfd = NULL;
stream *fd = NULL;
#ifdef _SQL_SCENARIO_DEBUG
@@ -415,31 +414,6 @@
#endif
if (SQLinitialized == 0 )
SQLprelude();
-...@-
-Based on the initialization retun value we can prepare a SQLinit string with
all information needed
-to initialize the catalog based on the mandatory scripts to be executed.
-...@c
- if (SQLnewcatalog > 0 && sqlinit == NULL) {
- str fullname;
-
- fullname = MSP_locate_sqlscript("createdb");
- if (fullname) {
- fd = open_rastream(fullname);
- GDKfree(fullname);
-
- if (fd) {
- bfd = bstream_create(fd, 128 * BLOCK);
- stream_printf(c->fdout, "# SQL catalog created,
"
- "initial load of sql
scripts\n");
- if (bfd == 0 || bstream_next(bfd) < 0) {
- sqlinit = bfd->buf;
- SQLnewcatalog = INT_MAX;
- }
- }
- }
- if (SQLnewcatalog != INT_MAX)
- stream_printf(c->fdout, "#WARNING: could not read
createdb.sql\n");
- }
if (sqlinit) { /* add sqlinit to the fdin stack */
buffer *b = (buffer*)GDKmalloc(sizeof(buffer));
size_t len = strlen(sqlinit);
diff -r b26bbecdb91e -r 3e28d3ec0e1b sql/src/sql/Makefile.ag
--- a/sql/src/sql/Makefile.ag Fri Jul 09 13:52:40 2010 +0200
+++ b/sql/src/sql/Makefile.ag Fri Jul 09 16:20:59 2010 +0200
@@ -21,7 +21,6 @@
HEADERS = sql
DIR = libdir/MonetDB5
SOURCES = \
- createdb.mx \
clients.sql cluster.sql \
date.sql history.sql inet.sql \
math.sql mtime.sql \
diff -r b26bbecdb91e -r 3e28d3ec0e1b sql/src/sql/createdb.mx
--- a/sql/src/sql/createdb.mx Fri Jul 09 13:52:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2010 MonetDB B.V.
-All Rights Reserved.
-@
-
-...@f createdb
-...@t SQL catalog initialization
-...@a M.L. Kersten, N. Nes
-...@+ Catalog initialization
-After a SQL database catalog has been created, we should run a series
-of SQL scripts to define auxillary functionality. We include all that
-is needed to run the tests.
-This MX script merely pulls the files together.
-...@sql
-...@include math.sql
-...@include times.sql
-...@include url.sql
-...@include date.sql
-...@include inet.sql
-
-...@include history.sql
-...@include tracelog.sql
-
-...@include compress.sql
-...@include dictionary.sql
-...@include cluster.sql
-
-...@include dependency_functions.sql
-...@include skyserver.sql
-...@include clients.sql
-...@-
-The remaining functionality is considered for debugging.
-...@sql
--- show the optimizer statistics maintained by the SQL frontend
-create function optimizer_stats ()
- returns table (rewrite string, count int)
- external name sql.dump_opt_stats;
-
-
--- SQL QUERY CACHE
--- The SQL query cache returns a table with the query plans kept
-
-create function queryCache()
- returns table (query string, count int)
- external name sql.dump_cache;
-
--- Trace the SQL input
-create procedure querylog(filename string)
- external name sql.logfile;
-
--- MONETDB KERNEL SECTION
-
--- The environment table
-create function environment()
- returns table (nme string, val string)
- external name sql.environment;
-
--- The BAT buffer pool overview
-create function bbp ()
- returns table (id int, name string, htype string,
- ttype string, count BIGINT, refcnt int, lrefcnt int,
- location string, heat int, dirty string,
- status string, kind string)
- external name sql.bbp;
-
-...@-
-These are used for testing only...
-...@include mtime.sql
-octopus.sql
-rdf.sql -- depends on rdf module
-parts.sql -- testing only
-replication.sql -- testing only
-...@sql
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
