Changeset: 2de9324fd0ab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2de9324fd0ab
Removed Files:
monetdb5/modules/mal/factories.h
monetdb5/modules/mal/groupby.h
monetdb5/modules/mal/iterator.h
monetdb5/modules/mal/mat.h
monetdb5/modules/mal/remote.h
monetdb5/modules/mal/sysmon.h
monetdb5/modules/mal/tracer.h
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/iterator.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tracer.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_fround.c
sql/backends/monet5/sql_round.c
Branch: Oct2020
Log Message:
Export less
diffs (truncated from 1002 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
@@ -826,13 +826,6 @@ str CMDstopTrace(Client cntxt, MalBlkPtr
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 FCTgetArrival(bat *ret);
-str FCTgetCaller(int *ret);
-str FCTgetDeparture(bat *ret);
-str FCTgetOwners(bat *ret);
-str FCTgetPlants(bat *ret, bat *ret2);
-str FCTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str GROUPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str GRPgroup1(bat *ngid, bat *next, bat *nhis, const bat *bid);
str GRPgroup11(bat *ngid, const bat *bid);
str GRPgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid);
@@ -878,17 +871,6 @@ str IOprintf(Client cntxt, MalBlkPtr mb,
str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOsetmallocsuccesscount(void *res, lng *nbytes);
str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ITRnewChunk(lng *res, bat *vid, bat *bid, lng *granule);
-str ITRnextChunk(lng *res, bat *vid, bat *bid, lng *granule);
-str ITRnext_dbl(dbl *i, dbl *step, dbl *last);
-str ITRnext_flt(flt *i, flt *step, flt *last);
-str ITRnext_hge(hge *i, hge *step, hge *last);
-str ITRnext_int(int *i, int *step, int *last);
-str ITRnext_lng(lng *i, lng *step, lng *last);
-str ITRnext_oid(oid *i, oid *step, oid *last);
-str ITRnext_sht(sht *i, sht *step, sht *last);
str MACROprocessor(Client cntxt, MalBlkPtr mb, Symbol t);
int MAL_MAXCLIENTS;
int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, lng argclaim);
@@ -907,9 +889,6 @@ str MANIFOLDevaluate(Client cntxt, MalBl
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);
-str MATpack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATpackIncrement(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int MCactiveClients(void);
str MCawakeClient(int id);
void MCcloseClient(Client c);
@@ -995,23 +974,6 @@ int QLOGisset(void);
str QLOGissetFcn(int *ret);
str QOToptimize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
QueryQueue QRYqueue;
-str RMTbatload(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTbincopyfrom(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTbincopyto(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTbintype(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTconnect(str *ret, str *uri, str *user, str *passwd);
-str RMTconnectScen(str *ret, str *ouri, str *user, str *passwd, str *scen);
-str RMTconnectTable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTdisconnect(void *ret, str *conn);
-str RMTepilogue(void *ret);
-str RMTexec(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTget(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTisalive(int *ret, str *conn);
-str RMTprelude(void *ret);
-str RMTput(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTregisterSupervisor(int *ret, str *sup_uuid, str *query_uuid);
-str RMTresolve(bat *ret, str *pat);
str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SERVERclient(void *res, const Stream *In, const Stream *Out);
str SERVERconnect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc);
@@ -1102,11 +1064,6 @@ str STRsubstring(str *ret, const str *s,
str STRsubstringTail(str *ret, const str *s, const int *start);
str STRsuffix(str *ret, const str *s, const int *l);
str STRtostr(str *res, const str *src);
-str SYSMONpause(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SYSMONqueue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SYSMONresume(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SYSMONstatistics(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SYSMONstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SYScpuStatistics(bat *ret, bat *ret2);
str SYSgdkEnv(bat *ret, bat *ret2);
str SYSgdkThread(bat *ret, bat *ret2);
@@ -1135,16 +1092,6 @@ str TKNZRgetLevel(bat *r, int *level);
str TKNZRlocate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str TKNZRopen(void *r, str *name);
str TKNZRtakeOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str TRACERcomp_info(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str TRACERflush_buffer(void *ret);
-str TRACERreset_adapter(void *ret);
-str TRACERreset_component_level(void *ret, str *comp_id);
-str TRACERreset_flush_level(void *ret);
-str TRACERreset_layer_level(void *ret, str *layer_id);
-str TRACERset_adapter(void *ret, str *adapter_id);
-str TRACERset_component_level(void *ret, str *comp_id, str *lvl_id);
-str TRACERset_flush_level(void *ret, str *lvl_id);
-str TRACERset_layer_level(void *ret, str *layer_id, str *lvl_id);
int TRACEtable(Client cntxt, BAT **r);
str TRNglobal_abort(bit *ret);
str TRNglobal_commit(bit *ret);
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
@@ -20,25 +20,25 @@ target_sources(malmodules
mal_io.c mal_io.h
mkey.c
manifold.c manifold.h
- iterator.c iterator.h
+ iterator.c
clients.c clients.h
- factories.c factories.h
- groupby.c groupby.h
+ factories.c
+ groupby.c
mdb.c
pcre.c
- mat.c mat.h
+ mat.c
transaction.c
oltp.c oltp.h
wlc.c
mal_mapi.c mal_mapi.h
- remote.c remote.h
+ remote.c
txtsim.c txtsim.h
tokenizer.c tokenizer.h
sample.c
json_util.c
querylog.c querylog.h
- sysmon.c sysmon.h
- tracer.c tracer.h
+ sysmon.c
+ tracer.c
projectionpath.c
tablet.c tablet.h
batcalc.c calc.c
diff --git a/monetdb5/modules/mal/factories.c b/monetdb5/modules/mal/factories.c
--- a/monetdb5/modules/mal/factories.c
+++ b/monetdb5/modules/mal/factories.c
@@ -12,9 +12,11 @@
* the commands provided here. to-be-completed-when-needed
*/
#include "monetdb_config.h"
-#include "factories.h"
+#include "mal.h"
+#include "mal_interpreter.h"
+#include "mal_namespace.h"
-str
+static str
FCTgetPlants(bat *ret, bat *ret2)
{
(void) ret;
@@ -22,35 +24,35 @@ FCTgetPlants(bat *ret, bat *ret2)
throw(MAL, "factories.getPlants", SQLSTATE(0A000) PROGRAM_NYI);
}
-str
+static str
FCTgetCaller(int *ret)
{
(void) ret;
throw(MAL, "factories.getCaller", SQLSTATE(0A000) PROGRAM_NYI);
}
-str
+static str
FCTgetOwners(bat *ret)
{
(void) ret;
throw(MAL, "factories.getOwner", SQLSTATE(0A000) PROGRAM_NYI);
}
-str
+static str
FCTgetArrival(bat *ret)
{
(void) ret;
throw(MAL, "factories.getArrival", SQLSTATE(0A000) PROGRAM_NYI);
}
-str
+static str
FCTgetDeparture(bat *ret)
{
(void) ret;
throw(MAL, "factories.getDeparture", SQLSTATE(0A000) PROGRAM_NYI);
}
-str
+static str
FCTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str mod = *getArgReference_str(stk, pci, 1);
diff --git a/monetdb5/modules/mal/factories.h b/monetdb5/modules/mal/factories.h
deleted file mode 100644
--- a/monetdb5/modules/mal/factories.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
- */
-
-/*
- * @+ Implementation code
- */
-#ifndef _FACTORIES_H
-#define _FACTORIES_H
-
-#include "mal.h"
-#include "mal_interpreter.h"
-#include "mal_namespace.h"
-
-mal_export str FCTgetPlants(bat *ret, bat *ret2);
-mal_export str FCTgetCaller(int *ret);
-mal_export str FCTgetOwners(bat *ret);
-mal_export str FCTgetArrival(bat *ret);
-mal_export str FCTgetDeparture(bat *ret);
-mal_export str FCTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-#endif /* _FACTORIES_H */
diff --git a/monetdb5/modules/mal/groupby.c b/monetdb5/modules/mal/groupby.c
--- a/monetdb5/modules/mal/groupby.c
+++ b/monetdb5/modules/mal/groupby.c
@@ -41,7 +41,8 @@
*
*/
#include "monetdb_config.h"
-#include "groupby.h"
+#include "mal.h"
+#include "mal_interpreter.h"
#include "group.h"
/*
@@ -153,7 +154,7 @@ GROUPdelete(AGGRtask *a){
* estimate of intermediate results using properties.
*/
-str
+static str
GROUPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
bat *grp = getArgReference_bat(stk, pci, 0);
diff --git a/monetdb5/modules/mal/groupby.h b/monetdb5/modules/mal/groupby.h
deleted file mode 100644
--- a/monetdb5/modules/mal/groupby.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
- */
-
-#ifndef _GROUPBY_H
-#define _GROUPBY_H
-
-#include "mal.h"
-#include "mal_interpreter.h"
-
-mal_export str GROUPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
-
-#endif /* _GROUPBY_H */
diff --git a/monetdb5/modules/mal/iterator.c b/monetdb5/modules/mal/iterator.c
--- a/monetdb5/modules/mal/iterator.c
+++ b/monetdb5/modules/mal/iterator.c
@@ -35,7 +35,8 @@
*/
#include "monetdb_config.h"
-#include "iterator.h"
+#include "mal.h"
+#include "mal_interpreter.h"
/*
* We start with the large chunk iterator.
@@ -45,7 +46,7 @@
* The number of elements in the chunk is limited by the granule
* size.
*/
-str
+static str
ITRnewChunk(lng *res, bat *vid, bat *bid, lng *granule)
{
BAT *b, *view;
@@ -76,7 +77,7 @@ ITRnewChunk(lng *res, bat *vid, bat *bid
* which also means that the view descriptor is already available.
* The granule size may differ in each call.
*/
-str
+static str
ITRnextChunk(lng *res, bat *vid, bat *bid, lng *granule)
{
BAT *b, *view;
@@ -116,7 +117,7 @@ ITRnextChunk(lng *res, bat *vid, bat *bi
* variable. If it returns zero the control variable has been reset
* to zero and end of stream has been reached.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
