Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7721/modules/mal
Modified Files:
Makefile.ag mal_init.mx mal_io.mx
Added Files:
mal_mapi.mx
Removed Files:
mserver.mx
Log Message:
A renaming action to better reflect the actual status of the
old mserver module. It is a wrapper around mapilib.
--- NEW FILE: mal_mapi.mx ---
@' 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-2008 CWI.
@' All Rights Reserved.
@f mal_mapi
@a N.J. Nes P. Boncz, S. Mullender, M. Kersten
@v 1.1
[...2016 lines suppressed...]
i= *(int*) getArgReference(stk,pci,pci->retc+3);
snprintf(buf,BUFSIZ,"%s:bat[:void,:oid]:=sql.bind(\"%s\",\"%s\",0,%d);",
getVarName(mb,getDestVar(pci)),*nme, *tab,i);
} else {
str hn,tn;
int target= getArgType(mb,pci,0);
hn= getTypeName(getHeadType(target));
tn= getTypeName(getTailType(target));
snprintf(buf,BUFSIZ,"%s:bat[%s,%s]:=bbp.bind(\"%s\");",
getVarName(mb,getDestVar(pci)), hn,tn, *nme);
GDKfree(hn);
GDKfree(tn);
}
if( SERVERsessions[i].hdl)
mapi_close_handle(SERVERsessions[i].hdl);
SERVERsessions[i].hdl= mapi_query(mid, buf);
@:catchErrors(mapi.bind)@
return MAL_SUCCEED;
}
@}
Index: mal_io.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mal_io.mx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mal_io.mx 20 Jan 2008 08:26:19 -0000 1.19
+++ mal_io.mx 21 Jan 2008 08:05:41 -0000 1.20
@@ -117,7 +117,7 @@
command data(fname:str):str
address IOdatafile
comment "Signals receipt of tuples in a file fname.
-It returns the name of the file, if it still exists."
+It returns the name of the file, if it still exists.";
command export(b:bat[:any_1,:any_2], filepath:str):bit
address IOexport
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Makefile.ag,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- Makefile.ag 14 Jan 2008 22:24:15 -0000 1.113
+++ Makefile.ag 21 Jan 2008 08:05:41 -0000 1.114
@@ -58,10 +58,10 @@
$(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
}
-lib_mserver = {
+lib_mal_mapi = {
DIR = libdir/MonetDB5
SEP = _
- SOURCES = mserver.mx
+ SOURCES = mal_mapi.mx
LIBS = ../../mal/libmal $(MONETDB_LIBS) -lbat -lstream $(CLIENTS_LIBS)
-lMapi \
$(OPENSSL_LIBS) $(SOCKET_LIBS) $(Z_LIBS) $(BZ_LIBS) \
$(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
@@ -141,7 +141,7 @@
headers_h = {
DIR = includedir/MonetDB5/mal
- SOURCES = batExtensions.mx bpm.mx mserver.mx mal_io.mx clients.mx \
+ SOURCES = batExtensions.mx bpm.mx mal_mapi.mx mal_io.mx clients.mx \
pcre.mx bbp.mx tablet.mx transaction.mx statistics.mx \
\
chopper.mx constraints.mx language.mx box.mx \
@@ -164,7 +164,7 @@
chopper.mx clients.mx \
factory.mx mdb.mx pcre.mx tablet.mx mat.mx \
urlbox.mx statistics.mx transaction.mx \
- mserver.mx sabaoth.mx remote.mx \
+ mal_mapi.mx sabaoth.mx remote.mx \
bpm.mx batxml.mx txtsim.mx
#radix.mx
}
--- mserver.mx DELETED ---
Index: mal_init.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mal_init.mx,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- mal_init.mx 20 Jan 2008 08:26:19 -0000 1.126
+++ mal_init.mx 21 Jan 2008 08:05:41 -0000 1.127
@@ -79,7 +79,7 @@
library manual;
library language;
library constraints;
-library mserver;
+library mal_mapi;
library profiler;
library statistics;
@@ -164,7 +164,7 @@
include manual;
include language;
include constraints;
-include mserver;
+include mal_mapi;
include profiler;
include statistics;
@@ -212,7 +212,7 @@
include opt_crack;
include opt_joinselect;
include opt_remoteQueries;
-#include crackers;
+include crackers;
include xml;
include batxml;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
