Changeset: 1a0c89f8514c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a0c89f8514c Added Files: clients/R/Tests/dbi.reqtests clients/R/Tests/dplyr.reqtests clients/R/Tests/survey.reqtests 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 configure.ag gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_join.c gdk/gdk_select.c monetdb5/modules/mal/batcalc.mal monetdb5/modules/mal/batcalc.mal.sh sql/backends/monet5/sql_round_impl.h sql/server/rel_schema.c sql/server/sql_decimal.c sql/server/sql_decimal.h sql/server/sql_parser.y sql/test/leaks/Tests/check3_bam.stable.out sql/test/leaks/Tests/check4_bam.stable.out sql/test/leaks/Tests/check5_bam.stable.out sql/test/leaks/Tests/select1_bam.stable.out sql/test/leaks/Tests/select2_bam.stable.out Branch: Oct2014 Log Message:
merge Unterschiede (gekürzt von 1597 auf 300 Zeilen): diff --git a/clients/R/Tests/dbi.reqtests b/clients/R/Tests/dbi.reqtests new file mode 100644 --- /dev/null +++ b/clients/R/Tests/dbi.reqtests @@ -0,0 +1,1 @@ +install diff --git a/clients/R/Tests/dplyr.reqtests b/clients/R/Tests/dplyr.reqtests new file mode 100644 --- /dev/null +++ b/clients/R/Tests/dplyr.reqtests @@ -0,0 +1,1 @@ +install diff --git a/clients/R/Tests/survey.reqtests b/clients/R/Tests/survey.reqtests new file mode 100644 --- /dev/null +++ b/clients/R/Tests/survey.reqtests @@ -0,0 +1,1 @@ +install 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 @@ -21614,19 +21614,19 @@ pattern batcalc.bte(b:bat[:oid,:bit]):ba address CMDconvertsignal_bte; comment cast from bit to bte, signal error on overflow -pattern batcalc.bte_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bte] address CMDconvert_bte; comment cast from void to bte with candidates list -pattern batcalc.bte_noerror(b:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte_noerror(b:bat[:oid,:void]):bat[:oid,:bte] address CMDconvert_bte; comment cast from void to bte -pattern batcalc.bte(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bte] address CMDconvertsignal_bte; comment cast from void to bte with candidates list, signal error on overflow -pattern batcalc.bte(b:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte(b:bat[:oid,:void]):bat[:oid,:bte] address CMDconvertsignal_bte; comment cast from void to bte, signal error on overflow @@ -21790,19 +21790,19 @@ pattern batcalc.bit(b:bat[:oid,:bit]):ba address CMDconvertsignal_bit; comment cast from bit to bit, signal error on overflow -pattern batcalc.bit_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.bit_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bit] address CMDconvert_bit; comment cast from void to bit with candidates list -pattern batcalc.bit_noerror(b:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.bit_noerror(b:bat[:oid,:void]):bat[:oid,:bit] address CMDconvert_bit; comment cast from void to bit -pattern batcalc.bit(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.bit(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bit] address CMDconvertsignal_bit; comment cast from void to bit with candidates list, signal error on overflow -pattern batcalc.bit(b:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.bit(b:bat[:oid,:void]):bat[:oid,:bit] address CMDconvertsignal_bit; comment cast from void to bit, signal error on overflow @@ -23369,19 +23369,19 @@ pattern batcalc.dbl(b:bat[:oid,:bit]):ba address CMDconvertsignal_dbl; comment cast from bit to dbl, signal error on overflow -pattern batcalc.dbl_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:dbl] +pattern batcalc.dbl_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:dbl] address CMDconvert_dbl; comment cast from void to dbl with candidates list -pattern batcalc.dbl_noerror(b:bat[:oid,:oid]):bat[:oid,:dbl] +pattern batcalc.dbl_noerror(b:bat[:oid,:void]):bat[:oid,:dbl] address CMDconvert_dbl; comment cast from void to dbl -pattern batcalc.dbl(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:dbl] +pattern batcalc.dbl(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:dbl] address CMDconvertsignal_dbl; comment cast from void to dbl with candidates list, signal error on overflow -pattern batcalc.dbl(b:bat[:oid,:oid]):bat[:oid,:dbl] +pattern batcalc.dbl(b:bat[:oid,:void]):bat[:oid,:dbl] address CMDconvertsignal_dbl; comment cast from void to dbl, signal error on overflow @@ -24787,19 +24787,19 @@ pattern batcalc.flt(b:bat[:oid,:bit]):ba address CMDconvertsignal_flt; comment cast from bit to flt, signal error on overflow -pattern batcalc.flt_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:flt] +pattern batcalc.flt_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:flt] address CMDconvert_flt; comment cast from void to flt with candidates list -pattern batcalc.flt_noerror(b:bat[:oid,:oid]):bat[:oid,:flt] +pattern batcalc.flt_noerror(b:bat[:oid,:void]):bat[:oid,:flt] address CMDconvert_flt; comment cast from void to flt -pattern batcalc.flt(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:flt] +pattern batcalc.flt(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:flt] address CMDconvertsignal_flt; comment cast from void to flt with candidates list, signal error on overflow -pattern batcalc.flt(b:bat[:oid,:oid]):bat[:oid,:flt] +pattern batcalc.flt(b:bat[:oid,:void]):bat[:oid,:flt] address CMDconvertsignal_flt; comment cast from void to flt, signal error on overflow @@ -25133,19 +25133,19 @@ pattern batcalc.int(b:bat[:oid,:bit]):ba address CMDconvertsignal_int; comment cast from bit to int, signal error on overflow -pattern batcalc.int_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:int] +pattern batcalc.int_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from void to int with candidates list -pattern batcalc.int_noerror(b:bat[:oid,:oid]):bat[:oid,:int] +pattern batcalc.int_noerror(b:bat[:oid,:void]):bat[:oid,:int] address CMDconvert_int; comment cast from void to int -pattern batcalc.int(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:int] +pattern batcalc.int(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:int] address CMDconvertsignal_int; comment cast from void to int with candidates list, signal error on overflow -pattern batcalc.int(b:bat[:oid,:oid]):bat[:oid,:int] +pattern batcalc.int(b:bat[:oid,:void]):bat[:oid,:int] address CMDconvertsignal_int; comment cast from void to int, signal error on overflow @@ -25529,19 +25529,19 @@ pattern batcalc.lng(b:bat[:oid,:bit]):ba address CMDconvertsignal_lng; comment cast from bit to lng, signal error on overflow -pattern batcalc.lng_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:lng] +pattern batcalc.lng_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:lng] address CMDconvert_lng; comment cast from void to lng with candidates list -pattern batcalc.lng_noerror(b:bat[:oid,:oid]):bat[:oid,:lng] +pattern batcalc.lng_noerror(b:bat[:oid,:void]):bat[:oid,:lng] address CMDconvert_lng; comment cast from void to lng -pattern batcalc.lng(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:lng] +pattern batcalc.lng(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:lng] address CMDconvertsignal_lng; comment cast from void to lng with candidates list, signal error on overflow -pattern batcalc.lng(b:bat[:oid,:oid]):bat[:oid,:lng] +pattern batcalc.lng(b:bat[:oid,:void]):bat[:oid,:lng] address CMDconvertsignal_lng; comment cast from void to lng, signal error on overflow @@ -28708,19 +28708,19 @@ pattern batcalc.oid(b:bat[:oid,:bit]):ba address CMDconvertsignal_oid; comment cast from bit to oid, signal error on overflow -pattern batcalc.oid_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:oid] +pattern batcalc.oid_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:oid] address CMDconvert_oid; comment cast from void to oid with candidates list -pattern batcalc.oid_noerror(b:bat[:oid,:oid]):bat[:oid,:oid] +pattern batcalc.oid_noerror(b:bat[:oid,:void]):bat[:oid,:oid] address CMDconvert_oid; comment cast from void to oid -pattern batcalc.oid(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:oid] +pattern batcalc.oid(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:oid] address CMDconvertsignal_oid; comment cast from void to oid with candidates list, signal error on overflow -pattern batcalc.oid(b:bat[:oid,:oid]):bat[:oid,:oid] +pattern batcalc.oid(b:bat[:oid,:void]):bat[:oid,:oid] address CMDconvertsignal_oid; comment cast from void to oid, signal error on overflow @@ -29729,19 +29729,19 @@ pattern batcalc.str(b:bat[:oid,:bit]):ba address CMDconvertsignal_str; comment cast from bit to str, signal error on overflow -pattern batcalc.str_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:str] +pattern batcalc.str_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:str] address CMDconvert_str; comment cast from void to str with candidates list -pattern batcalc.str_noerror(b:bat[:oid,:oid]):bat[:oid,:str] +pattern batcalc.str_noerror(b:bat[:oid,:void]):bat[:oid,:str] address CMDconvert_str; comment cast from void to str -pattern batcalc.str(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:str] +pattern batcalc.str(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:str] address CMDconvertsignal_str; comment cast from void to str with candidates list, signal error on overflow -pattern batcalc.str(b:bat[:oid,:oid]):bat[:oid,:str] +pattern batcalc.str(b:bat[:oid,:void]):bat[:oid,:str] address CMDconvertsignal_str; comment cast from void to str, signal error on overflow @@ -29905,19 +29905,19 @@ pattern batcalc.sht(b:bat[:oid,:bit]):ba address CMDconvertsignal_sht; comment cast from bit to sht, signal error on overflow -pattern batcalc.sht_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:sht] +pattern batcalc.sht_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:sht] address CMDconvert_sht; comment cast from void to sht with candidates list -pattern batcalc.sht_noerror(b:bat[:oid,:oid]):bat[:oid,:sht] +pattern batcalc.sht_noerror(b:bat[:oid,:void]):bat[:oid,:sht] address CMDconvert_sht; comment cast from void to sht -pattern batcalc.sht(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:sht] +pattern batcalc.sht(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:sht] address CMDconvertsignal_sht; comment cast from void to sht with candidates list, signal error on overflow -pattern batcalc.sht(b:bat[:oid,:oid]):bat[:oid,:sht] +pattern batcalc.sht(b:bat[:oid,:void]):bat[:oid,:sht] address CMDconvertsignal_sht; comment cast from void to sht, signal error on overflow @@ -31407,19 +31407,19 @@ pattern batcalc.wrd(b:bat[:oid,:bit]):ba address CMDconvertsignal_wrd; comment cast from bit to wrd, signal error on overflow -pattern batcalc.wrd_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:wrd] +pattern batcalc.wrd_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:wrd] address CMDconvert_wrd; comment cast from void to wrd with candidates list -pattern batcalc.wrd_noerror(b:bat[:oid,:oid]):bat[:oid,:wrd] +pattern batcalc.wrd_noerror(b:bat[:oid,:void]):bat[:oid,:wrd] address CMDconvert_wrd; comment cast from void to wrd -pattern batcalc.wrd(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:wrd] +pattern batcalc.wrd(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:wrd] address CMDconvertsignal_wrd; comment cast from void to wrd with candidates list, signal error on overflow -pattern batcalc.wrd(b:bat[:oid,:oid]):bat[:oid,:wrd] +pattern batcalc.wrd(b:bat[:oid,:void]):bat[:oid,:wrd] address CMDconvertsignal_wrd; comment cast from void to wrd, signal error on overflow 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 @@ -21535,19 +21535,19 @@ pattern batcalc.bte(b:bat[:oid,:bit]):ba address CMDconvertsignal_bte; comment cast from bit to bte, signal error on overflow -pattern batcalc.bte_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bte] address CMDconvert_bte; comment cast from void to bte with candidates list -pattern batcalc.bte_noerror(b:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte_noerror(b:bat[:oid,:void]):bat[:oid,:bte] address CMDconvert_bte; comment cast from void to bte -pattern batcalc.bte(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bte] address CMDconvertsignal_bte; comment cast from void to bte with candidates list, signal error on overflow -pattern batcalc.bte(b:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte(b:bat[:oid,:void]):bat[:oid,:bte] address CMDconvertsignal_bte; comment cast from void to bte, signal error on overflow @@ -21711,19 +21711,19 @@ pattern batcalc.bit(b:bat[:oid,:bit]):ba address CMDconvertsignal_bit; comment cast from bit to bit, signal error on overflow -pattern batcalc.bit_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.bit_noerror(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bit] address CMDconvert_bit; comment cast from void to bit with candidates list -pattern batcalc.bit_noerror(b:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.bit_noerror(b:bat[:oid,:void]):bat[:oid,:bit] address CMDconvert_bit; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list