Changeset: e8b748c9ba12 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e8b748c9ba12
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/Tests/remote03.stable.out
Branch: default
Log Message:
Approve output
diffs (143 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
@@ -1430,11 +1430,10 @@ int JSONtoString(str *s, int *len, json
str JSONunfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str JSONvalueArray(json *ret, json *arg);
str JSONvalueTable(int *ret, json *j);
-str LCKcreate(monet_lock *l);
-str LCKdestroy(int *res, monet_lock *l);
-str LCKset(int *res, monet_lock *l);
-str LCKtry(int *res, monet_lock *l);
-str LCKunset(int *res, monet_lock *l);
+str KVdropdatabase(str name);
+str KVget(str dbkey, str name, ValPtr val, int tpe);
+str KVnewdatabase(str name, str tpe);
+str KVput(str dbkey, str name, ValPtr val, int tpe);
char *M5OutOfMemory;
str MACROprocessor(Client cntxt, MalBlkPtr mb, Symbol t);
int MAL_MAXCLIENTS;
@@ -1749,20 +1748,14 @@ int OPTstrengthReductionImplementation(C
str OPTvector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str OPTvectorOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str OPTwrapper(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str PCREcompile_wrap(pcre **res, str *pattern);
-str PCREexec_wrap(bit *res, pcre *pattern, str *s);
str PCREilike2(bit *ret, str *s, str *pat);
str PCREilike3(bit *ret, str *s, str *pat, str *esc);
str PCREilike_join_pcre(int *l, int *r, 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 *l, int *r, 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 PCRElikesubselect1(bat *ret, bat *bid, str *pat, str *esc, bit
*caseignore, bit *anti);
str PCRElikesubselect2(bat *ret, bat *bid, bat *sid, str *pat, str *esc, bit
*caseignore, bit *anti);
str PCRElikesubselect3(bat *ret, bat *bid, str *pat, str *esc, bit *anti);
@@ -1777,7 +1770,6 @@ str PCREreplace_bat_wrap(int *res, int *
str PCREreplace_wrap(str *res, str *or, str *pat, str *repl, str *flags);
str PCREselectDef(int *res, str *pattern, int *bid);
str PCREsql2pcre(str *ret, str *pat, str *esc);
-str PCREuselectDef(int *res, str *pattern, int *bid);
str PQdequeue_anymax(int *ret, int *bid);
str PQdequeue_anymin(int *ret, int *bid);
str PQdequeue_btemax(int *ret, int *bid);
@@ -2004,10 +1996,6 @@ str SABretreatScenario(int *ret, str *la
str SAMPLEsubuniform(bat *r, bat *b, ptr s);
str SAMPLEuniform(bat *r, bat *b, ptr s);
str SAMPLEuniform_dbl(bat *r, bat *b, ptr p);
-str SEMAcreate(monet_sema *res, int *init);
-str SEMAdestroy(int *res, monet_sema *s);
-str SEMAdown(int *res, monet_sema *s);
-str SEMAup(int *res, monet_sema *s);
str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SERVERclient(int *res, stream **In, stream **Out);
str SERVERconnect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc);
@@ -2573,7 +2561,6 @@ str likeuselectRef;
str listRef;
str loadLibrary(str modulename, int flag);
str lockRef;
-int lockToStr(char **dst, int *len, ptr *src);
int log_abort_wrap(logger *L);
int log_bat_clear_wrap(logger *L, str nme);
int log_bat_persists_wrap(logger *L, BAT *b, str nme);
@@ -2723,16 +2710,8 @@ int parseMAL(Client cntxt, Symbol curPrg
str partitionRef;
str passRef;
str pcreRef;
-void pcre_del(Heap *h, var_t *index);
-int pcre_fromstr(const char *instr, int *l, pcre **val);
-BUN pcre_hash(pcre *b);
-void pcre_heap(Heap *heap, size_t capacity);
str pcre_init(void);
-int pcre_length(pcre *p);
-int pcre_nequal(pcre *l, pcre *r);
-pcre *pcre_null(void);
var_t pcre_put(Heap *h, var_t *bun, pcre *val);
-int pcre_tostr(str *tostr, int *l, pcre *p);
str pinRef;
int pivotDisjunctiveProp;
int pivotProp;
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out
b/monetdb5/modules/mal/Tests/remote03.stable.out
--- a/monetdb5/modules/mal/Tests/remote03.stable.out
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out
@@ -66,7 +66,7 @@ exit MALException:str ;
remote.disconnect(conn);
end main;
[ "Received first error from the remote site" ]
-!SyntaxException:remote.exec:(mapi:monetdb://[email protected]/mTests_monetdb5_modules_mal)
rmt0__8_void := io.print.bla();
+
SyntaxException:parseError: ^'(' expected
[ "rmt1_bn_bat_oid_str" ]
@@ -88,27 +88,25 @@ SyntaxException:parseError:
[ 10@0, "dbl" ]
[ 11@0, "lng" ]
[ 12@0, "str" ]
-[ 13@0, "lock" ]
-[ 14@0, "sema" ]
-[ 15@0, "streams" ]
-[ 16@0, "bstream" ]
-[ 17@0, "blob" ]
-[ 18@0, "sqlblob" ]
-[ 19@0, "color" ]
-[ 20@0, "url" ]
-[ 21@0, "uuid" ]
-[ 22@0, "json" ]
-[ 23@0, "date" ]
-[ 24@0, "daytime" ]
-[ 25@0, "timestamp" ]
-[ 26@0, "timezone" ]
-[ 27@0, "zrule" ]
-[ 28@0, "inet" ]
-[ 29@0, "identifier" ]
-[ 30@0, "xml" ]
-[ 31@0, "pcre" ]
-[ 32@0, "mbr" ]
-[ 33@0, "wkb" ]
+[ 13@0, "streams" ]
+[ 14@0, "bstream" ]
+[ 15@0, "blob" ]
+[ 16@0, "sqlblob" ]
+[ 17@0, "color" ]
+[ 18@0, "url" ]
+[ 19@0, "uuid" ]
+[ 20@0, "json" ]
+[ 21@0, "date" ]
+[ 22@0, "daytime" ]
+[ 23@0, "timestamp" ]
+[ 24@0, "timezone" ]
+[ 25@0, "zrule" ]
+[ 26@0, "inet" ]
+[ 27@0, "identifier" ]
+[ 28@0, "xml" ]
+[ 29@0, "pcre" ]
+[ 30@0, "mbr" ]
+[ 31@0, "wkb" ]
[ "rmt2__8_void" ]
[ nil ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
