Changeset: ccfccbbbbe29 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccfccbbbbe29
Modified Files:
Branch: sciql
Log Message:
merged
diffs (truncated from 1391 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
@@ -744,21 +744,48 @@ str ALGurangesplit(int *result, int *bid
str ALGuselect(int *result, int *bid, ptr low, ptr high);
str ALGuselect1(int *result, int *bid, ptr value);
str ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin,
bit *rin);
-str ARRAYgridBAT_int(int *ret, int *bid, int *groups, int *groupsize, int
*clustersize, int *offset);
-str ARRAYgridBAT_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng
*clustersize, lng *offset);
-str ARRAYgridBATshift_int(int *ret, int *bid, int *groups, int *groupsize, int
*clustersize, int *offset, int *shift);
-str ARRAYgridBATshift_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng
*clustersize, lng *offset, lng *shift);
-str ARRAYgridShift_int(int *ret, int *groups, int *groupsize, int
*clustersize, int *offset, int *shift);
-str ARRAYgridShift_lng(lng *ret, lng *groups, lng *groupsize, lng
*clustersize, lng *offset, lng *shift);
-str ARRAYgrid_int(int *ret, int *groups, int *groupsize, int *clustersize, int
*offset);
-str ARRAYgrid_lng(lng *ret, lng *groups, lng *groupsize, lng *clustersize, lng
*offset);
+str ARRAYembed(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYfiller(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYfiller_bat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYgetDimensions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYisFixed(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYisUnbounded(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYmap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYmultiply_dbl_dbl(int *ret, int *bid, int *rid);
+str ARRAYmultiply_flt_flt(int *ret, int *bid, int *rid);
str ARRAYmultiply_int_int(int *ret, int *bid, int *rid);
str ARRAYmultiply_int_lng(int *ret, int *bid, int *rid);
str ARRAYmultiply_lng_lng(int *ret, int *bid, int *rid);
str ARRAYmultiply_sht_int(int *ret, int *bid, int *rid);
str ARRAYmultiply_sht_lng(int *ret, int *bid, int *rid);
str ARRAYproduct(int *ret, int *bid, int *rid);
-str ARRAYproject(int *ret, int *bid, int *cst);
+str ARRAYreplace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYreplaceScalar(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYseries_bte(int *ret, bte *start, bte *step, bte *stop, int *grp, int
*series);
+str ARRAYseries_dbl(int *ret, dbl *start, dbl *step, dbl *stop, int *grp, int
*series);
+str ARRAYseries_flt(int *ret, flt *start, flt *step, flt *stop, int *grp, int
*series);
+str ARRAYseries_int(int *ret, int *start, int *step, int *stop, int *grp, int
*series);
+str ARRAYseries_lng(int *ret, lng *start, lng *step, lng *stop, int *grp, int
*series);
+str ARRAYseries_oid(int *ret, oid *start, oid *step, oid *stop, int *grp, int
*series);
+str ARRAYseries_sht(int *ret, sht *start, sht *step, sht *stop, int *grp, int
*series);
+str ARRAYtiles(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_oid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_oid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYumap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
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);
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -635,6 +635,35 @@ end main;
[ "slice", "pattern", "mat",
"(first:lng,last:lng,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:int,last:int,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:wrd,last:wrd,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
+[ "avg", "pattern", "array",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesAvg;" ]
+[ "embed", "pattern", "array",
"(shapes:bat[:oid,:any]...):bat[:oid,:oid] ",
"ARRAYembed;" ]
+[ "filler_", "function", "array", "(cnt:lng,v:any_1)
(id:bat[:oid,:lng],cellval:bat[:oid,:any_1]);",
"nil" ]
+[ "filler", "pattern", "array",
"(cnt:lng,v:any_1):bat[:oid,:any_1] ",
"ARRAYfiller;" ]
+[ "filler", "pattern", "array",
"(idx:bat[:oid,:any_1],v:any_2):bat[:oid,:any_2] ",
"ARRAYfiller_bat;" ]
+[ "getDimensions", "pattern", "array",
"(dims:bat[:oid,:any]...):int... ",
"ARRAYgetDimensions;" ]
+[ "isUnbounded", "pattern", "array",
"(dims:bat[:oid,:any]...):bit ",
"ARRAYisUnbounded;" ]
+[ "isFixed", "pattern", "array",
"(dims:bat[:oid,:any]...):bit ",
"ARRAYisFixed;" ]
+[ "map", "pattern", "array",
"(dims:bat[:oid,:any]...):bat[:oid,:oid] ",
"ARRAYmap;" ]
+[ "product", "command", "array",
"(b:bat[:any_3,:any_1],c:bat[:any_4,:any_2]):bat[:any_1,:any_2] ",
"ARRAYproduct;" ]
+[ "replace", "pattern", "array",
"(v1:bat[:oid,:any_1],idx:bat[:oid,:oid],v2:bat[:oid,:any_1]):bat[:oid,:any_1]
", "ARRAYreplace;" ]
+[ "replace", "pattern", "array",
"(v1:bat[:oid,:any_1],idx:bat[:oid,:oid],v2:any_1):bat[:oid,:any_1] ",
"ARRAYreplaceScalar;" ]
+[ "sum", "pattern", "array",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesSum;" ]
+[ "series_", "function", "array",
"(start:dbl,step:dbl,stop:dbl,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:dbl]);", "nil"
]
+[ "series", "command", "array",
"(start:dbl,step:dbl,stop:dbl,N:int,M:int):bat[:oid,:dbl] ",
"ARRAYseries_dbl;" ]
+[ "series_", "function", "array",
"(start:flt,step:flt,stop:flt,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:flt]);", "nil"
]
+[ "series", "command", "array",
"(start:flt,step:flt,stop:flt,N:int,M:int):bat[:oid,:flt] ",
"ARRAYseries_flt;" ]
+[ "series_", "function", "array",
"(start:lng,step:lng,stop:lng,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:lng]);", "nil"
]
+[ "series", "command", "array",
"(start:lng,step:lng,stop:lng,N:int,M:int):bat[:oid,:lng] ",
"ARRAYseries_lng;" ]
+[ "series_", "function", "array",
"(start:int,step:int,stop:int,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:int]);", "nil"
]
+[ "series", "command", "array",
"(start:int,step:int,stop:int,N:int,M:int):bat[:oid,:int] ",
"ARRAYseries_int;" ]
+[ "series_", "function", "array",
"(start:sht,step:sht,stop:sht,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:sht]);", "nil"
]
+[ "series", "command", "array",
"(start:sht,step:sht,stop:sht,N:int,M:int):bat[:oid,:sht] ",
"ARRAYseries_sht;" ]
+[ "series_", "function", "array",
"(start:bte,step:bte,stop:bte,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:bte]);", "nil"
]
+[ "series", "command", "array",
"(start:bte,step:bte,stop:bte,N:int,M:int):bat[:oid,:bte] ",
"ARRAYseries_bte;" ]
+[ "series_", "function", "array",
"(start:oid,step:oid,stop:oid,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:oid]);", "nil"
]
+[ "series", "command", "array",
"(start:oid,step:oid,stop:oid,N:int,M:int):bat[:oid,:oid] ",
"ARRAYseries_oid;" ]
+[ "tiles", "pattern", "array",
"(cells:bat[:oid,:any_1],template:bat[:oid,:oid]):bat[:oid,:oid] ",
"ARRAYtiles;" ]
+[ "unmap", "pattern", "array",
"(cells:bat[:oid,:oid],dims:bat[:oid,:any]...):bat[:oid,:any]... ",
"ARRAYumap;" ]
[ "makeBids", "pattern", "trader",
"(bidtype:sht,fnname1:str...):lng... ",
"TRADERmakeBids;"
]
[ "makeBid", "pattern", "trader",
"(fnname:str,bidtype:sht):lng ",
"TRADERmakeBid;"
]
[ "bind_dbat", "function", "remote",
"(dbconn:str,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
@@ -3555,16 +3584,6 @@ end main;
[ "utopn_min", "command", "pqueue",
"(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] ",
"PQutopn2_anymin;"
]
[ "utopn_min", "command", "pqueue",
"(a:bat[:oid,:oid],t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] ",
"PQutopn2_anymin;"
]
[ "utopn_min", "command", "pqueue",
"(t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] ",
"PQutopn_anymin;"
]
-[ "grid", "command", "array",
"(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] ",
"ARRAYgridBATshift_lng;"
]
-[ "grid", "command", "array",
"(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] ",
"ARRAYgridBAT_lng;"
]
-[ "grid", "command", "array",
"(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] ",
"ARRAYgridShift_lng;"
]
-[ "grid", "command", "array",
"(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] ",
"ARRAYgrid_lng;"
]
-[ "grid", "command", "array",
"(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] ",
"ARRAYgridBATshift_int;"
]
-[ "grid", "command", "array",
"(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int] ",
"ARRAYgridBAT_int;"
]
-[ "grid", "command", "array",
"(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] ",
"ARRAYgridShift_int;"
]
-[ "grid", "command", "array",
"(i:int,j:int,k:int,l:int):bat[:oid,:int] ",
"ARRAYgrid_int;"
]
-[ "project", "command", "array",
"(b:bat[:oid,:any_1],i:int):bat[:oid,:int] ",
"ARRAYproject;"
]
-[ "product", "command", "array",
"(b:bat[:any_3,:any_1],c:bat[:any_4,:any_2]):bat[:any_1,:any_2] ",
"ARRAYproduct;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:oid],e:bat[:any_2,:any_1]):bat[:any_2,:oid] ",
"GRPavg_oid;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:dbl],e:bat[:any_2,:any_1]):bat[:any_2,:dbl] ",
"GRPavg_dbl;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:flt],e:bat[:any_2,:any_1]):bat[:any_2,:flt] ",
"GRPavg_flt;"
]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -623,6 +623,35 @@ end main;
[ "slice", "pattern", "mat",
"(first:lng,last:lng,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:int,last:int,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:wrd,last:wrd,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
+[ "avg", "pattern", "array",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesAvg;" ]
+[ "embed", "pattern", "array",
"(shapes:bat[:oid,:any]...):bat[:oid,:oid] ",
"ARRAYembed;" ]
+[ "filler_", "function", "array", "(cnt:lng,v:any_1)
(id:bat[:oid,:lng],cellval:bat[:oid,:any_1]);",
"nil" ]
+[ "filler", "pattern", "array",
"(cnt:lng,v:any_1):bat[:oid,:any_1] ",
"ARRAYfiller;" ]
+[ "filler", "pattern", "array",
"(idx:bat[:oid,:any_1],v:any_2):bat[:oid,:any_2] ",
"ARRAYfiller_bat;" ]
+[ "getDimensions", "pattern", "array",
"(dims:bat[:oid,:any]...):int... ",
"ARRAYgetDimensions;" ]
+[ "isUnbounded", "pattern", "array",
"(dims:bat[:oid,:any]...):bit ",
"ARRAYisUnbounded;" ]
+[ "isFixed", "pattern", "array",
"(dims:bat[:oid,:any]...):bit ",
"ARRAYisFixed;" ]
+[ "map", "pattern", "array",
"(dims:bat[:oid,:any]...):bat[:oid,:oid] ",
"ARRAYmap;" ]
+[ "product", "command", "array",
"(b:bat[:any_3,:any_1],c:bat[:any_4,:any_2]):bat[:any_1,:any_2] ",
"ARRAYproduct;" ]
+[ "replace", "pattern", "array",
"(v1:bat[:oid,:any_1],idx:bat[:oid,:oid],v2:bat[:oid,:any_1]):bat[:oid,:any_1]
", "ARRAYreplace;" ]
+[ "replace", "pattern", "array",
"(v1:bat[:oid,:any_1],idx:bat[:oid,:oid],v2:any_1):bat[:oid,:any_1] ",
"ARRAYreplaceScalar;" ]
+[ "sum", "pattern", "array",
"(values:bat[:oid,:any_1],any:any...):bat[:oid,:any_1] ",
"ARRAYtilesSum;" ]
+[ "series_", "function", "array",
"(start:dbl,step:dbl,stop:dbl,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:dbl]);", "nil"
]
+[ "series", "command", "array",
"(start:dbl,step:dbl,stop:dbl,N:int,M:int):bat[:oid,:dbl] ",
"ARRAYseries_dbl;" ]
+[ "series_", "function", "array",
"(start:flt,step:flt,stop:flt,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:flt]);", "nil"
]
+[ "series", "command", "array",
"(start:flt,step:flt,stop:flt,N:int,M:int):bat[:oid,:flt] ",
"ARRAYseries_flt;" ]
+[ "series_", "function", "array",
"(start:lng,step:lng,stop:lng,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:lng]);", "nil"
]
+[ "series", "command", "array",
"(start:lng,step:lng,stop:lng,N:int,M:int):bat[:oid,:lng] ",
"ARRAYseries_lng;" ]
+[ "series_", "function", "array",
"(start:int,step:int,stop:int,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:int]);", "nil"
]
+[ "series", "command", "array",
"(start:int,step:int,stop:int,N:int,M:int):bat[:oid,:int] ",
"ARRAYseries_int;" ]
+[ "series_", "function", "array",
"(start:sht,step:sht,stop:sht,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:sht]);", "nil"
]
+[ "series", "command", "array",
"(start:sht,step:sht,stop:sht,N:int,M:int):bat[:oid,:sht] ",
"ARRAYseries_sht;" ]
+[ "series_", "function", "array",
"(start:bte,step:bte,stop:bte,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:bte]);", "nil"
]
+[ "series", "command", "array",
"(start:bte,step:bte,stop:bte,N:int,M:int):bat[:oid,:bte] ",
"ARRAYseries_bte;" ]
+[ "series_", "function", "array",
"(start:oid,step:oid,stop:oid,N:int,M:int)
(id:bat[:oid,:lng],dimval:bat[:oid,:oid]);", "nil"
]
+[ "series", "command", "array",
"(start:oid,step:oid,stop:oid,N:int,M:int):bat[:oid,:oid] ",
"ARRAYseries_oid;" ]
+[ "tiles", "pattern", "array",
"(cells:bat[:oid,:any_1],template:bat[:oid,:oid]):bat[:oid,:oid] ",
"ARRAYtiles;" ]
+[ "unmap", "pattern", "array",
"(cells:bat[:oid,:oid],dims:bat[:oid,:any]...):bat[:oid,:any]... ",
"ARRAYumap;" ]
[ "makeBids", "pattern", "trader",
"(bidtype:sht,fnname1:str...):lng... ",
"TRADERmakeBids;"
]
[ "makeBid", "pattern", "trader",
"(fnname:str,bidtype:sht):lng ",
"TRADERmakeBid;"
]
[ "bind_dbat", "function", "remote",
"(dbconn:str,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil" ]
@@ -3543,16 +3572,6 @@ end main;
[ "utopn_min", "command", "pqueue",
"(a:bat[:oid,:oid],t:bat[:void,:any_1],n:wrd):bat[:oid,:oid] ",
"PQutopn2_anymin;"
]
[ "utopn_min", "command", "pqueue",
"(a:bat[:oid,:oid],t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] ",
"PQutopn2_anymin;"
]
[ "utopn_min", "command", "pqueue",
"(t:bat[:oid,:any_1],n:wrd):bat[:oid,:oid] ",
"PQutopn_anymin;"
]
-[ "grid", "command", "array",
"(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] ",
"ARRAYgridBATshift_lng;"
]
-[ "grid", "command", "array",
"(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] ",
"ARRAYgridBAT_lng;"
]
-[ "grid", "command", "array",
"(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng] ",
"ARRAYgridShift_lng;"
]
-[ "grid", "command", "array",
"(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng] ",
"ARRAYgrid_lng;"
]
-[ "grid", "command", "array",
"(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] ",
"ARRAYgridBATshift_int;"
]
-[ "grid", "command", "array",
"(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int] ",
"ARRAYgridBAT_int;"
]
-[ "grid", "command", "array",
"(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int] ",
"ARRAYgridShift_int;"
]
-[ "grid", "command", "array",
"(i:int,j:int,k:int,l:int):bat[:oid,:int] ",
"ARRAYgrid_int;"
]
-[ "project", "command", "array",
"(b:bat[:oid,:any_1],i:int):bat[:oid,:int] ",
"ARRAYproject;"
]
-[ "product", "command", "array",
"(b:bat[:any_3,:any_1],c:bat[:any_4,:any_2]):bat[:any_1,:any_2] ",
"ARRAYproduct;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:oid],e:bat[:any_2,:any_1]):bat[:any_2,:oid] ",
"GRPavg_oid;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:dbl],e:bat[:any_2,:any_1]):bat[:any_2,:dbl] ",
"GRPavg_dbl;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:flt],e:bat[:any_2,:any_1]):bat[:any_2,:flt] ",
"GRPavg_flt;"
]
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -59,6 +59,7 @@ tmp mTests_jdbc_tests mTests_jdbc_tests
Resultset with 10 columns
TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS
TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME
REF_GENERATION
mTests_jdbc_tests sys _columns SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_jdbc_tests sys _dimensions SYSTEM TABLE null null
null null rowid SYSTEM
mTests_jdbc_tests sys _tables SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests sys args SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests sys auths SYSTEM TABLE null null null
null rowid SYSTEM
@@ -79,12 +80,15 @@ mTests_jdbc_tests sys triggers SYSTEM TA
mTests_jdbc_tests sys types SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests sys user_role SYSTEM TABLE null null
null null rowid SYSTEM
mTests_jdbc_tests tmp _columns SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_jdbc_tests tmp _dimensions SYSTEM TABLE null null
null null rowid SYSTEM
mTests_jdbc_tests tmp _tables SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp idxs SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp keys SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp objects SYSTEM TABLE null null null
null rowid SYSTEM
mTests_jdbc_tests tmp triggers SYSTEM TABLE null null
null null rowid SYSTEM
+mTests_jdbc_tests sys arrays SYSTEM VIEW SELECT * FROM (SELECT
p.*, 0 AS "temporary" FROM "sys"."_tables" AS p WHERE type = 6 UNION ALL SELECT
t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t WHERE type = 6) AS arrays;
null null null rowid SYSTEM
mTests_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT
p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t)
AS columns; null null null rowid SYSTEM
+mTests_jdbc_tests sys dimensions SYSTEM VIEW SELECT * FROM
(SELECT pc.*, "pd"."start", pd.step, pd.stop FROM "sys"."_columns" AS pc,
"sys"."_dimensions" AS pd WHERE pc.id = pd.column_id UNION ALL SELECT tc.*,
"td"."start", td.step, td.stop FROM "tmp"."_columns" AS tc, "tmp"."_dimensions"
AS td WHERE tc.id = td.column_id) AS dimensions; null null null
rowid SYSTEM
mTests_jdbc_tests sys querylog SYSTEM VIEW create view
querylog as
select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,
ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql
where qd.id = ql.id; null null null rowid SYSTEM
diff --git
a/sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
b/sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
---
a/sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
+++
b/sql/test/BugTracker-2008/Tests/alter_view_not_allowed.SF-2075195.stable.err
@@ -81,7 +81,7 @@ stderr of test 'alter_view_not_allowed.S
MAPI = monetdb@sofia:38256
QUERY = alter table myview alter column a set null;
-ERROR = !ALTER TABLE: cannot set column options for VIEW 'myview'
+ERROR = !ALTER TABLE/ARRAY: cannot set column options for VIEW 'myview'
# 12:25:51 >
# 12:25:51 > Done.
diff --git
a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
--- a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
+++ b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
@@ -84,7 +84,7 @@ stderr of test 'sql_command_kills_db.SF-
MAPI = monetdb@sofia:38256
QUERY = insert into t1 values ((select id, name from tables));
-ERROR = !cardinality violation (31>1)
+ERROR = !cardinality violation (35>1)
# 16:15:09 >
# 16:15:09 > Done.
diff --git a/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
b/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
--- a/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
+++ b/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
@@ -41,7 +41,7 @@ Ready.
[ 2046, "connections", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
[ 2055, "_tables", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
[ 2064, "_columns", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
-[ 2075, "keys", 2000, NULL, 0, true, 0, false, 0,
1, "one" ]
+[ 2075, "_dimensions", 2000, NULL, 0, true, 0, false,
0, 1, "one" ]
# 19:39:26 >
# 19:39:26 > Done.
diff --git
a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
--- a/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
+++ b/sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
@@ -29,19 +29,19 @@ Ready.
% L1 # name
% wrd # type
% 2 # length
-[ 30 ]
+[ 34 ]
#select count(distinct name) from tables;
% .tables # table_name
% L2 # name
% wrd # type
% 2 # length
-[ 24 ]
+[ 27 ]
#select count(name) , count(distinct name) from tables;
% .tables, .tables # table_name
% L3, L4 # name
% wrd, wrd # type
% 2, 2 # length
-[ 30, 24 ]
+[ 34, 27 ]
# 10:05:42 >
# 10:05:42 > Done.
diff --git a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
--- a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
+++ b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
@@ -123,6 +123,10 @@ Ready.
[ 123 ]
[ 123 ]
[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
+[ 123 ]
# 17:14:07 >
# 17:14:07 > "Done."
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -85,7 +85,7 @@ QUERY = select * from env() as env where
ERROR = !cardinality violation (21>1)
MAPI = monetdb@niels:39633
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
-ERROR = !cardinality violation (297>1)
+ERROR = !cardinality violation (374>1)
# 21:00:43 >
# 21:00:43 > Done.
diff --git a/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
b/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
--- a/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
+++ b/sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
@@ -58,6 +58,10 @@ Ready.
[ 28 ]
[ 29 ]
[ 30 ]
+[ 31 ]
+[ 32 ]
+[ 33 ]
+[ 34 ]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
