Changeset: 2ba16185fec7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ba16185fec7 Removed Files: monetdb5/mal/Tests/tst017.mal monetdb5/optimizer/Tests/mat02.mal monetdb5/optimizer/Tests/mat02.stable.err monetdb5/optimizer/Tests/mat02.stable.out monetdb5/optimizer/Tests/mat03.mal monetdb5/optimizer/Tests/mat03.stable.err monetdb5/optimizer/Tests/mat03.stable.out monetdb5/optimizer/Tests/mat04.mal monetdb5/optimizer/Tests/mat04.stable.err monetdb5/optimizer/Tests/mat04.stable.out 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 common/options/monet_options.c common/utils/msabaoth.c gdk/gdk_batop.c gdk/gdk_firstn.c gdk/gdk_join.c monetdb5/extras/rapi/rapi.c monetdb5/mal/Tests/All monetdb5/mal/Tests/recycle03.mal monetdb5/mal/Tests/recycle03.stable.out monetdb5/mal/Tests/recycle04.mal monetdb5/mal/Tests/recycle04.stable.out monetdb5/mal/Tests/tst1602.mal monetdb5/mal/Tests/tst1602.stable.out monetdb5/mal/Tests/venks.mal monetdb5/mal/Tests/venks.stable.out monetdb5/mal/mal_errors.h monetdb5/mal/mal_exception.c monetdb5/mal/mal_exception.h monetdb5/modules/atoms/json.c monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/pcre.c monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/CMexample.mal monetdb5/optimizer/Tests/CMexample.stable.out monetdb5/optimizer/Tests/CRexample.mal monetdb5/optimizer/Tests/JPexample.mal monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/emptyset00.mal monetdb5/optimizer/Tests/mat00.mal monetdb5/optimizer/Tests/qep00.mal monetdb5/optimizer/Tests/qep01.mal monetdb5/optimizer/Tests/qep02.mal monetdb5/optimizer/Tests/qep02.stable.out monetdb5/optimizer/Tests/rangePush00.mal monetdb5/optimizer/Tests/rangePush01.mal monetdb5/optimizer/Tests/tst4610.mal monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_pushranges.c monetdb5/optimizer/opt_qep.c sql/backends/monet5/bam/bam_export.c sql/backends/monet5/bam/bam_loader.c sql/backends/monet5/bam/bam_wrapper.c sql/backends/monet5/generator/Tests/generator01.sql sql/backends/monet5/generator/Tests/generator01.stable.err sql/backends/monet5/generator/Tests/generator02.sql sql/backends/monet5/generator/Tests/generator02.stable.err sql/backends/monet5/generator/Tests/generator02.stable.out sql/backends/monet5/generator/Tests/generator04.stable.err sql/backends/monet5/generator/generator.c sql/backends/monet5/sql.mal sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/02-plan.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-plan.stable.out sql/server/rel_optimizer.c sql/server/sql_mvc.c tools/merovingian/client/monetdb.c tools/merovingian/daemon/argvcmds.c tools/merovingian/daemon/connections.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/discoveryrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/multiplex-funnel.c tools/merovingian/daemon/peering.c tools/merovingian/daemon/proxy.c tools/merovingian/utils/utils.c Branch: rdf Log Message:
Merge with default branch diffs (truncated from 6350 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 @@ -21321,11 +21321,11 @@ command batcalc.bte(v:bat[:oid,:str],dig address batstr_2num_bte; comment cast to bte and check for overflow -command batcalc.bte(v:bat[:oid,:void],digits:int,scale:int):bat[:oid,:bte] +command batcalc.bte(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:bte] address batnil_2dec_bte; comment cast to dec(bte) and check for overflow -command batcalc.bte(v:bat[:oid,:void],digits:int):bat[:oid,:bte] +command batcalc.bte(v:bat[:oid,:oid],digits:int):bat[:oid,:bte] address batnil_2num_bte; comment cast to bte and check for overflow @@ -21489,19 +21489,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,:void],s:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:bte] +pattern batcalc.bte_noerror(b:bat[:oid,:oid]):bat[:oid,:bte] address CMDconvert_bte; comment cast from void to bte -pattern batcalc.bte(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bte] +pattern batcalc.bte(b:bat[:oid,:oid],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,:void]):bat[:oid,:bte] +pattern batcalc.bte(b:bat[:oid,:oid]):bat[:oid,:bte] address CMDconvertsignal_bte; comment cast from void to bte, signal error on overflow @@ -21665,19 +21665,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,:void],s:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.bit_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:bit] +pattern batcalc.bit_noerror(b:bat[:oid,:oid]):bat[:oid,:bit] address CMDconvert_bit; comment cast from void to bit -pattern batcalc.bit(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:bit] +pattern batcalc.bit(b:bat[:oid,:oid],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,:void]):bat[:oid,:bit] +pattern batcalc.bit(b:bat[:oid,:oid]):bat[:oid,:bit] address CMDconvertsignal_bit; comment cast from void to bit, signal error on overflow @@ -23060,7 +23060,7 @@ command batcalc.date(v:bat[:oid,:str]):b address batstr_2_date; comment cast to date -command batcalc.date(v:bat[:oid,:void]):bat[:oid,:date] +command batcalc.date(v:bat[:oid,:oid]):bat[:oid,:date] address batnil_2_date; comment cast to date @@ -23076,11 +23076,11 @@ command batcalc.daytime(v:bat[:oid,:str] address batstr_2_daytime; comment Cast to daytime -command batcalc.daytime(v:bat[:oid,:void],digits:int):bat[:oid,:daytime] +command batcalc.daytime(v:bat[:oid,:oid],digits:int):bat[:oid,:daytime] address batnil_2time_daytime; comment cast to daytime and check for overflow -command batcalc.daytime(v:bat[:oid,:void]):bat[:oid,:daytime] +command batcalc.daytime(v:bat[:oid,:oid]):bat[:oid,:daytime] address batnil_2_daytime; comment Cast to daytime @@ -23244,19 +23244,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,:void],s:bat[:oid,:oid]):bat[:oid,:dbl] +pattern batcalc.dbl_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:dbl] +pattern batcalc.dbl_noerror(b:bat[:oid,:oid]):bat[:oid,:dbl] address CMDconvert_dbl; comment cast from void to dbl -pattern batcalc.dbl(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:dbl] +pattern batcalc.dbl(b:bat[:oid,:oid],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,:void]):bat[:oid,:dbl] +pattern batcalc.dbl(b:bat[:oid,:oid]):bat[:oid,:dbl] address CMDconvertsignal_dbl; comment cast from void to dbl, signal error on overflow @@ -24662,19 +24662,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,:void],s:bat[:oid,:oid]):bat[:oid,:flt] +pattern batcalc.flt_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:flt] +pattern batcalc.flt_noerror(b:bat[:oid,:oid]):bat[:oid,:flt] address CMDconvert_flt; comment cast from void to flt -pattern batcalc.flt(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:flt] +pattern batcalc.flt(b:bat[:oid,:oid],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,:void]):bat[:oid,:flt] +pattern batcalc.flt(b:bat[:oid,:oid]):bat[:oid,:flt] address CMDconvertsignal_flt; comment cast from void to flt, signal error on overflow @@ -24784,11 +24784,11 @@ command batcalc.int(v:bat[:oid,:str],dig address batstr_2num_int; comment cast to int and check for overflow -command batcalc.int(v:bat[:oid,:void],digits:int,scale:int):bat[:oid,:int] +command batcalc.int(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:int] address batnil_2dec_int; comment cast to dec(int) and check for overflow -command batcalc.int(v:bat[:oid,:void],digits:int):bat[:oid,:int] +command batcalc.int(v:bat[:oid,:oid],digits:int):bat[:oid,:int] address batnil_2num_int; comment cast to int and check for overflow @@ -24984,19 +24984,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,:void],s:bat[:oid,:oid]):bat[:oid,:int] +pattern batcalc.int_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:int] +pattern batcalc.int_noerror(b:bat[:oid,:oid]):bat[:oid,:int] address CMDconvert_int; comment cast from void to int -pattern batcalc.int(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:int] +pattern batcalc.int(b:bat[:oid,:oid],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,:void]):bat[:oid,:int] +pattern batcalc.int(b:bat[:oid,:oid]):bat[:oid,:int] address CMDconvertsignal_int; comment cast from void to int, signal error on overflow @@ -25236,11 +25236,11 @@ command batcalc.lng(v:bat[:oid,:str],dig address batstr_2num_lng; comment cast to lng and check for overflow -command batcalc.lng(v:bat[:oid,:void],digits:int,scale:int):bat[:oid,:lng] +command batcalc.lng(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:lng] address batnil_2dec_lng; comment cast to dec(lng) and check for overflow -command batcalc.lng(v:bat[:oid,:void],digits:int):bat[:oid,:lng] +command batcalc.lng(v:bat[:oid,:oid],digits:int):bat[:oid,:lng] address batnil_2num_lng; comment cast to lng and check for overflow @@ -25404,19 +25404,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,:void],s:bat[:oid,:oid]):bat[:oid,:lng] +pattern batcalc.lng_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:lng] +pattern batcalc.lng_noerror(b:bat[:oid,:oid]):bat[:oid,:lng] address CMDconvert_lng; comment cast from void to lng -pattern batcalc.lng(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:lng] +pattern batcalc.lng(b:bat[:oid,:oid],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,:void]):bat[:oid,:lng] +pattern batcalc.lng(b:bat[:oid,:oid]):bat[:oid,:lng] address CMDconvertsignal_lng; comment cast from void to lng, signal error on overflow @@ -28583,19 +28583,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,:void],s:bat[:oid,:oid]):bat[:oid,:oid] +pattern batcalc.oid_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:oid] +pattern batcalc.oid_noerror(b:bat[:oid,:oid]):bat[:oid,:oid] address CMDconvert_oid; comment cast from void to oid -pattern batcalc.oid(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:oid] +pattern batcalc.oid(b:bat[:oid,:oid],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,:void]):bat[:oid,:oid] +pattern batcalc.oid(b:bat[:oid,:oid]):bat[:oid,:oid] address CMDconvertsignal_oid; comment cast from void to oid, signal error on overflow @@ -29436,11 +29436,11 @@ command batcalc.sht(v:bat[:oid,:str],dig address batstr_2num_sht; comment cast to sht and check for overflow -command batcalc.sht(v:bat[:oid,:void],digits:int,scale:int):bat[:oid,:sht] +command batcalc.sht(v:bat[:oid,:oid],digits:int,scale:int):bat[:oid,:sht] address batnil_2dec_sht; comment cast to dec(sht) and check for overflow -command batcalc.sht(v:bat[:oid,:void],digits:int):bat[:oid,:sht] +command batcalc.sht(v:bat[:oid,:oid],digits:int):bat[:oid,:sht] address batnil_2num_sht; comment cast to sht and check for overflow @@ -29604,19 +29604,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,:void],s:bat[:oid,:oid]):bat[:oid,:str] +pattern batcalc.str_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:str] +pattern batcalc.str_noerror(b:bat[:oid,:oid]):bat[:oid,:str] address CMDconvert_str; comment cast from void to str -pattern batcalc.str(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:str] +pattern batcalc.str(b:bat[:oid,:oid],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,:void]):bat[:oid,:str] +pattern batcalc.str(b:bat[:oid,:oid]):bat[:oid,:str] address CMDconvertsignal_str; comment cast from void to str, signal error on overflow @@ -29780,19 +29780,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,:void],s:bat[:oid,:oid]):bat[:oid,:sht] +pattern batcalc.sht_noerror(b:bat[:oid,:oid],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,:void]):bat[:oid,:sht] +pattern batcalc.sht_noerror(b:bat[:oid,:oid]):bat[:oid,:sht] address CMDconvert_sht; comment cast from void to sht -pattern batcalc.sht(b:bat[:oid,:void],s:bat[:oid,:oid]):bat[:oid,:sht] +pattern batcalc.sht(b:bat[:oid,:oid],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,:void]):bat[:oid,:sht] +pattern batcalc.sht(b:bat[:oid,:oid]):bat[:oid,:sht] address CMDconvertsignal_sht; comment cast from void to sht, signal error on overflow @@ -31040,11 +31040,11 @@ command batcalc.timestamp(v:bat[:oid,:st address batstr_2_timestamp; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
