Changeset: d131650df58e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d131650df58e Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 gdk/gdk_bbp.c gdk/gdk_search.c monetdb5/mal/Tests/All monetdb5/mal/Tests/dataflow01.malC monetdb5/mal/mal_linker.c monetdb5/mal/mal_profiler.c monetdb5/modules/kernel/00_aggr_hge.mal monetdb5/modules/kernel/00_aggr_hge.mal.sh monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/01_calc.mal monetdb5/modules/mal/Tests/manifold.malC monetdb5/modules/mal/mal_mapi.c monetdb5/optimizer/Tests/dataflow.malC monetdb5/optimizer/Tests/dataflow.stable.out monetdb5/scheduler/Tests/All sql/backends/monet5/sql.c sql/backends/monet5/sql_decimal.mal.sh sql/backends/monet5/sql_decimal_hge.mal.sh sql/benchmarks/wisconsin/Tests/All sql/server/rel_psm.c sql/server/rel_select.c sql/storage/store.c sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py sql/test/BugTracker/Tests/caching.SF-1651599.stable.out Branch: rdf Log Message:
Merge with default branch. diffs (truncated from 3992 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -3964,15 +3964,15 @@ pattern batcalc.!=(b1:bat[:bte],b2:bat[: address CMDbatNE; comment Return B1 != B2 -pattern batcalc.!=(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatNE; -comment Return V != B with candidates list - -pattern batcalc.!=(vb:bat[:oid]):bat[:bit] -address CMDbatNE; -comment Return V != B - -pattern batcalc.!=(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.!=(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatNE; +comment Return V != B with candidates list + +pattern batcalc.!=(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatNE; +comment Return V != B + +pattern batcalc.!=(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatNE; comment Return B != V with candidates list @@ -12660,15 +12660,15 @@ pattern batcalc.<=(b1:bat[:bte],b2:bat[: address CMDbatLE; comment Return B1 <= B2 -pattern batcalc.<=(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatLE; -comment Return V <= B with candidates list - -pattern batcalc.<=(vb:bat[:oid]):bat[:bit] -address CMDbatLE; -comment Return V <= B - -pattern batcalc.<=(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.<=(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatLE; +comment Return V <= B with candidates list + +pattern batcalc.<=(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatLE; +comment Return V <= B + +pattern batcalc.<=(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatLE; comment Return B <= V with candidates list @@ -13908,15 +13908,15 @@ pattern batcalc.<(b1:bat[:bte],b2:bat[:b address CMDbatLT; comment Return B1 < B2 -pattern batcalc.<(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatLT; -comment Return V < B with candidates list - -pattern batcalc.<(vb:bat[:oid]):bat[:bit] -address CMDbatLT; -comment Return V < B - -pattern batcalc.<(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.<(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatLT; +comment Return V < B with candidates list + +pattern batcalc.<(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatLT; +comment Return V < B + +pattern batcalc.<(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatLT; comment Return B < V with candidates list @@ -15916,15 +15916,15 @@ pattern batcalc.==(b1:bat[:bte],b2:bat[: address CMDbatEQ; comment Return B1 == B2 -pattern batcalc.==(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatEQ; -comment Return V == B with candidates list - -pattern batcalc.==(vb:bat[:oid]):bat[:bit] -address CMDbatEQ; -comment Return V == B - -pattern batcalc.==(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.==(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatEQ; +comment Return V == B with candidates list + +pattern batcalc.==(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatEQ; +comment Return V == B + +pattern batcalc.==(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatEQ; comment Return B == V with candidates list @@ -17244,15 +17244,15 @@ pattern batcalc.>=(b1:bat[:bte],b2:bat[: address CMDbatGE; comment Return B1 >= B2 -pattern batcalc.>=(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatGE; -comment Return V >= B with candidates list - -pattern batcalc.>=(vb:bat[:oid]):bat[:bit] -address CMDbatGE; -comment Return V >= B - -pattern batcalc.>=(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.>=(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatGE; +comment Return V >= B with candidates list + +pattern batcalc.>=(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatGE; +comment Return V >= B + +pattern batcalc.>=(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatGE; comment Return B >= V with candidates list @@ -18492,15 +18492,15 @@ pattern batcalc.>(b1:bat[:bte],b2:bat[:b address CMDbatGT; comment Return B1 > B2 -pattern batcalc.>(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatGT; -comment Return V > B with candidates list - -pattern batcalc.>(vb:bat[:oid]):bat[:bit] -address CMDbatGT; -comment Return V > B - -pattern batcalc.>(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.>(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatGT; +comment Return V > B with candidates list + +pattern batcalc.>(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatGT; +comment Return V > B + +pattern batcalc.>(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatGT; comment Return B > V with candidates list @@ -22456,15 +22456,15 @@ pattern batcalc.cmp(b1:bat[:bte],b2:bat[ address CMDbatCMP; comment Return -1/0/1 if B1 </==/> B2 -pattern batcalc.cmp(vb:bat[:oid],s:bat[:oid]):bat[:bte] -address CMDbatCMP; -comment Return -1/0/1 if V </==/> B with candidates list - -pattern batcalc.cmp(b:bat[:oid],vs:bat[:oid]):bat[:bte] -address CMDbatCMP; -comment Return -1/0/1 if B </==/> V with candidates list - -pattern batcalc.cmp(vb:bat[:oid]):bat[:bte] +pattern batcalc.cmp(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bte] +address CMDbatCMP; +comment Return -1/0/1 if V </==/> B with candidates list + +pattern batcalc.cmp(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bte] +address CMDbatCMP; +comment Return -1/0/1 if B </==/> V with candidates list + +pattern batcalc.cmp(v:oid,b:bat[:oid]):bat[:bte] address CMDbatCMP; comment Return -1/0/1 if V </==/> B @@ -24320,18 +24320,6 @@ pattern batcalc.ifthenelse(b:bat[:bit],v address CMDifthen; comment If-then-else operation to assemble a conditional result -pattern batcalc.ifthenelse(v:bit,b1:bat[:any_1],v2:any_1):bat[:any_1] -address CMDifthen; -comment If-then-else operation to assemble a conditional result - -pattern batcalc.ifthenelse(v:bit,v1:any_1,b2:bat[:any_1]):bat[:any_1] -address CMDifthen; -comment If-then-else operation to assemble a conditional result - -pattern batcalc.ifthenelse(v:bit,b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] -address CMDifthen; -comment If-then-else operation to assemble a conditional result - pattern batcalc.int_noerror(b:bat[:str],s:bat[:oid]):bat[:int] address CMDconvert_int; comment cast from str to int with candidates list diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -4415,15 +4415,15 @@ pattern batcalc.!=(b1:bat[:bte],b2:bat[: address CMDbatNE; comment Return B1 != B2 -pattern batcalc.!=(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatNE; -comment Return V != B with candidates list - -pattern batcalc.!=(vb:bat[:oid]):bat[:bit] -address CMDbatNE; -comment Return V != B - -pattern batcalc.!=(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.!=(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatNE; +comment Return V != B with candidates list + +pattern batcalc.!=(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatNE; +comment Return V != B + +pattern batcalc.!=(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatNE; comment Return B != V with candidates list @@ -15943,15 +15943,15 @@ pattern batcalc.<=(b1:bat[:bte],b2:bat[: address CMDbatLE; comment Return B1 <= B2 -pattern batcalc.<=(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatLE; -comment Return V <= B with candidates list - -pattern batcalc.<=(vb:bat[:oid]):bat[:bit] -address CMDbatLE; -comment Return V <= B - -pattern batcalc.<=(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.<=(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatLE; +comment Return V <= B with candidates list + +pattern batcalc.<=(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatLE; +comment Return V <= B + +pattern batcalc.<=(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatLE; comment Return B <= V with candidates list @@ -17191,15 +17191,15 @@ pattern batcalc.<(b1:bat[:bte],b2:bat[:b address CMDbatLT; comment Return B1 < B2 -pattern batcalc.<(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatLT; -comment Return V < B with candidates list - -pattern batcalc.<(vb:bat[:oid]):bat[:bit] -address CMDbatLT; -comment Return V < B - -pattern batcalc.<(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.<(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatLT; +comment Return V < B with candidates list + +pattern batcalc.<(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatLT; +comment Return V < B + +pattern batcalc.<(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatLT; comment Return B < V with candidates list @@ -20183,15 +20183,15 @@ pattern batcalc.==(b1:bat[:bte],b2:bat[: address CMDbatEQ; comment Return B1 == B2 -pattern batcalc.==(vb:bat[:oid],s:bat[:oid]):bat[:bit] -address CMDbatEQ; -comment Return V == B with candidates list - -pattern batcalc.==(vb:bat[:oid]):bat[:bit] -address CMDbatEQ; -comment Return V == B - -pattern batcalc.==(b:bat[:oid],vs:bat[:oid]):bat[:bit] +pattern batcalc.==(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] +address CMDbatEQ; +comment Return V == B with candidates list + +pattern batcalc.==(v:oid,b:bat[:oid]):bat[:bit] +address CMDbatEQ; +comment Return V == B + +pattern batcalc.==(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] address CMDbatEQ; comment Return B == V with candidates list _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
