Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16:/tmp/cvs-serv1547
Modified Files:
sql.mx sql_optimizer.mx sql_scenario.mx
Log Message:
after recent changes, src/modules/atoms/streams.mx needs to include
<stream_socket.h>;
however, when doing so, the ENGINE defined in src/mal/mal_scenario.mx conflicts
with
the ENGINE defined in /usr/include/openssl/ossl_typ.h:154;
hence, we prefix READER PARSER OPTIMIZE SCHEDULER ENGINE INITCLIENT EXITCLIENT
defined in src/mal/mal_scenario.mx with MAL_SCENARIO_ .
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- sql_scenario.mx 7 Apr 2007 21:09:08 -0000 1.257
+++ sql_scenario.mx 17 Apr 2007 17:09:37 -0000 1.258
@@ -313,7 +313,7 @@
if (!SQLinitialized && (msg = SQLinit(c)) != MAL_SUCCEED)
return msg;
- if ((backend *) c->state[PARSER] == 0) {
+ if ((backend *) c->state[MAL_SCENARIO_PARSER] == 0) {
m = mvc_create((c-mal_clients), 0, SQLdebug, c->fdin, c->fdout);
global_variables(m, "monetdb", "sys");
@@ -333,11 +333,11 @@
snprintf(fn, BUFSIZ, "sql.%d", (int)(c - mal_clients));
m->scanner.log = open_wastream(fn);
}
- c->state[PARSER] = (void *) backend_create(m, c);
- ((backend*)c->state[PARSER])->language = 'S'; /*expect SQL
text first */
- c->state[OPTIMIZE] = m;
+ c->state[MAL_SCENARIO_PARSER] = (void *) backend_create(m, c);
+ ((backend*)c->state[MAL_SCENARIO_PARSER])->language = 'S';
/*expect SQL text first */
+ c->state[MAL_SCENARIO_OPTIMIZE] = m;
} else {
- m = c->state[OPTIMIZE];
+ m = c->state[MAL_SCENARIO_OPTIMIZE];
/* TODO reset global variables */
}
@@ -355,15 +355,15 @@
if (SQLinitialized == FALSE) {
throw(SQL, "SQLinitClient", "Catalogue not available");
}
- if ((backend *) c->state[PARSER] && (mvc *) c->state[OPTIMIZE]) {
- m= (mvc *) c->state[OPTIMIZE];
+ if ((backend *) c->state[MAL_SCENARIO_PARSER] && (mvc *)
c->state[MAL_SCENARIO_OPTIMIZE]) {
+ m= (mvc *) c->state[MAL_SCENARIO_OPTIMIZE];
res_tables_destroy(m->results);
m->results= NULL;
mvc_destroy(m);
- backend_destroy((backend *) c->state[PARSER]);
+ backend_destroy((backend *) c->state[MAL_SCENARIO_PARSER]);
/* files are already closed */
- c->state[OPTIMIZE] = NULL;
- c->state[PARSER] = NULL;
+ c->state[MAL_SCENARIO_OPTIMIZE] = NULL;
+ c->state[MAL_SCENARIO_PARSER] = NULL;
}
return MAL_SUCCEED;
}
@@ -436,7 +436,7 @@
char *n;
str msg = MAL_SUCCEED;
Client c= MCgetClient();
- backend *sql = ((backend *) c->state[PARSER]);
+ backend *sql = ((backend *) c->state[MAL_SCENARIO_PARSER]);
int len = strlen(*expr);
#ifdef _SQL_COMPILE
@@ -444,7 +444,7 @@
#endif
if (!sql) {
msg = SQLinitEnvironment(&err);
- sql = ((backend *) c->state[PARSER]);
+ sql = ((backend *) c->state[MAL_SCENARIO_PARSER]);
}
if (msg)
throw(SQL, "SQLstatement", "Catalogue not available");
@@ -537,11 +537,11 @@
#endif
if ( execute) {
- backend *be = c->state[PARSER];
+ backend *be = c->state[MAL_SCENARIO_PARSER];
sql->out = NULL; /* no output */
- c->state[PARSER] = sql;
+ c->state[MAL_SCENARIO_PARSER] = sql;
msg = (str) runMAL(c, c->curprg->def, 1, 0, 0, 0);
- c->state[PARSER] = be;
+ c->state[MAL_SCENARIO_PARSER] = be;
MSresetInstructions(c->curprg->def, 1);
freeVariables(c->curprg->def, 0, 0);
c->curprg= oldsym;
@@ -665,7 +665,7 @@
{
int go = TRUE;
int more = TRUE;
- backend *be = ((backend *) c->state[PARSER]);
+ backend *be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
bstream *in = c->fdin;
int language = -1;
mvc *m = NULL;
@@ -821,7 +821,7 @@
int err = 0;
prot oldmode;
- be = ((backend *) c->state[PARSER]);
+ be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
if (be == 0) {
showException(SQL,"sql","SQL state descriptor missing\n");
throw(SQL, "SQLparser", "State descriptor missing");
@@ -1331,7 +1331,7 @@
str
SQLengine(Client c)
{
- backend *be = ((backend *) c->state[PARSER]);
+ backend *be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
return SQLengineIntern(c, be);
}
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- sql_optimizer.mx 17 Apr 2007 12:27:05 -0000 1.151
+++ sql_optimizer.mx 17 Apr 2007 17:09:37 -0000 1.152
@@ -460,7 +460,7 @@
void
addQueryToCache(Client c)
{
- backend *be = ((backend *) c->state[PARSER]);
+ backend *be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
str optimizer;
MalBlkPtr mb;
@@ -480,7 +480,7 @@
@c
if (mb->errors) {
mvc *m;
- m = ((mvc *) c->state[OPTIMIZE]);
+ m = ((mvc *) c->state[MAL_SCENARIO_OPTIMIZE]);
showErrors();
if (c->listing)
@@ -517,7 +517,7 @@
/* time to execute the optimizers */
if( c->debug)
optimizerCheck(mb,"sql.baseline",-1,0, OPT_CHECK_ALL);
- SQLgetStatistics((mvc *) c->state[OPTIMIZE],mb);
+ SQLgetStatistics((mvc *) c->state[MAL_SCENARIO_OPTIMIZE],mb);
optimizeMALBlock(mb);
}
}
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- sql.mx 7 Apr 2007 21:09:08 -0000 1.220
+++ sql.mx 17 Apr 2007 17:09:36 -0000 1.221
@@ -854,11 +854,11 @@
if (_client == NULL )
throw(SQL, "mvc","Can not access client record");
- if (_client->state[PARSER] == NULL || _client->state[OPTIMIZE] == NULL)
- throw(SQL, "mvc","PARSER not initialized");
- *c = ((mvc *) _client ->state[OPTIMIZE]);
+ if (_client->state[MAL_SCENARIO_PARSER] == NULL ||
_client->state[MAL_SCENARIO_OPTIMIZE] == NULL)
+ throw(SQL, "mvc","MAL_SCENARIO_PARSER not initialized");
+ *c = ((mvc *) _client ->state[MAL_SCENARIO_OPTIMIZE]);
if (b)
- *b = ((backend*) _client->state[PARSER]);
+ *b = ((backend*) _client->state[MAL_SCENARIO_PARSER]);
return MAL_SUCCEED;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
