Changeset: cbddeeb47d89 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbddeeb47d89
Removed Files:
monetdb5/modules/mal/inspect.h
monetdb5/modules/mal/manual.h
monetdb5/modules/mal/txtsim.h
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/manual.c
monetdb5/modules/mal/txtsim.c
Branch: Oct2020
Log Message:
Export less. Now back to bugs
diffs (truncated from 563 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
@@ -814,8 +814,6 @@ str CMDgetUserTime(lng *ret);
str CMDgetprofilerlimit(int *res);
str CMDnoopProfiler(void *res);
str CMDopenProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDqgramnormalize(str *res, str *input);
-str CMDqgramselfjoin(bat *res1, bat *res2, bat *qid, bat *bid, bat *pid, bat
*lid, flt *c, int *k);
str CMDsetHeartbeat(void *res, int *ev);
str CMDsetName(str *rname, const bat *b, str *name);
str CMDsetprofilerlimit(void *res, int *lim);
@@ -823,7 +821,6 @@ str CMDstartProfiler(Client cntxt, MalBl
str CMDstartTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDstopProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDstopTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDstr2qgrams(bat *ret, str *val);
str COPYrejects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str COPYrejects_clear(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str GRPgroup1(bat *ngid, bat *next, bat *nhis, const bat *bid);
@@ -844,26 +841,6 @@ str GRPsubgroup6(bat *ngid, bat *next, c
str GRPsubgroup7(bat *ngid, bat *next, const bat *bid, const bat *sid, const
bat *gid);
str GRPsubgroup8(bat *ngid, bat *next, const bat *bid, const bat *gid, const
bat *eid, const bat *hid);
str GRPsubgroup9(bat *ngid, bat *next, const bat *bid, const bat *sid, const
bat *gid, const bat *eid, const bat *hid);
-str INSPECTatom_names(bat *ret);
-str INSPECTatom_sizes(bat *ret);
-str INSPECTatom_sup_names(bat *ret);
-str INSPECTequalType(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTgetAllAddresses(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetAllFunctions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetAllModules(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetAllSignatures(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-str INSPECTgetComment(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTgetDefinition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetEnvironment(bat *ret, bat *ret2);
-str INSPECTgetEnvironmentKey(str *ret, str *key);
-str INSPECTgetFunctionSize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
-str INSPECTgetSignature(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetSize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str INSPECTgetSource(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTgetkind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTshowFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str INSPECTshowFunction3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
-str INSPECTtypeName(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOexport(void *ret, bat *bid, str *fnme);
str IOimport(void *ret, bat *bid, str *fnme);
str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -888,7 +865,6 @@ str MALreader(Client c);
str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
MALfcn MANIFOLDtypecheck(Client cntxt, MalBlkPtr mb, InstrPtr pci, int
checkprops);
-str MANUALcreateOverview(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
int MCactiveClients(void);
str MCawakeClient(int id);
void MCcloseClient(Client c);
@@ -1309,8 +1285,6 @@ void freeStack(MalStkPtr stk);
void freeSymbol(Symbol s);
void freeSymbolList(Symbol s);
void freeVariable(MalBlkPtr mb, int varid);
-str fstrcmp0_impl(dbl *ret, str *string1, str *string2);
-str fstrcmp_impl(dbl *ret, str *string1, str *string2, dbl *minimum);
void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag);
void garbageElement(Client cntxt, ValPtr v);
str generatorRef;
@@ -1434,9 +1408,6 @@ str languageRef;
str last_valueRef;
str leadRef;
str leftjoinRef;
-str levenshtein_impl(int *result, str *s, str *t, int *insdel_cost, int
*replace_cost, int *transpose_cost);
-str levenshteinbasic2_impl(int *result, str *s, str *t);
-str levenshteinbasic_impl(int *result, str *s, str *t);
str likeRef;
str likejoinRef;
str likeselectRef;
@@ -1708,7 +1679,6 @@ void slash_2_dir_sep(str fname);
str sliceRef;
str sortRef;
str sortReverseRef;
-str soundex_impl(str *res, str *Name);
void sqlProfilerEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str sqlRef;
str sqlcatalogRef;
@@ -1723,7 +1693,6 @@ void strAfterCall(ValPtr v, ValPtr bak);
void strBeforeCall(ValPtr v, ValPtr bak);
str strRef;
str streamsRef;
-str stringdiff_impl(int *res, str *s1, str *s2);
str subavgRef;
str subcountRef;
str subdeltaRef;
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
@@ -15,8 +15,8 @@ target_sources(malmodules
profiler.c profiler.h
batExtensions.c
orderidx.c orderidx.h
- inspect.c inspect.h
- manual.c manual.h
+ inspect.c
+ manual.c
mal_io.c mal_io.h
mkey.c
manifold.c manifold.h
@@ -32,7 +32,7 @@ target_sources(malmodules
wlc.c
mal_mapi.c mal_mapi.h
remote.c
- txtsim.c txtsim.h
+ txtsim.c
tokenizer.c tokenizer.h
sample.c
json_util.c
diff --git a/monetdb5/modules/mal/inspect.c b/monetdb5/modules/mal/inspect.c
--- a/monetdb5/modules/mal/inspect.c
+++ b/monetdb5/modules/mal/inspect.c
@@ -20,7 +20,15 @@
* the pseudo BAT to a variable.
*/
#include "monetdb_config.h"
-#include "inspect.h"
+#include "gdk.h"
+#include <time.h>
+#include "mal_resolve.h"
+#include "mal_client.h"
+#include "mal_exception.h"
+#include "mal_debugger.h"
+#include "mal_interpreter.h"
+#include "mal_listing.h"
+#include "mal_namespace.h"
static int
pseudo(bat *ret, BAT *b, str X1,str X2, str X3) {
@@ -44,7 +52,7 @@ pseudo(bat *ret, BAT *b, str X1,str X2,
* which makes it susceptable for intermediate updates
*/
-str
+static str
INSPECTgetAllFunctions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
Module s;
@@ -85,7 +93,7 @@ INSPECTgetAllFunctions(Client cntxt, Mal
throw(MAL, "inspect.getgetFunctionId", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-str
+static str
INSPECTgetAllModules(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
Module s;
@@ -127,7 +135,7 @@ INSPECTgetAllModules(Client cntxt, MalBl
throw(MAL, "inspect.getmodule", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-str
+static str
INSPECTgetkind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
Module s;
@@ -169,8 +177,7 @@ INSPECTgetkind(Client cntxt, MalBlkPtr m
throw(MAL, "inspect.get", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-
-str
+static str
INSPECTgetAllSignatures(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
{
Module s;
@@ -212,7 +219,9 @@ INSPECTgetAllSignatures(Client cntxt, Ma
freeModuleList(moduleList);
throw(MAL, "inspect.get", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-str
+
+#if 0
+static str
INSPECTgetAllAddresses(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
Module s;
@@ -257,8 +266,9 @@ INSPECTgetAllAddresses(Client cntxt, Mal
freeModuleList(moduleList);
throw(MAL, "inspect.get", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
+#endif
-str
+static str
INSPECTgetDefinition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
bat *ret = getArgReference_bat(stk,pci,0);
@@ -300,7 +310,7 @@ INSPECTgetDefinition(Client cntxt, MalBl
throw(MAL, "inspect.getDefinition", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-str
+static str
INSPECTgetSignature(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
bat *ret = getArgReference_bat(stk,pci,0);
@@ -354,7 +364,7 @@ INSPECTgetSignature(Client cntxt, MalBlk
throw(MAL, "inspect.getSignature", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-str
+static str
INSPECTgetComment(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
bat *ret = getArgReference_bat(stk,pci,0);
@@ -386,7 +396,7 @@ INSPECTgetComment(Client cntxt, MalBlkPt
throw(MAL, "inspect.getComment", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-str
+static str
INSPECTgetSource(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str *ret = getArgReference_str(stk,pci,0);
@@ -442,7 +452,7 @@ INSPECTgetSource(Client cntxt, MalBlkPtr
return MAL_SUCCEED;
}
-str
+static str
INSPECTatom_names(bat *ret)
{
int i;
@@ -463,7 +473,8 @@ INSPECTatom_names(bat *ret)
BBPreclaim(b);
throw(MAL, "inspect.getAtomNames", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-str
+
+static str
INSPECTgetEnvironment(bat *ret, bat *ret2)
{
BAT *k, *v;
@@ -476,7 +487,7 @@ INSPECTgetEnvironment(bat *ret, bat *ret
return MAL_SUCCEED;
}
-str
+static str
INSPECTgetEnvironmentKey(str *ret, str *key)
{
const char *s;
@@ -493,7 +504,7 @@ INSPECTgetEnvironmentKey(str *ret, str *
return MAL_SUCCEED;
}
-str
+static str
INSPECTatom_sup_names(bat *ret)
{
int i, k;
@@ -518,7 +529,7 @@ INSPECTatom_sup_names(bat *ret)
throw(MAL, "inspect.getAtomSuper", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
-str
+static str
INSPECTatom_sizes(bat *ret)
{
int i;
@@ -559,7 +570,7 @@ INSPECTcalcSize(MalBlkPtr mb){
return size;
}
-str
+static str
INSPECTgetSize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p){
lng *ret = getArgReference_lng(stk,p,0);
@@ -570,7 +581,7 @@ INSPECTgetSize(Client cntxt, MalBlkPtr m
return MAL_SUCCEED;
}
-str
+static str
INSPECTgetFunctionSize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
lng *ret = getArgReference_lng(stk,pci,0);
@@ -588,7 +599,9 @@ INSPECTgetFunctionSize(Client cntxt, Mal
/*
* Display routines
*/
-str
+
+#if 0
+static str
INSPECTshowFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
(void) p;
@@ -596,7 +609,7 @@ INSPECTshowFunction(Client cntxt, MalBlk
return MAL_SUCCEED;
}
-str
+static str
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
