Changeset: 6c21326c1212 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c21326c1212
Removed Files:
monetdb5/modules/mal/mdb.h
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/manual.c
monetdb5/modules/mal/mdb.c
Branch: oscar
Log Message:
Unexport functions.
diffs (truncated from 447 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -956,7 +956,6 @@ str CMDgetUserTime(lng *ret);
str CMDgetprofilerlimit(int *res);
str CMDifthen(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDifthen(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDmodules(bat *bid);
str CMDnoopProfiler(void *res);
str CMDopenProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDqgramnormalize(str *res, str *input);
@@ -1213,37 +1212,6 @@ int MCpushClientInput(Client c, bstream
void MCstopClients(Client c);
str MCsuspendClient(int id);
int MCvalid(Client c);
-str MDBStkDepth(Client cntxt, MalBlkPtr mb, MalStkPtr s, InstrPtr p);
-str MDBStkTrace(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
-str MDBdummy(int *ret);
-str MDBdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBgetDebug(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBgetDebugFlags(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBgetDebugStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBgetDefinition(Client cntxt, MalBlkPtr m, MalStkPtr stk, InstrPtr p);
-str MDBgetExceptionContext(str *ret, str *msg);
-str MDBgetExceptionReason(str *ret, str *msg);
-str MDBgetExceptionVariable(str *ret, str *msg);
-str MDBgetStackFrame(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
-str MDBgetStackFrameN(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
-str MDBgetVMsize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBinspect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBlist(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBlist3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBlist3Detail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBlistDetail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBlistMapi(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetCatch(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetDebug(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetDebugStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetVMsize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetVarTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBstart(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBstartFactory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBvar(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBvar3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MKEYbathash(bat *res, const bat *bid);
str MKEYbulk_rotate_xor_hash(bat *ret, const bat *hid, const int *nbits, const
bat *bid);
str MKEYbulkconst_rotate_xor_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
diff --git a/monetdb5/modules/mal/CMakeLists.txt
b/monetdb5/modules/mal/CMakeLists.txt
--- a/monetdb5/modules/mal/CMakeLists.txt
+++ b/monetdb5/modules/mal/CMakeLists.txt
@@ -24,7 +24,7 @@ target_sources(malmodules
clients.c clients.h
factories.c factories.h
groupby.c groupby.h
- mdb.c mdb.h
+ mdb.c
pcre.c
mat.c mat.h
transaction.c
diff --git a/monetdb5/modules/mal/manual.c b/monetdb5/modules/mal/manual.c
--- a/monetdb5/modules/mal/manual.c
+++ b/monetdb5/modules/mal/manual.c
@@ -61,6 +61,8 @@ MANUALcreateOverview(Client cntxt, MalBl
for (j = 0; j < MAXSCOPE; j++) {
if (s->space[j]) {
for (t = s->space[j]; t != NULL; t =
t->peer) {
+ if (t->def->stmt[0]->fcnname[0]
== '#')
+ continue;
(void) fcnDefinition(t->def,
getInstrPtr(t->def, 0), buf, TRUE, buf, sizeof(buf));
tt = strstr(buf, "address ");
if (tt) {
diff --git a/monetdb5/modules/mal/mdb.c b/monetdb5/modules/mal/mdb.c
--- a/monetdb5/modules/mal/mdb.c
+++ b/monetdb5/modules/mal/mdb.c
@@ -37,7 +37,20 @@
*/
#include "monetdb_config.h"
-#include "mdb.h"
+#include "gdk.h"
+#include "mutils.h"
+#include <time.h>
+#include <sys/types.h>
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#include "mal_resolve.h"
+#include "mal_linker.h"
+#include "mal_client.h"
+#include "mal_exception.h"
+#include "mal_debugger.h"
+#include "mal_interpreter.h"
+#include "mal_namespace.h"
#include "mal_authorize.h"
#include "mal_function.h"
@@ -60,7 +73,7 @@ pseudo(bat *ret, BAT *b, const char *X1,
return 0;
}
-str
+static str
MDBstart(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
Client c;
@@ -85,7 +98,7 @@ MDBstart(Client cntxt, MalBlkPtr mb, Mal
return MAL_SUCCEED;
}
-str
+static str
MDBstartFactory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
(void) cntxt;
@@ -95,7 +108,7 @@ MDBstartFactory(Client cntxt, MalBlkPtr
throw(MAL, "mdb.start", SQLSTATE(0A000) PROGRAM_NYI);
}
-str
+static str
MDBstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
stk->cmd = 0;
@@ -118,7 +131,7 @@ MDBtraceFlag(Client cntxt, MalStkPtr stk
}
}
-str
+static str
MDBsetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
int b;
@@ -130,7 +143,7 @@ MDBsetTrace(Client cntxt, MalBlkPtr mb,
return MAL_SUCCEED;
}
-str
+static str
MDBgetVMsize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
lng *ret = getArgReference_lng(stk, p, 0);
@@ -142,7 +155,7 @@ MDBgetVMsize(Client cntxt, MalBlkPtr mb,
}
/* Set the max VM in MBs */
-str
+static str
MDBsetVMsize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
lng *ret = getArgReference_lng(stk, p, 0);
@@ -155,7 +168,7 @@ MDBsetVMsize(Client cntxt, MalBlkPtr mb,
return MAL_SUCCEED;
}
-str
+static str
MDBsetVarTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
str v;
@@ -168,7 +181,7 @@ MDBsetVarTrace(Client cntxt, MalBlkPtr m
return MAL_SUCCEED;
}
-str
+static str
MDBgetDebug(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
int *ret = getArgReference_int(stk,p,0);
@@ -181,7 +194,7 @@ MDBgetDebug(Client cntxt, MalBlkPtr mb,
return MAL_SUCCEED;
}
-str
+static str
MDBsetDebug(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
int *ret = getArgReference_int(stk,p,0);
@@ -201,7 +214,7 @@ MDBsetDebug(Client cntxt, MalBlkPtr mb,
if (BUNappend(flg, (void*) NME, false) != GDK_SUCCEED) goto bailout;\
if (BUNappend(val, &state, false) != GDK_SUCCEED) goto bailout;
-str
+static str
MDBgetDebugFlags(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
bat *f = getArgReference_bat(stk,p,0);
@@ -274,7 +287,7 @@ MDBsetDebugStr_(int *ret, str *flg)
return MAL_SUCCEED;
}
-str
+static str
MDBsetDebugStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
str *flg = (str*) getArgReference(stk, p, 1);
@@ -285,7 +298,7 @@ MDBsetDebugStr(Client cntxt, MalBlkPtr m
return MDBsetDebugStr_(ret, flg);
}
-str
+static str
MDBsetCatch(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
int b;
@@ -296,7 +309,7 @@ MDBsetCatch(Client cntxt, MalBlkPtr mb,
return MAL_SUCCEED;
}
-str
+static str
MDBinspect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
str modnme;
@@ -336,7 +349,7 @@ getStkDepth(MalStkPtr s)
return i;
}
-str
+static str
MDBStkDepth(Client cntxt, MalBlkPtr mb, MalStkPtr s, InstrPtr p)
{
int *ret = getArgReference_int(s, p, 0);
@@ -375,7 +388,7 @@ MDBgetFrame(BAT *b, BAT *bn, MalBlkPtr m
return MAL_SUCCEED;
}
-str
+static str
MDBgetStackFrame(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p)
{
bat *ret = getArgReference_bat(s, p, 0);
@@ -408,7 +421,7 @@ MDBgetStackFrame(Client cntxt, MalBlkPtr
return MAL_SUCCEED;
}
-str
+static str
MDBgetStackFrameN(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p)
{
int n;
@@ -449,7 +462,7 @@ MDBgetStackFrameN(Client cntxt, MalBlkPt
return MAL_SUCCEED;
}
-str
+static str
MDBStkTrace(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p)
{
BAT *b, *bn;
@@ -543,7 +556,7 @@ MDBStkTrace(Client cntxt, MalBlkPtr m, M
/*
* Display routines
*/
-str
+static str
MDBlist(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
(void) p;
@@ -552,7 +565,7 @@ MDBlist(Client cntxt, MalBlkPtr mb, MalS
return MAL_SUCCEED;
}
-str
+static str
MDBlistMapi(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
(void) p;
@@ -561,7 +574,7 @@ MDBlistMapi(Client cntxt, MalBlkPtr mb,
return MAL_SUCCEED;
}
-str
+static str
MDBlist3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
str modnme = *getArgReference_str(stk, p, 1);
@@ -576,7 +589,7 @@ MDBlist3(Client cntxt, MalBlkPtr mb, Mal
return MAL_SUCCEED;
}
-str
+static str
MDBlistDetail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
(void) p;
@@ -585,7 +598,7 @@ MDBlistDetail(Client cntxt, MalBlkPtr mb
return MAL_SUCCEED;
}
-str
+static str
MDBlist3Detail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
str modnme = *getArgReference_str(stk, p, 1);
@@ -600,7 +613,7 @@ MDBlist3Detail(Client cntxt, MalBlkPtr m
return NULL;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
