Changeset: 6ccbd65c0197 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ccbd65c0197 Removed Files: monetdb5/modules/kernel/status.h monetdb5/modules/mal/bbp.h monetdb5/modules/mal/mal_io.h monetdb5/modules/mal/mal_mapi.h monetdb5/modules/mal/oltp.h monetdb5/modules/mal/profiler.h monetdb5/modules/mal/tokenizer.h Modified Files: clients/Tests/exports.stable.out monetdb5/modules/kernel/CMakeLists.txt monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/group.c monetdb5/modules/kernel/group.h monetdb5/modules/kernel/status.c monetdb5/modules/mal/CMakeLists.txt monetdb5/modules/mal/bbp.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/manifold.h monetdb5/modules/mal/oltp.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/orderidx.h monetdb5/modules/mal/profiler.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/querylog.h monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/wlc.c monetdb5/modules/mal/wlc.h monetdb5/optimizer/opt_oltp.h sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql_scenario.c Branch: default Log Message:
Unexport a bunch of stuff that doesn't need to be exported. diffs (truncated from 3018 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 @@ -706,117 +706,19 @@ str AUTHresolveUser(str *ret, oid uid); str AUTHsetPassword(Client c, const char *username, const char *passwd); str AUTHunlockVault(const char *password); str BATinfo(BAT **key, BAT **val, const bat bid); -str BKCappend_cand_force_wrap(bat *r, const bat *bid, const bat *uid, const bat *sid, const bit *force); -str BKCappend_cand_wrap(bat *r, const bat *bid, const bat *uid, const bat *sid); -str BKCappend_force_wrap(bat *r, const bat *bid, const bat *uid, const bit *force); -str BKCappend_val_force_wrap(bat *r, const bat *bid, const void *u, const bit *force); -str BKCappend_val_wrap(bat *r, const bat *bid, const void *u); -str BKCappend_wrap(bat *r, const bat *bid, const bat *uid); -str BKCattach(bat *ret, const int *tt, const char *const *heapfile); -str BKCbat_inplace(bat *r, const bat *bid, const bat *rid, const bat *uid); -str BKCbat_inplace_force(bat *r, const bat *bid, const bat *rid, const bat *uid, const bit *force); -str BKCbun_inplace(bat *r, const bat *bid, const oid *id, const void *t); -str BKCbun_inplace_force(bat *r, const bat *bid, const oid *id, const void *t, const bit *force); -str BKCdelete(bat *r, const bat *bid, const oid *h); -str BKCdelete_all(bat *r, const bat *bid); -str BKCdelete_multi(bat *r, const bat *bid, const bat *sid); -str BKCdensebat(bat *ret, const lng *size); -str BKCdiffcand(bat *ret, const bat *aid, const bat *bid); -str BKCgetAccess(str *res, const bat *bid); -str BKCgetBBPname(str *ret, const bat *bid); -str BKCgetCapacity(lng *res, const bat *bid); -str BKCgetColumnType(str *res, const bat *bid); -str BKCgetKey(bit *ret, const bat *bid); -str BKCgetRole(str *res, const bat *bid); -str BKCgetSequenceBase(oid *r, const bat *bid); -str BKCgetSize(lng *tot, const bat *bid); -str BKCinfo(bat *ret1, bat *ret2, const bat *bid); -str BKCintersectcand(bat *ret, const bat *aid, const bat *bid); -str BKCisPersistent(bit *res, const bat *bid); -str BKCisSorted(bit *res, const bat *bid); -str BKCisSortedReverse(bit *res, const bat *bid); -str BKCisSynced(bit *ret, const bat *bid1, const bat *bid2); -str BKCisTransient(bit *res, const bat *bid); -str BKCmergecand(bat *ret, const bat *aid, const bat *bid); str BKCmirror(bat *ret, const bat *bid); str BKCnewBAT(bat *res, const int *tt, const BUN *cap, role_t role); str BKCreuseBAT(bat *ret, const bat *bid, const bat *did); -str BKCreuseBATmap(bat *ret, const bat *bid, const bat *did); -str BKCsave(bit *res, const char *const *input); -str BKCsave2(void *r, const bat *bid); -str BKCsetAccess(bat *res, const bat *bid, const char *const *param); -str BKCsetColumn(void *r, const bat *bid, const char *const *tname); -str BKCsetHash(bit *ret, const bat *bid); -str BKCsetImprints(bit *ret, const bat *bid); str BKCsetName(void *r, const bat *bid, const char *const *s); str BKCsetPersistent(void *r, const bat *bid); -str BKCsetTransient(void *r, const bat *bid); str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did); ssize_t BLOBtostr(str *tostr, size_t *l, const void *pin, bool external); str CLTsessions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbbp(bat *ID, bat *NS, bat *TT, bat *CNT, bat *REFCNT, bat *LREFCNT, bat *LOCATION, bat *HEAT, bat *DIRTY, bat *STATUS, bat *KIND); -str CMDbbpCount(bat *ret); -str CMDbbpDirty(bat *ret); -str CMDbbpDiskSpace(lng *ret); -str CMDbbpKind(bat *ret); -str CMDbbpLRefCount(bat *ret); -str CMDbbpLocation(bat *ret); -str CMDbbpName(str *ret, bat *bid); -str CMDbbpNames(bat *ret); -str CMDbbpRefCount(bat *ret); -str CMDbbpStatus(bat *ret); -str CMDbbpbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDbbpgetIndex(int *res, bat *bid); -str CMDcleanupTraces(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDcloseProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDcpuloadPercentage(int *cycles, int *io, lng *user, lng *nice, lng *sys, lng *idle, lng *iowait); -str CMDcpustats(lng *user, lng *nice, lng *sys, lng *idle, lng *iowait); -str CMDgetBATlrefcnt(int *res, bat *bid); -str CMDgetBATrefcnt(int *res, bat *bid); -str CMDgetDiskReads(lng *ret); -str CMDgetDiskWrites(lng *ret); -str CMDgetPageSize(int *ret); -str CMDgetSystemTime(lng *ret); -str CMDgetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDgetUserTime(lng *ret); -str CMDgetprofilerlimit(int *res); -str CMDnoopProfiler(void *res); -str CMDopenProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDsetHeartbeat(void *res, int *ev); -str CMDsetName(str *rname, const bat *b, str *name); -str CMDsetprofilerlimit(void *res, int *lim); -str CMDstartProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -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 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); -str GRPgroup11(bat *ngid, const bat *bid); -str GRPgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid); -str GRPgroup21(bat *ngid, const bat *bid, const bat *sid); -str GRPgroup3(bat *ngid, bat *next, const bat *bid); -str GRPgroup4(bat *ngid, bat *next, const bat *bid, const bat *sid); -str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *gid); -str GRPsubgroup21(bat *ngid, const bat *bid, const bat *gid); -str GRPsubgroup3(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid, const bat *gid); -str GRPsubgroup31(bat *ngid, const bat *bid, const bat *sid, const bat *gid); -str GRPsubgroup4(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *gid, const bat *eid, const bat *hid); -str GRPsubgroup41(bat *ngid, const bat *bid, const bat *gid, const bat *eid, const bat *hid); str GRPsubgroup5(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); -str GRPsubgroup51(bat *ngid, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); -str GRPsubgroup6(bat *ngid, bat *next, const bat *bid, const bat *gid); -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 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); -str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -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 MACROprocessor(Client cntxt, MalBlkPtr mb, Symbol t); int MAL_MAXCLIENTS; int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); @@ -831,8 +733,6 @@ str MALoptimizer(Client c); str MALparser(Client c); str MALpipeline(Client c); 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); int MCactiveClients(void); str MCawakeClient(int id); @@ -851,21 +751,8 @@ void MSresetInstructions(MalBlkPtr mb, i void MSresetVariables(Client cntxt, MalBlkPtr mb, MalStkPtr glb, int start); void MSscheduleClient(str command, str challenge, bstream *fin, stream *fout, protocol_version protocol, size_t blocksize); str MSserveClient(Client cntxt); -str OIDXcreate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str OIDXcreateImplementation(Client cntxt, int tpe, BAT *b, int pieces); str OIDXdropImplementation(Client cntxt, BAT *b); -str OIDXgetorderidx(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OIDXhasorderidx(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OIDXmerge(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OIDXorderidx(bat *ret, const bat *bid, const bit *stable); -str OLTPdisable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OLTPenable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OLTPinit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OLTPis_enabled(int *ret); -str OLTPlock(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OLTPrelease(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OLTPreset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OLTPtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void OPTaliasRemap(InstrPtr p, int *alias); str OPTaliasesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str OPTbincopyfromImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -906,100 +793,22 @@ str OPTremoteQueriesImplementation(Clien str OPTreorderImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str OPTvolcanoImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str OPTwlcImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str QLOGappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str QLOGcalls(BAT **r); str QLOGcatalog(BAT **r); -str QLOGcontextNaive(void *ret, str *release, str *version, str *revision, str *uri); -str QLOGdefineNaive(void *ret, str *qry, str *opt, int *nr); str QLOGdisable(void *ret); str QLOGempty(void *ret); str QLOGenable(void *ret); str QLOGenableThreshold(void *ret, int *threshold); int QLOGisset(void); -str QLOGissetFcn(int *ret); str QOToptimize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); QueryQueue QRYqueue; str RMTdisconnect(void *ret, str *conn); -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); -str SERVERdestroy(void *ret, int *mid); -str SERVERdisconnect(void *ret, int *mid); -str SERVERdisconnectALL(int *ret); -str SERVERdisconnectWithAlias(int *ret, str *db_alias); -str SERVERerror(int *ret, int *idx); -str SERVERexplain(str *ret, int *idx); -str SERVERfetch_all_rows(lng *ret, int *idx); -str SERVERfetch_field_bat(bat *bid, int *idx); -str SERVERfetch_field_bte(bte *ret, int *idx, int *fnr); -str SERVERfetch_field_hge(hge *ret, int *idx, int *fnr); -str SERVERfetch_field_int(int *ret, int *idx, int *fnr); -str SERVERfetch_field_lng(lng *ret, int *idx, int *fnr); -str SERVERfetch_field_oid(oid *ret, int *idx, int *fnr); -str SERVERfetch_field_sht(sht *ret, int *idx, int *fnr); -str SERVERfetch_field_str(str *ret, int *idx, int *fnr); -str SERVERfetch_field_void(void *ret, int *idx, int *fnr); -str SERVERfetch_line(str *ret, int *key); -str SERVERfetch_reset(int *ret, int *key); -str SERVERfetch_row(int *ret, int *idx); -str SERVERfinish(int *ret, int *idx); -str SERVERgetError(str *ret, int *idx); -str SERVERget_field_count(int *ret, int *idx); -str SERVERget_row_count(lng *ret, int *idx); -str SERVERlisten_default(int *ret); -str SERVERlisten_port(int *ret, int *pid); -str SERVERlisten_usock(int *ret, str *usock); -str SERVERlookup(int *ret, str *dbalias); -str SERVERmapi_rpc_bat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str SERVERmapi_rpc_single_bat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str SERVERmapi_rpc_single_row(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str SERVERnext_result(int *ret, int *key); -str SERVERping(int *ret, int *mid); -str SERVERprepare(int *ret, int *key, str *qry); -str SERVERput(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str SERVERputLocal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str SERVERquery(int *ret, int *mid, str *qry); -str SERVERquery_array(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); -str SERVERquery_handle(int *ret, int *mid, str *qry); -str SERVERreconnect(void *ret, int *mid); -str SERVERreconnectAlias(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); -str SERVERreconnectWithoutAlias(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); -str SERVERresume(void *ret); -str SERVERrows_affected(lng *ret, int *idx); -str SERVERsetAlias(void *ret, int *mid, str *dbalias); -str SERVERstop(void *ret); -str SERVERsuspend(void *ret); -str SERVERtrace(void *ret, int *mid, int *flag); BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char *csep, const char *rsep, char quote, lng skip, lng maxrow, int best, bool from_stdin, const char *tabnam, bool escape); -str SYScpuStatistics(bat *ret, bat *ret2); -str SYSgdkEnv(bat *ret, bat *ret2); -str SYSgdkThread(bat *ret, bat *ret2); -str SYSgetmem_cursize(lng *num); -str SYSgetmem_maxsize(lng *num); -str SYSgetvm_cursize(lng *num); -str SYSgetvm_maxsize(lng *num); -str SYSioStatistics(bat *ret, bat *ret2); -str SYSmemStatistics(bat *ret, bat *ret2); -str SYSmem_usage(bat *ret, bat *ret2, const lng *minsize); -str SYSsetmem_maxsize(void *ret, const lng *num); -str SYSsetvm_maxsize(void *ret, const lng *num); -str SYSvm_usage(bat *ret, bat *ret2, const lng *minsize); str TABLETcollect(BAT **bats, Tablet *as); str TABLETcollect_parts(BAT **bats, Tablet *as, BUN offset); str TABLETcreate_bats(Tablet *as, BUN est); void TABLETdestroy_format(Tablet *as); int TABLEToutput_file(Tablet *as, BAT *order, stream *s); -str TKNZRappend(oid *pos, str *tuple); -str TKNZRclose(void *r); -str TKNZRdepositFile(void *r, str *fnme); -str TKNZRgetCardinality(bat *r); -str TKNZRgetCount(bat *r); -str TKNZRgetIndex(bat *r); -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); int TRACEtable(Client cntxt, BAT **r); str TRNglobal_abort(bit *ret); str TRNglobal_commit(bit *ret); @@ -1012,32 +821,10 @@ int TYPE_blob; int TYPE_uuid; int TYPE_xml; UserStats USRstats; -str WLCaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCcatalog(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCclear_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str WLCcommit(int clientid); -str WLCcommitCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCdelete(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCepilogue(void *ret); -str WLCfinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCflush(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCgeneric(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCgetConfig(void); -str WLCgetbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCgetclock(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCgettick(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str WLCinit(void); -str WLCinitCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCmaster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCquery(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str WLCreadConfig(FILE *fd); str WLCrollback(int clientid); -str WLCrollbackCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCsetbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCtransaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str WLCupdate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int WLCused(void); const char *abortRef; const char *actionRef; @@ -1300,7 +1087,6 @@ void initHeartbeat(void); void initNamespace(void); void initParser(void); void initProfiler(void); -str initQlog(void); int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc); void insertSymbol(Module scope, Symbol prg); str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden); @@ -1308,8 +1094,6 @@ const char *intRef; const char *intersectRef; const char *intersectcandRef; const char *ioRef; -str io_stdin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str io_stdout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
