Changeset: 5c1f6ae69b1f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c1f6ae69b1f
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:
Approved exports list for default branch.
Note that there are lots of ABI changes to libmonetdb5.
diffs (truncated from 342 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
@@ -746,22 +746,14 @@ str ARRAYproject(int *ret, int *bid, int
str ATTbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ATTbindPartition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ATTlocation(str *fnme, int *bid);
-str AUTHBackendSum(str *ret, str *string, int *len);
-str AUTHMD5Sum(str *ret, str *string, int *len);
-str AUTHRIPEMD160Sum(str *ret, str *string, int *len);
-str AUTHSHA1Sum(str *ret, str *string, int *len);
-str AUTHSHA2Sum(str *ret, str *string, int *len, int *number);
-str AUTHaddScenario(Client *c, str *username, str *scenario);
-str AUTHaddUser(oid *ret, Client *c, str *user, str *pass, bat *scenarios);
+str AUTHaddUser(oid *ret, Client *c, str *user, str *pass);
str AUTHchangePassword(Client *c, str *oldpass, str *passwd);
str AUTHchangeUsername(Client *c, str *olduser, str *newuser);
-str AUTHcheckCredentials(oid *ret, Client *c, str *user, str *passwd, str
*challenge, str *algo, str *scenario);
-str AUTHgetHashAlgorithms(str *ret);
+str AUTHcheckCredentials(oid *ret, Client *c, str *user, str *passwd, str
*challenge, str *algo);
str AUTHgetPasswordHash(str *ret, Client *c, str *username);
str AUTHgetUsername(str *ret, Client *c);
-str AUTHgetUsers(BAT **ret, Client *c, bat *scenarios);
+str AUTHgetUsers(BAT **ret, Client *c);
str AUTHinitTables(void);
-str AUTHremoveScenario(Client *c, str *username, str *scenario);
str AUTHremoveUser(Client *c, str *username);
str AUTHrequireAdmin(Client *c);
str AUTHrequireAdminOrUser(Client *c, str *username);
@@ -2100,7 +2092,6 @@ str CLTInfo(Client cntxt, MalBlkPtr mb,
str CLTLastCommand(int *ret);
str CLTLogin(int *ret);
str CLTTime(int *ret);
-str CLTaddScenario(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTaddUser(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTbackendsum(str *ret, str *pw);
str CLTchangePassword(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -2114,7 +2105,6 @@ str CLTgetUsername(Client cntxt, MalBlkP
str CLTgetUsers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTmd5sum(str *ret, str *pw);
str CLTquit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CLTremoveScenario(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTremoveUser(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTripemd160sum(str *ret, str *pw);
str CLTsetHistory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -4288,6 +4278,7 @@ str LCKtry(int *res, monet_lock *l);
str LCKunset(int *res, monet_lock *l);
char *M5OutOfMemory;
str MACROprocessor(Client cntxt, MalBlkPtr mb, Symbol t);
+int MAL_MAXCLIENTS;
str MALassertBit(int *ret, bit *val, str *msg);
str MALassertInt(int *ret, int *val, str *msg);
str MALassertLng(int *ret, lng *val, str *msg);
@@ -4372,6 +4363,7 @@ str MATinfo(int *ret, str *grp, str *elm
str MATnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpack2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str MATpack3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackSlice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATprint(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -4390,10 +4382,9 @@ void MCcleanupClients(void);
void MCcloseClient(Client c);
int MCcountClients(void);
int MCdefault;
-void MCexitPending(void);
-Client MCfindClient(oid user, str scen, bstream *fin, stream *fout);
Client MCforkClient(Client c);
Client MCgetClient(int id);
+void MCinit(void);
Client MCinitClient(oid user, bstream *fin, stream *fout);
int MCinitClientThread(Client c);
void MCpopClientInput(Client c);
@@ -4402,7 +4393,6 @@ int MCreadClient(Client c);
str MCsuspendClient(int id, unsigned int timeout);
void MCtraceAllClients(int flag);
void MCtraceClient(oid which, int flag);
-int MCwait(Client c);
str MDBStkDepth(Client cntxt, MalBlkPtr mb, MalStkPtr s, InstrPtr p);
str MDBStkTrace(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
int MDBdelay;
@@ -4464,7 +4454,6 @@ str MRgetCloud(int *ret, str *nme);
char *MSP_locate_script(const char *mod_name);
char *MSP_locate_sqlscript(const char *mod_name, bit recurse);
void MSinitClientPrg(Client cntxt, str mod, str nme);
-void MSresetClientPrg(Client cntxt);
void MSresetInstructions(MalBlkPtr mb, int start);
void MSresetVariables(Client cntxt, MalBlkPtr mb, MalStkPtr glb, int start);
void MSscheduleClient(str command, str challenge, bstream *fin, stream *fout);
@@ -4592,7 +4581,7 @@ str MTIMEdate_LE(bit *ret, date *v, date
str MTIMEdate_LT(bit *ret, date *v, date *w);
str MTIMEdate_NEQ(bit *ret, date *v, date *w);
str MTIMEdate_add_month_interval_wrap(date *ret, date *t, int *months);
-str MTIMEdate_add_sec_interval_lng_wrap(date *ret, date *t, lng *sec);
+str MTIMEdate_add_msec_interval_lng_wrap(date *ret, date *t, lng *msec);
str MTIMEdate_add_sec_interval_wrap(date *ret, date *t, int *sec);
str MTIMEdate_adddays(date *ret, date *v, int *delta);
str MTIMEdate_addmonths(date *ret, date *v, int *delta);
@@ -4615,7 +4604,7 @@ str MTIMEdate_max(date *ret, date *v, da
str MTIMEdate_max_no_nil(date *ret, date *v, date *w);
str MTIMEdate_min(date *ret, date *v, date *w);
str MTIMEdate_min_no_nil(date *ret, date *v, date *w);
-str MTIMEdate_sub_sec_interval_lng_wrap(date *ret, date *t, lng *sec);
+str MTIMEdate_sub_msec_interval_lng_wrap(date *ret, date *t, lng *msec);
str MTIMEdate_sub_sec_interval_wrap(date *ret, date *t, int *sec);
str MTIMEdate_tostr(str *ret, date *d);
str MTIMEday_from_str(int *ret, str *day);
@@ -4681,8 +4670,8 @@ str MTIMEsql_year(int *ret, int *t);
str MTIMEstrftime(str *s, date *d, str *format);
str MTIMEstrptime(date *d, str *s, str *format);
str MTIMEsynonyms(bit *allow);
-str MTIMEtime_add_sec_interval_wrap(daytime *ret, daytime *t, lng *sec);
-str MTIMEtime_sub_sec_interval_wrap(daytime *ret, daytime *t, lng *sec);
+str MTIMEtime_add_msec_interval_wrap(daytime *ret, daytime *t, lng *msec);
+str MTIMEtime_sub_msec_interval_wrap(daytime *ret, daytime *t, lng *msec);
str MTIMEtimestamp(timestamp *ret, int *sec);
str MTIMEtimestamp2timestamp(timestamp *ret, timestamp *src);
str MTIMEtimestamp_EQ(bit *retval, timestamp *val1, timestamp *val2);
@@ -4693,7 +4682,7 @@ str MTIMEtimestamp_LT(bit *retval, times
str MTIMEtimestamp_NEQ(bit *retval, timestamp *val1, timestamp *val2);
str MTIMEtimestamp_add(timestamp *ret, timestamp *v, lng *msecs);
str MTIMEtimestamp_add_month_interval_wrap(timestamp *ret, timestamp *t, int
*months);
-str MTIMEtimestamp_add_sec_interval_lng_wrap(timestamp *ret, timestamp *t, lng
*sec);
+str MTIMEtimestamp_add_msec_interval_lng_wrap(timestamp *ret, timestamp *t,
lng *msec);
str MTIMEtimestamp_create(timestamp *ret, date *d, daytime *t, tzone *z);
str MTIMEtimestamp_create_default(timestamp *ret, date *d, daytime *t);
str MTIMEtimestamp_create_from_date(timestamp *ret, date *d);
@@ -4718,7 +4707,7 @@ str MTIMEtimestamp_month(int *ret, times
str MTIMEtimestamp_seconds(int *ret, timestamp *t);
str MTIMEtimestamp_sql_seconds(int *ret, timestamp *t);
str MTIMEtimestamp_sub_month_interval_wrap(timestamp *ret, timestamp *t, int
*months);
-str MTIMEtimestamp_sub_sec_interval_lng_wrap(timestamp *ret, timestamp *t, lng
*sec);
+str MTIMEtimestamp_sub_msec_interval_lng_wrap(timestamp *ret, timestamp *t,
lng *msec);
str MTIMEtimestamp_timestamp(timestamp *d, timestamp *s);
str MTIMEtimestamp_year(int *ret, timestamp *t);
str MTIMEtimezone(tzone *z, str *name);
@@ -4745,6 +4734,8 @@ str OPTaccessmode(Client cntxt, MalBlkPt
str OPTaccumulators(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
void OPTaliasRemap(InstrPtr p, int *alias);
str OPTaliases(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str OPTcentipede(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str OPTcentipedeMaterialize(int *result, int *bid, ptr low, ptr high);
str OPTcluster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTcoercion(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTcommonTerms(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -4781,6 +4772,7 @@ str OPToctopus(Client cntxt, MalBlkPtr m
str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTorigin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTpeephole(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str OPTpeers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str OPTprejoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTpushranges(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTrecycle(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -4794,17 +4786,20 @@ str OPTsingleton(Client cntxt, MalBlkPtr
str OPTstrengthReduction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
str OPTtrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTtraceCall(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str OPTvector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str PCREcompile_wrap(pcre **res, str *pattern);
str PCREexec_wrap(bit *res, pcre *pattern, str *s);
str PCREfromstr(str instr, int *l, pcre **val);
str PCREilike2(bit *ret, str *s, str *pat);
str PCREilike3(bit *ret, str *s, str *pat, str *esc);
+str PCREilike_join_pcre(int *ret, int *b, int *pat, str *esc);
str PCREilike_select_pcre(int *ret, int *b, str *pat, str *esc);
str PCREilike_uselect_pcre(int *ret, int *b, str *pat, str *esc);
str PCREimatch(bit *ret, str *val, str *pat);
str PCREindex(int *ret, pcre *pat, str *val);
str PCRElike2(bit *ret, str *s, str *pat);
str PCRElike3(bit *ret, str *s, str *pat, str *esc);
+str PCRElike_join_pcre(int *ret, int *b, int *pat, str *esc);
str PCRElike_select_pcre(int *ret, int *b, str *pat, str *esc);
str PCRElike_uselect_pcre(int *ret, int *b, str *pat, str *esc);
str PCREmatch(bit *ret, str *val, str *pat);
@@ -5156,10 +5151,11 @@ str RMTbincopyto(Client cntxt, MalBlkPtr
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 RMTdisconnect(int *ret, str *conn);
+str RMTdisconnect(Client cntxt, str *conn);
str RMTepilogue(int *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(int *ret);
str RMTput(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -5209,6 +5205,10 @@ str SABmarchScenario(int *ret, str *lang
str SABprelude(int *ret);
str SABretreatScenario(int *ret, str *lang);
str SABwildRetreat(int *ret);
+str SAMPLEuniform(bat *r, bat *b, ptr s);
+str SAMPLEuniform(bat *r, bat *b, ptr s){ BAT *br, *bb;
+str SAMPLEuniform_dbl(bat *r, bat *b, ptr p);
+str SAMPLEuniform_dbl(bat *r, bat *b, ptr p){ BAT *bb;
str SEMAcreate(monet_sema *res, int *init);
str SEMAdestroy(int *res, monet_sema *s);
str SEMAdown(int *res, monet_sema *s);
@@ -5268,6 +5268,14 @@ str SERVERtrace(int *ret, int *mid, int
int SQLBLOBfromstr(char *instr, int *l, blob **val);
int SQLBLOBtostr(str *tostr, int *l, blob *pin);
BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, char
*csep, char *rsep, char quote, lng skip, lng maxrow);
+str SRVPOOLconnect(str *c, str *dbname);
+str SRVPOOLexec(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str SRVPOOLlocal(int *res, int *flag);
+str SRVPOOLquery(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SRVPOOLregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SRVPOOLreset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SRVPOOLscheduler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str SRVsetServers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str STATclose(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str STATdeposit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str STATdepositStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -5399,8 +5407,9 @@ str SYSvm_usage(int *ret, lng *minsize);
ptr *TABLETadt_frStr(Column *c, int type, char *s, char *e, char quote);
int TABLETadt_toStr(void *extra, char **buf, int *len, int type, ptr a);
BUN TABLETassign_BATs(Tablet *as, BAT *bats);
+BAT **TABLETcollect(Tablet *as);
BAT *TABLETcollect_bats(Tablet *as);
-BAT *TABLETcollect_parts(Tablet *as, BUN offset);
+BAT **TABLETcollect_parts(Tablet *as, BUN offset);
int TABLETcreate_bats(Tablet *as, BUN est);
void TABLETdestroy_format(Tablet *as);
void TABLETdump(BAT *names, BAT *seps, BAT *bats, char *datafile, BUN nr);
@@ -5420,6 +5429,7 @@ str TABheader(Client cntxt, MalBlkPtr mb
str TABlastPage(int *ret);
str TABnextPage(int *ret);
str TABpage(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str TABprelude(int *ret);
str TABprevPage(int *ret);
str TABsetColumn(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str TABsetColumnBracket(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
@@ -5451,7 +5461,7 @@ str TKNZRgetLevel(int *r, int *level);
str TKNZRlocate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str TKNZRopen(int *r, str *name);
str TKNZRtakeOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-BAT *TRACEtable(void);
+void TRACEtable(BAT **r);
str TRADERmakeBid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str TRADERmakeBids(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str TRNglobal_abort(bit *ret);
@@ -5640,6 +5650,7 @@ int canBeCrackedProp;
int canBeJoinselectProp;
str catalogRef;
str catchKernelException(Client cntxt, str ret);
+str centipedeRef;
int charCst(Client cntxt, ValPtr val);
void chkDeclarations(MalBlkPtr mb);
void chkFlow(MalBlkPtr mb);
@@ -5662,7 +5673,6 @@ void clrFilter(Module cntxt, str mod, st
void clrFilterVariable(MalBlkPtr mb, int i);
void clrFunction(InstrPtr p);
void clrInstruction(InstrPtr p);
-void clrScenario(Client c);
int codeset(str *res);
int color_fromstr(char *colorStr, int *len, color **c);
int color_tostr(char **colorStr, int *len, color *c);
@@ -5754,7 +5764,6 @@ int fcnBinder(Module scope, MalBlkPtr mb
str fcnClass(InstrPtr p);
str fcnDefinition(MalBlkPtr mb, InstrPtr p, str s, int flg, str base, size_t
len);
int fileProp;
-str fillScenario(Client c, Scenario scen);
Box findBox(str name);
int findGDKtype(int type);
int findInstruction(Module scope, MalBlkPtr mb, InstrPtr pci);
@@ -5852,7 +5861,6 @@ void initLibraries(void);
void initNamespace(void);
void initParser(void);
void initProfiler(MalBlkPtr mb);
-str initScenario(Client c, Scenario s);
int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc);
int inlineProp;
str inplaceRef;
@@ -5916,6 +5924,7 @@ 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 likeselectRef;
str likeuselectRef;
void listFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first,
int step);
@@ -5959,7 +5968,7 @@ str malInclude(Client c, str name, int l
str malLoadScript(Client c, str name, bstream **fdin);
int malProfileMode;
str malRef;
-ClientRec mal_clients[MAL_MAXCLIENTS+1];
+ClientRec *mal_clients;
MT_Lock mal_contextLock;
MT_Lock mal_copyLock;
void mal_exit(void);
@@ -5974,6 +5983,7 @@ str markTRef;
str mark_grpRef;
str matRef;
str materializeRef;
+str materializeRef;
aggrFun maxAggr;
str maxRef;
str max_no_nilRef;
@@ -5982,6 +5992,7 @@ void mdbCommand(Client cntxt, MalBlkPtr
void mdbDump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list