Changeset: c11d5abbb35a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c11d5abbb35a
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/exports.stable.out
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/batExtensions.h
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/language.h
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mal_mapi.h
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/transaction.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_gencode.h
sql/backends/monet5/sql_scenario.h
Branch: Oct2014
Log Message:
Cleanup: removed unused stuff, added a few missing MAL interfaces.
diffs (truncated from 824 to 300 lines):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -31235,6 +31235,22 @@ command batcalc.wrd(v:bat[:oid,:flt],dig
address batflt_num2dec_wrd;
comment cast number to decimal(wrd) and check for overflow
+command batcalc.wrd(v:bat[:oid,:str],digits:int,scale:int):bat[:oid,:wrd]
+address batstr_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:str],digits:int):bat[:oid,:wrd]
+address batstr_2num_wrd;
+comment cast to wrd and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:wrd]
+address batnil_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:oid],digits:int):bat[:oid,:wrd]
+address batnil_2num_wrd;
+comment cast to wrd and check for overflow
+
pattern batcalc.wrd_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:wrd]
address CMDconvert_wrd;
comment cast from str to wrd with candidates list
@@ -38355,6 +38371,22 @@ command calc.wrd(v:flt,digits:int,scale:
address flt_num2dec_wrd;
comment cast number to decimal(wrd) and check for overflow
+command calc.wrd(v:str,digits:int,scale:int):wrd
+address str_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command calc.wrd(v:str,digits:int):wrd
+address str_2num_wrd;
+comment cast to wrd and check for overflow
+
+command calc.wrd(v:void,digits:int,scale:int):wrd
+address nil_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command calc.wrd(v:void,digits:int):wrd
+address nil_2num_wrd;
+comment cast to wrd and check for overflow
+
command calc.wkb(v:wkb):wkb
address wkbFromWKB;
command calc.wkb{unsafe}(v:str):wkb
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -31156,6 +31156,22 @@ command batcalc.wrd(v:bat[:oid,:flt],dig
address batflt_num2dec_wrd;
comment cast number to decimal(wrd) and check for overflow
+command batcalc.wrd(v:bat[:oid,:str],digits:int,scale:int):bat[:oid,:wrd]
+address batstr_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:str],digits:int):bat[:oid,:wrd]
+address batstr_2num_wrd;
+comment cast to wrd and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:wrd]
+address batnil_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:oid],digits:int):bat[:oid,:wrd]
+address batnil_2num_wrd;
+comment cast to wrd and check for overflow
+
pattern batcalc.wrd_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:wrd]
address CMDconvert_wrd;
comment cast from str to wrd with candidates list
@@ -38276,6 +38292,22 @@ command calc.wrd(v:flt,digits:int,scale:
address flt_num2dec_wrd;
comment cast number to decimal(wrd) and check for overflow
+command calc.wrd(v:str,digits:int,scale:int):wrd
+address str_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command calc.wrd(v:str,digits:int):wrd
+address str_2num_wrd;
+comment cast to wrd and check for overflow
+
+command calc.wrd(v:void,digits:int,scale:int):wrd
+address nil_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command calc.wrd(v:void,digits:int):wrd
+address nil_2num_wrd;
+comment cast to wrd and check for overflow
+
command calc.wkb(v:wkb):wkb
address wkbFromWKB;
command calc.wkb{unsafe}(v:str):wkb
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -31156,6 +31156,22 @@ command batcalc.wrd(v:bat[:oid,:flt],dig
address batflt_num2dec_wrd;
comment cast number to decimal(wrd) and check for overflow
+command batcalc.wrd(v:bat[:oid,:str],digits:int,scale:int):bat[:oid,:wrd]
+address batstr_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:str],digits:int):bat[:oid,:wrd]
+address batstr_2num_wrd;
+comment cast to wrd and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:wrd]
+address batnil_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:oid],digits:int):bat[:oid,:wrd]
+address batnil_2num_wrd;
+comment cast to wrd and check for overflow
+
pattern batcalc.wrd_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:wrd]
address CMDconvert_wrd;
comment cast from str to wrd with candidates list
@@ -38276,6 +38292,22 @@ command calc.wrd(v:flt,digits:int,scale:
address flt_num2dec_wrd;
comment cast number to decimal(wrd) and check for overflow
+command calc.wrd(v:str,digits:int,scale:int):wrd
+address str_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command calc.wrd(v:str,digits:int):wrd
+address str_2num_wrd;
+comment cast to wrd and check for overflow
+
+command calc.wrd(v:void,digits:int,scale:int):wrd
+address nil_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command calc.wrd(v:void,digits:int):wrd
+address nil_2num_wrd;
+comment cast to wrd and check for overflow
+
command calc.wkb(v:wkb):wkb
address wkbFromWKB;
command calc.wkb{unsafe}(v:str):wkb
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -31151,6 +31151,22 @@ command batcalc.wrd(v:bat[:oid,:flt],dig
address batflt_num2dec_wrd;
comment cast number to decimal(wrd) and check for overflow
+command batcalc.wrd(v:bat[:oid,:str],digits:int,scale:int):bat[:oid,:wrd]
+address batstr_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:str],digits:int):bat[:oid,:wrd]
+address batstr_2num_wrd;
+comment cast to wrd and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:wrd]
+address batnil_2dec_wrd;
+comment cast to dec(wrd) and check for overflow
+
+command batcalc.wrd(v:bat[:oid,:oid],digits:int):bat[:oid,:wrd]
+address batnil_2num_wrd;
+comment cast to wrd and check for overflow
+
pattern batcalc.wrd_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:wrd]
address CMDconvert_wrd;
comment cast from str to wrd with candidates list
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
@@ -1055,7 +1055,6 @@ str CLUSTER_column(Client cntxt, MalBlkP
str CLUSTER_key(bat *M, const bat *B);
str CLUSTER_map(bat *RB, const bat *B);
str CLUSTER_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDBATclone(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
str CMDBATderivedByName(bat *ret, str *nme);
str CMDBATimprints(void *ret, bat *bid);
str CMDBATimprintsize(lng *ret, bat *bid);
@@ -1077,10 +1076,6 @@ str CMDbatBETWEENsymmetric(Client cntxt,
str CMDbatCMP(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDbatDECR(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDbatDIV(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDbatDIVdbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDbatDIVdblsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDbatDIVflt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDbatDIVfltsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDbatDIVsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDbatEQ(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDbatGE(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1127,11 +1122,9 @@ str CMDcallBAT(Client cntxt, MalBlkPtr m
str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcleanup(void *ret);
-str CMDclearEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDclearTrace(void *res);
str CMDcloseProfilerStream(void *res);
str CMDclrFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDclrFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pc);
str CMDconvert_bit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDconvert_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDconvert_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1169,7 +1162,6 @@ str CMDgetSystemTime(lng *ret);
str CMDgetTrace(bat *res, str *ev);
str CMDgetUserTime(lng *ret);
str CMDifthen(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDincludeFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDmodules(bat *bid);
str CMDnoopProfiler(void *res);
str CMDopenProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
@@ -1857,7 +1849,6 @@ str SERVERdisconnect(void *ret, int *mid
str SERVERdisconnectALL(int *ret);
str SERVERdisconnectWithAlias(int *ret, str *db_alias);
str SERVERerror(int *ret, int *idx);
-str SERVERexecute(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);
@@ -1973,17 +1964,12 @@ str STRbatTailcst(bat *ret, const bat *l
str STRbatUpper(bat *ret, const bat *l);
str STRbatWChrAt(bat *ret, const bat *l, const bat *r);
str STRbatWChrAtcst(bat *ret, const bat *l, const int *cst);
-str STRbatreplace(bat *ret, const bat *l, const str *pat, const str *s2);
str STRbatstrSearch(bat *ret, const bat *l, const bat *r);
str STRbatstrSearchcst(bat *ret, const bat *l, const str *cst);
str STRbatstringLength(bat *ret, const bat *l);
str STRbatsubstring(bat *ret, const bat *l, const bat *r, const bat *t);
str STRbatsubstringcst(bat *ret, const bat *bid, const int *start, const int
*length);
str STRcodeset(str *res);
-str STRcstPrefixbat(bat *ret, const str *cst, const bat *r);
-str STRcstRstrSearchbat(bat *ret, const str *cst, const bat *r);
-str STRcstSuffixbat(bat *ret, const str *cst, const bat *r);
-str STRcststrSearchbat(bat *ret, const str *cst, const bat *r);
str STRinsert(str *ret, const str *s, const int *start, const int *l, const
str *s2);
str STRlikewrap(bit *ret, const str *s, const str *pat, const str *esc);
str STRlikewrap2(bit *ret, const str *s, const str *pat);
@@ -2043,7 +2029,6 @@ str TRADERmakeBids(Client cntxt, MalBlkP
str TRNglobal_abort(bit *ret);
str TRNglobal_commit(bit *ret);
str TRNglobal_sync(bit *ret);
-str TRNsub_commit(bit *ret, bat *bid);
str TRNsubcommit(bit *ret, bat *bid);
str TRNtrans_abort(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str TRNtrans_alpha(bat *ret, bat *bid);
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -52,16 +52,12 @@
batstr_export str STRbatPrefix(bat *ret, const bat *l, const bat *r);
batstr_export str STRbatPrefixcst(bat *ret, const bat *l, const str *cst);
-batstr_export str STRcstPrefixbat(bat *ret, const str *cst, const bat *r);
batstr_export str STRbatSuffix(bat *ret, const bat *l, const bat *r);
batstr_export str STRbatSuffixcst(bat *ret, const bat *l, const str *cst);
-batstr_export str STRcstSuffixbat(bat *ret, const str *cst, const bat *r);
batstr_export str STRbatstrSearch(bat *ret, const bat *l, const bat *r);
batstr_export str STRbatstrSearchcst(bat *ret, const bat *l, const str *cst);
-batstr_export str STRcststrSearchbat(bat *ret, const str *cst, const bat *r);
batstr_export str STRbatRstrSearch(bat *ret, const bat *l, const bat *r);
batstr_export str STRbatRstrSearchcst(bat *ret, const bat *l, const str *cst);
-batstr_export str STRcstRstrSearchbat(bat *ret, const str *cst, const bat *r);
batstr_export str STRbatTail(bat *ret, const bat *l, const bat *r);
batstr_export str STRbatTailcst(bat *ret, const bat *l, const int *cst);
batstr_export str STRbatWChrAt(bat *ret, const bat *l, const bat *r);
@@ -99,7 +95,6 @@ batstr_export str STRbatBytes(bat *ret,
batstr_export str STRbatsubstringcst(bat *ret, const bat *bid, const int
*start, const int *length);
batstr_export str STRbatsubstring(bat *ret, const bat *l, const bat *r, const
bat *t);
-batstr_export str STRbatreplace(bat *ret, const bat *l, const str *pat, const
str *s2);
#define prepareOperand(X,Y,Z) \
@@ -873,34 +868,6 @@ bunins_failed:
throw(MAL, "batstr""prefix", OPERATION_FAILED " During bulk operation");
}
-str STRcstPrefixbat(bat *ret, const str *cst, const bat *r)
-{
- BATiter righti;
- BAT *bn, *right;
- BUN p,q;
- bit v, *vp= &v;
-
- prepareOperand(right,r,"batstr.prefix");
- prepareResult(bn,right,TYPE_bit,"batstr.prefix");
-
- righti = bat_iterator(right);
-
- BATloop(right, p, q) {
- ptr h = BUNhead(righti,p);
- str tr = (str) BUNtail(righti,p);
- STRPrefix(vp, cst, &tr);
- bunfastins(bn, h, vp);
- }
- bn->T->nonil = 0;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
