Changeset: dbef470d86ec for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/dbef470d86ec Modified Files: gdk/gdk_cand.c Branch: strimps_update Log Message:
Merge with default diffs (truncated from 59932 to 300 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -1255,332 +1255,332 @@ AGGRavg3comb; Grouped average aggregation combiner aggr subavg -command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit):bat[:dbl] AGGRsubavg1_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit):bat[:dbl] AGGRsubavg1_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit):bat[:dbl] AGGRsubavg1_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit):bat[:dbl] AGGRsubavg1_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit):bat[:dbl] AGGRsubavg1_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit):bat[:dbl] AGGRsubavg1_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit):bat[:dbl] AGGRsubavg1_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:dbl] AGGRsubavg1cand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:dbl] AGGRsubavg1cand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:dbl] AGGRsubavg1cand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:dbl] AGGRsubavg1cand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:dbl] AGGRsubavg1cand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:dbl] AGGRsubavg1cand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl] +command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:dbl] AGGRsubavg1cand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int):bat[:dbl] +command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int):bat[:dbl] AGGRsubavg1s_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int):bat[:dbl] +command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int):bat[:dbl] AGGRsubavg1s_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int):bat[:dbl] +command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int):bat[:dbl] AGGRsubavg1s_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int):bat[:dbl] +command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int):bat[:dbl] AGGRsubavg1s_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int):bat[:dbl] +command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int):bat[:dbl] AGGRsubavg1s_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int):bat[:dbl] +command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int):bat[:dbl] AGGRsubavg1s_dbl; Grouped average aggregate aggr subavg -command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl] +command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl] AGGRsubavg1scand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl] +command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl] AGGRsubavg1scand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl] +command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl] AGGRsubavg1scand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl] +command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl] AGGRsubavg1scand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl] +command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl] AGGRsubavg1scand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl] +command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl] AGGRsubavg1scand_dbl; Grouped average aggregate with candidates list aggr subavg -command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) +command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit) (X_4:bat[:dbl], X_5:bat[:lng]) AGGRsubavg2_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) +command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit) (X_4:bat[:dbl], X_5:bat[:lng]) AGGRsubavg2_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) +command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit) (X_4:bat[:dbl], X_5:bat[:lng]) AGGRsubavg2_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) +command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit) (X_4:bat[:dbl], X_5:bat[:lng]) AGGRsubavg2_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) +command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit) (X_4:bat[:dbl], X_5:bat[:lng]) AGGRsubavg2_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) +command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit) (X_4:bat[:dbl], X_5:bat[:lng]) AGGRsubavg2_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) +command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit) (X_4:bat[:dbl], X_5:bat[:lng]) AGGRsubavg2_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2cand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2cand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2cand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2cand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2cand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2cand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2cand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2s_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2s_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2s_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2s_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2s_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) +command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit, X_4:int) (X_5:bat[:dbl], X_6:bat[:lng]) AGGRsubavg2s_dbl; Grouped average aggregate, also returns count aggr subavg -command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int) (X_7:bat[:dbl], X_8:bat[:lng]) +command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) AGGRsubavg2scand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int) (X_7:bat[:dbl], X_8:bat[:lng]) +command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) AGGRsubavg2scand_dbl; Grouped average aggregate with candidates list, also returns count aggr subavg -command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int) (X_7:bat[:dbl], X_8:bat[:lng]) +command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit, X_5:int) (X_6:bat[:dbl], X_7:bat[:lng]) AGGRsubavg2scand_dbl; Grouped average aggregate with candidates list, also returns count aggr _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
