Changeset: 2f65cd4e28a3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f65cd4e28a3
Modified Files:
MonetDB5/src/mal/mal_client.mx
sql/src/backends/monet5/sql.mx
Branch: default
Log Message:
Merged from Oct2010
diffs (170 lines):
diff -r 6adb25a09d39 -r 2f65cd4e28a3 MonetDB5/src/mal/mal_client.mx
--- a/MonetDB5/src/mal/mal_client.mx Thu Nov 04 10:32:46 2010 +0100
+++ b/MonetDB5/src/mal/mal_client.mx Thu Nov 04 12:33:28 2010 +0100
@@ -256,6 +256,7 @@
mal_export ClientRec mal_clients[MAL_MAXCLIENTS+1];
mal_export int MCdefault;
+mal_export Client MCgetClient(int id);
mal_export Client MCfindClient(oid user, str scen, bstream *fin, stream
*fout);
mal_export Client MCinitClient(oid user, bstream *fin, stream *fout);
mal_export int MCinitClientThread(Client c);
@@ -270,8 +271,7 @@
mal_export void MCexitPending(void);
mal_export void MCtraceAllClients(int flag);
mal_export void MCtraceClient(oid which, int flag);
-
-mal_export int MCpushClientInput(Client c, bstream *new_input, int listing,
char *prompt);
+mal_export int MCpushClientInput(Client c, bstream *new_input, int
listing, char *prompt);
mal_export void MCpopClientInput(Client c);
#endif /* _MAL_CLIENT_H_ */
@@ -395,6 +395,13 @@
as co-workers. It is currently passed as an argument.
@c
+Client MCgetClient(int id)
+{
+ if (id < 0 || id > MAL_MAXCLIENTS)
+ return NULL;
+ return(mal_clients + id);
+}
+
Client MCfindClient(oid user, str scen, bstream *fin, stream *fout)
{
Client c = NULL;
diff -r 6adb25a09d39 -r 2f65cd4e28a3 sql/src/backends/monet5/embeddedclient.c.in
--- a/sql/src/backends/monet5/embeddedclient.c.in Thu Nov 04 10:32:46
2010 +0100
+++ b/sql/src/backends/monet5/embeddedclient.c.in Thu Nov 04 12:33:28
2010 +0100
@@ -108,7 +108,7 @@
"in := \"" PTRFMT "\":streams;\n"
"out := \"" PTRFMT "\":streams;\n"
"mapi.malclient(in, out);\n", PTRFMTCAST in, PTRFMTCAST out);
- callString(mal_clients, buf, 0);
+ callString(MCgetClient(CONSOLE), buf, 0);
return 0;
}
diff -r 6adb25a09d39 -r 2f65cd4e28a3 sql/src/backends/monet5/sql.mx
--- a/sql/src/backends/monet5/sql.mx Thu Nov 04 10:32:46 2010 +0100
+++ b/sql/src/backends/monet5/sql.mx Thu Nov 04 12:33:28 2010 +0100
@@ -2271,7 +2271,7 @@
mvc_getVersion(lng *version, int *clientid)
{
mvc *m = NULL;
- Client cntxt = mal_clients+*clientid;
+ Client cntxt = MCgetClient(*clientid);
str msg = getContext(cntxt, NULL, &m, NULL);
if (msg)
@@ -2437,7 +2437,7 @@
mvc_diff_idxbat_wrap(bat *bid, int *clientid, str *s, str *t, str *i, int
*access, lng *oldversion, lng *version)
{
mvc *m = NULL;
- Client cntxt = mal_clients+*clientid;
+ Client cntxt = MCgetClient(*clientid);
str msg = getContext(cntxt, NULL, &m, NULL);
BAT *b;
@@ -2612,7 +2612,7 @@
mvc_diff_dbat_wrap(bat *bid, int *clientid, str *s, str *t, int *access, lng
*oldversion, lng *version )
{
mvc *m = NULL;
- Client cntxt = mal_clients+*clientid;
+ Client cntxt = MCgetClient(*clientid);
str msg = getContext(cntxt, NULL, &m, NULL);
BAT *b;
diff -r 6adb25a09d39 -r 2f65cd4e28a3 sql/src/backends/monet5/sql_gencode.mx
--- a/sql/src/backends/monet5/sql_gencode.mx Thu Nov 04 10:32:46 2010 +0100
+++ b/sql/src/backends/monet5/sql_gencode.mx Thu Nov 04 12:33:28 2010 +0100
@@ -2252,7 +2252,7 @@
{
sql_rel *r;
mvc *m = (mvc*)M;
- Client c = mal_clients + m->clientid;
+ Client c = MCgetClient(m->clientid);
backend *be = ((backend *) c->state[MAL_SCENARIO_PARSER]);
MalBlkPtr curBlk = 0;
InstrPtr curInstr = 0;
diff -r 6adb25a09d39 -r 2f65cd4e28a3 sql/src/backends/monet5/sql_readline.mx
--- a/sql/src/backends/monet5/sql_readline.mx Thu Nov 04 10:32:46 2010 +0100
+++ b/sql/src/backends/monet5/sql_readline.mx Thu Nov 04 12:33:28 2010 +0100
@@ -130,7 +130,7 @@
void
init_sql_readline(void)
{
- str history = mal_clients[0].history; /* only for console */
+ str history = MCgetClient(CONSOLE)->history; /* only for console */
/* Allow conditional parsing of the ~/.inputrc file. */
rl_readline_name = "MonetDB";
@@ -142,7 +142,7 @@
void
deinit_sql_readline(void)
{
- str history = mal_clients[0].history; /* only for console */
+ str history = MCgetClient(CONSOLE)->history; /* only for console */
if (history) {
write_history(history);
}
diff -r 6adb25a09d39 -r 2f65cd4e28a3 sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx Thu Nov 04 10:32:46 2010 +0100
+++ b/sql/src/backends/monet5/sql_scenario.mx Thu Nov 04 12:33:28 2010 +0100
@@ -118,7 +118,7 @@
(void) stk;
(void) nr;
(void)clientid;
- SQLCacheRemove(mal_clients+clientid, name);
+ SQLCacheRemove(MCgetClient(clientid), name);
#ifdef _SQL_SCENARIO_DEBUG
mnstr_printf(GDKout, "#monet5_free:%d\n", nr);
diff -r 6adb25a09d39 -r 2f65cd4e28a3 sql/src/backends/monet5/sql_user.mx
--- a/sql/src/backends/monet5/sql_user.mx Thu Nov 04 10:32:46 2010 +0100
+++ b/sql/src/backends/monet5/sql_user.mx Thu Nov 04 12:33:28 2010 +0100
@@ -77,7 +77,7 @@
sql_table *users;
sql_column *users_name;
str err;
- Client c = &mal_clients[m->clientid];
+ Client c = MCgetClient(m->clientid);
err = AUTHremoveUser(&c, &user);
if (err != MAL_SUCCEED) {
@@ -113,7 +113,7 @@
str pwd;
sql_schema *s = find_sql_schema(m->session->tr, "sys");
sql_table *db_user_info, *auths;
- Client c = &mal_clients[m->clientid];
+ Client c = MCgetClient(m->clientid);
/* prepare the scens BAT: it should contain the sql scenario */
scens = BATnew(TYPE_str, TYPE_void, 1);
@@ -170,7 +170,7 @@
BAT *users;
BUN p;
mvc *m = (mvc *)mp;
- Client c = &mal_clients[m->clientid];
+ Client c = MCgetClient(m->clientid);
users = db_users(c);
if (!users)
@@ -280,7 +280,7 @@
sqlid schema_id, str oldpasswd)
{
mvc *m = (mvc *)_mvc;
- Client c = &mal_clients[m->clientid];
+ Client c = MCgetClient(m->clientid);
str err;
if (passwd != NULL) {
@@ -358,7 +358,7 @@
monet5_rename_user(ptr _mvc, str olduser, str newuser)
{
mvc *m = (mvc *)_mvc;
- Client c = &mal_clients[m->clientid];
+ Client c = MCgetClient(m->clientid);
str err;
oid rid;
sql_schema *sys = find_sql_schema(m->session->tr, "sys");
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
