Changeset: c83d8d982ab4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c83d8d982ab4 Added Files: sql/backends/monet5/generator/Tests/rangejoin.sql sql/backends/monet5/generator/Tests/rangejoin.stable.err sql/backends/monet5/generator/Tests/rangejoin.stable.out sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.err.int128 sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out.int128 sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.sql sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128 sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128 sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.sql sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.err sql/test/BugTracker-2014/Tests/orderby_column_exp.Bug-3620.stable.out sql/test/pg_regress/Tests/loadwisconsin.stable.err sql/test/pg_regress/Tests/loadwisconsin.stable.out Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/tomograph.c gdk/gdk_atoms.c gdk/gdk_batop.c gdk/gdk_private.h monetdb5/modules/atoms/inet.mal monetdb5/modules/atoms/mtime.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/optimizer/opt_generator.c sql/ChangeLog.Oct2014 sql/backends/monet5/Tests/limithack.stable.out sql/backends/monet5/Tests/simpleSQL.stable.out sql/backends/monet5/generator/Tests/All sql/backends/monet5/generator/generator.c sql/backends/monet5/generator/generator.h sql/backends/monet5/generator/generator.mal sql/backends/monet5/sql.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/common/sql_types.h sql/server/rel_psm.c sql/server/rel_select.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.sql sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.err sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out sql/test/BugTracker-2014/Tests/All sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1_bam.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2_bam.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3_bam.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4_bam.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5_bam.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3_bam.stable.out sql/test/leaks/Tests/drop3_nogeom.stable.out sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1_bam.stable.out sql/test/leaks/Tests/select1_nogeom.stable.out sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2_bam.stable.out sql/test/leaks/Tests/select2_nogeom.stable.out sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1_bam.stable.out sql/test/leaks/Tests/temp1_nogeom.stable.out sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2_bam.stable.out sql/test/leaks/Tests/temp2_nogeom.stable.out sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3_bam.stable.out sql/test/leaks/Tests/temp3_nogeom.stable.out sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/alter_table.sql sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/alter_table.stable.out sql/test/pg_regress/Tests/arrays.stable.err sql/test/pg_regress/Tests/boolean.stable.err sql/test/pg_regress/Tests/case.stable.err sql/test/pg_regress/Tests/char.stable.err sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/create_aggregate.stable.err sql/test/pg_regress/Tests/create_misc.stable.err sql/test/pg_regress/Tests/create_misc.stable.out sql/test/pg_regress/Tests/create_operator.stable.err sql/test/pg_regress/Tests/create_table.sql sql/test/pg_regress/Tests/create_table.stable.err sql/test/pg_regress/Tests/date.stable.err sql/test/pg_regress/Tests/date.stable.out sql/test/pg_regress/Tests/drop.stable.err sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/inet.stable.err sql/test/pg_regress/Tests/insert.stable.err sql/test/pg_regress/Tests/int2.stable.err sql/test/pg_regress/Tests/int4.stable.err sql/test/pg_regress/Tests/int8.stable.err sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/limit.stable.err sql/test/pg_regress/Tests/limit.stable.out sql/test/pg_regress/Tests/numeric.stable.err sql/test/pg_regress/Tests/numeric_big.stable.err sql/test/pg_regress/Tests/numerology.stable.err sql/test/pg_regress/Tests/oid.stable.err sql/test/pg_regress/Tests/random.stable.out sql/test/pg_regress/Tests/select_into.stable.err sql/test/pg_regress/Tests/strings.stable.err sql/test/pg_regress/Tests/strings_cast.stable.err sql/test/pg_regress/Tests/strings_concat.stable.err sql/test/pg_regress/Tests/timestamp.sql sql/test/pg_regress/Tests/timestamp.stable.err sql/test/pg_regress/Tests/timestamp.stable.out sql/test/pg_regress/Tests/timestamptz.sql sql/test/pg_regress/Tests/timestamptz.stable.err sql/test/pg_regress/Tests/timestamptz.stable.out sql/test/pg_regress/Tests/vacuum.sql sql/test/pg_regress/Tests/vacuum.stable.out sql/test/pg_regress/Tests/varchar.stable.err sql/test/pg_regress/Tests/without_oid.sql sql/test/pg_regress/Tests/without_oid.stable.err sql/test/pg_regress/Tests/without_oid.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out.Windows Branch: transaction-replication Log Message:
Merge with default branch diffs (truncated from 75657 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 @@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:any_2]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:any_2]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; @@ -34544,7 +34544,7 @@ pattern calc.==(v1:bit,v2:bit):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -41458,7 +41458,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 b/clients/Tests/MAL-signatures_all.stable.out.int128 --- a/clients/Tests/MAL-signatures_all.stable.out.int128 +++ b/clients/Tests/MAL-signatures_all.stable.out.int128 @@ -149,8 +149,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:any_2]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:any_2]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge]; @@ -44521,7 +44521,7 @@ pattern calc.==(v1:bte,v2:hge):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -52441,7 +52441,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade 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 @@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:any_2]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:any_2]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; @@ -34465,7 +34465,7 @@ pattern calc.==(v1:bit,v2:bit):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -41348,7 +41348,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 @@ -154,8 +154,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:any_2]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:any_2]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge]; @@ -44447,7 +44447,7 @@ pattern calc.==(v1:bte,v2:hge):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -52336,7 +52336,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_geom.stable.out b/clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_geom.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:any_2]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:any_2]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; @@ -34465,7 +34465,7 @@ pattern calc.==(v1:bit,v2:bit):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -41324,7 +41324,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128 b/clients/Tests/MAL-signatures_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_geom.stable.out.int128 @@ -154,8 +154,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:any_2]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:any_2]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge]; @@ -44447,7 +44447,7 @@ pattern calc.==(v1:bte,v2:hge):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -52312,7 +52312,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_none.stable.out b/clients/Tests/MAL-signatures_none.stable.out --- a/clients/Tests/MAL-signatures_none.stable.out +++ b/clients/Tests/MAL-signatures_none.stable.out @@ -137,8 +137,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:any_2]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:any_2]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl]; @@ -34460,7 +34460,7 @@ pattern calc.==(v1:bit,v2:bit):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -41137,7 +41137,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128 b/clients/Tests/MAL-signatures_none.stable.out.int128 --- a/clients/Tests/MAL-signatures_none.stable.out.int128 +++ b/clients/Tests/MAL-signatures_none.stable.out.int128 @@ -152,8 +152,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[ address AGGRavg12_dbl; comment Grouped tail average on bte -command aggr.avg(b:bat[:oid,:any_2]):dbl -address ALGavg; +pattern aggr.avg(b:bat[:oid,:any_2]):dbl +address CMDcalcavg; comment Gives the avg of all tail values function aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge]; @@ -44441,7 +44441,7 @@ pattern calc.==(v1:bte,v2:hge):bit address CMDvarEQ; comment Return V1 == V2 -command calc.=(v:inet,w:inet):bit +command calc.==(v:inet,w:inet):bit address INET_comp_EQ; comment Equality of two inets @@ -52124,7 +52124,11 @@ pattern sql.copy_from(sname:str,tname:st address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) -pattern sql.create_func_upgrade_oct2014(f:str):int +pattern sql.create_view_upgrade_oct2014(sname:str,v:str):int +address UPGcreate_view; +comment Create the view described by f, needed for the Oct2014 upgrade + +pattern sql.create_func_upgrade_oct2014(sname:str,f:str):int address UPGcreate_func; comment Create the function described by f, needed for the Oct2014 upgrade 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 @@ -725,7 +725,6 @@ str ALARMtimers(bat *res); str ALARMusec(lng *ret); str ALGantijoin(bat *result, const bat *lid, const bat *rid); str ALGantijoin2(bat *l, bat *r, const bat *lid, const bat *rid); -str ALGavg(dbl *res, const bat *bid); str ALGbandjoin(bat *result, const bat *lid, const bat *rid, const void *minus, const void *plus, const bit *li, const bit *hi); str ALGbandjoin2(bat *l, bat *r, const bat *lid, const bat *rid, const void *minus, const void *plus, const bit *li, const bit *hi); str ALGbandjoin_default(bat *result, const bat *lid, const bat *rid, const void *minus, const void *plus); diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
