Changeset: ce8f0d0c6666 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce8f0d0c6666 Added Files: sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.err sql/test/BugTracker-2013/Tests/copy-into-compressed-bz2.Bug-3351.stable.out sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.err sql/test/BugTracker-2013/Tests/copy-into-compressed-gz.Bug-3351.stable.out sql/test/mergetables/Tests/mergekey.stable.err sql/test/mergetables/Tests/mergekey.stable.out Removed Files: monetdb5/mal/Tests/venks.mal monetdb5/mal/Tests/venks.stable.err monetdb5/mal/Tests/venks.stable.out monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.mal monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.err monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/union_semantics.SF-1192348.stable.out monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.mal monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.err monetdb5/tests/BugTracker/Tests/kunion-and-nil.Bug-1667.stable.out monetdb5/tests/gdkTests/Tests/intersect_diff_nil.mal monetdb5/tests/gdkTests/Tests/intersect_diff_nil.stable.err monetdb5/tests/gdkTests/Tests/intersect_diff_nil.stable.out monetdb5/tests/gdkTests/Tests/intersect_diff_void.mal monetdb5/tests/gdkTests/Tests/intersect_diff_void.stable.err monetdb5/tests/gdkTests/Tests/intersect_diff_void.stable.out monetdb5/tests/suite_00/Tests/test_15.mal monetdb5/tests/suite_00/Tests/test_15.stable.err monetdb5/tests/suite_00/Tests/test_15.stable.out sql/scripts/mtime.sql sql/scripts/replication.sql 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/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.oid32 clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 clients/Tests/SQL-dump_none.stable.out clients/Tests/exports.stable.out clients/mapiclient/mclient.1 monetdb5/mal/Tests/All monetdb5/mal/mal_recycle.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/ESexample.mal monetdb5/optimizer/Tests/ESexample.stable.out monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_emptySet.c monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All monetdb5/tests/BugTracker/Tests/All monetdb5/tests/gdkTests/Tests/All monetdb5/tests/suite_00/Tests/All sql/ChangeLog.Oct2014 sql/backends/monet5/Tests/limithack.stable.out sql/backends/monet5/generator/Tests/generator01.stable.err sql/backends/monet5/generator/Tests/generator04.stable.err sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out sql/scripts/17_temporal.sql sql/scripts/75_storagemodel.sql sql/scripts/Makefile.ag sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.sql sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out sql/test/BugTracker-2013/Tests/All sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.sql.in sql/test/BugTracker-2013/Tests/copy-into-compressed.Bug-3351.stable.out sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.sql sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err sql/test/Tests/systemfunctions_bam.stable.out.int128 sql/test/bugs/Tests/crash_order_by.sql sql/test/bugs/Tests/simple_view.sql sql/test/bugs/insert_delete-bug-sf-904025.sql sql/test/leaks/Tests/check1_bam.stable.out.int128 sql/test/leaks/Tests/check2_bam.stable.out.int128 sql/test/leaks/Tests/check3_bam.stable.out.int128 sql/test/leaks/Tests/check4_bam.stable.out.int128 sql/test/leaks/Tests/check5_bam.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: resultset Log Message:
Merge with default diffs (truncated from 3701 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 @@ -31476,14 +31476,6 @@ command bat.append(i:bat[:any_1,:any_2], address BKCappend_val_force_wrap; comment append the value u to i -command bat.append(i:bat[:any_1,:void],u:any_1):bat[:any_1,:void] -address BKCappend_reverse_val_wrap; -comment append the value u to i - -command bat.append(i:bat[:void,:any_1],u:any_1):bat[:void,:any_1] -address BKCappend_val_wrap; -comment append the value u to i - command bat.append(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] address BKCappend_val_wrap; comment append the value u to i @@ -31520,10 +31512,6 @@ command bat.densebat(sz:wrd):bat[:oid,:o address BKCdensebat; comment Creates a new [void,void] BAT of size 'sz'. -command bat.getHeat(b:bat[:oid,:any_2]):lng -address BKCheat; -comment Return the current BBP heat (LRU stamp) - command bat.getName(b:bat[:oid,:any_2]):str address BKCgetBBPname; comment Gives back the logical name of a BAT. @@ -31600,10 +31588,6 @@ command bat.isSynced(b1:bat[:oid,:any_2] address BKCisSynced; comment Tests whether two BATs are synced or not. -command bat.isCached(b:bat[:oid,:any_2]):bit -address BKCisCached; -comment Bat is stored in main memory. - command bat.isPersistent(b:bat[:oid,:any_2]):bit address BKCisPersistent; command bat.isTransient(b:bat[:oid,:any_2]):bit @@ -31771,11 +31755,11 @@ address BKCmmap; comment For each individual heap, you can change the allocation mode to either STORE_MEM or STORE_MMAP. Passing an int(nil) means: no change. Changing a dirty STORE_MEM heap into STORE_MMAP, will cause a BAT save (this has to happen before the heap can be mapped into virtual memory). These modes are persistent. command bat.setHot(b:bat[:oid,:any_2]):void -address BKChotBAT; +address BKCsetHotBAT; comment Makes a BAT very hot for the BBP. The chance of being chosen for swapout is small, afterwards. command bat.setCold(b:bat[:oid,:any_1]):void -address BKCcoldBAT; +address BKCsetColdBAT; comment Makes a BAT very cold for the BBP. The chance of being choses for swapout is big, afterwards. command bat.save(nme:str):bit 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 @@ -40541,14 +40541,6 @@ command bat.append(i:bat[:any_1,:any_2], address BKCappend_val_force_wrap; comment append the value u to i -command bat.append(i:bat[:any_1,:void],u:any_1):bat[:any_1,:void] -address BKCappend_reverse_val_wrap; -comment append the value u to i - -command bat.append(i:bat[:void,:any_1],u:any_1):bat[:void,:any_1] -address BKCappend_val_wrap; -comment append the value u to i - command bat.append(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] address BKCappend_val_wrap; comment append the value u to i @@ -40585,10 +40577,6 @@ command bat.densebat(sz:wrd):bat[:oid,:o address BKCdensebat; comment Creates a new [void,void] BAT of size 'sz'. -command bat.getHeat(b:bat[:oid,:any_2]):lng -address BKCheat; -comment Return the current BBP heat (LRU stamp) - command bat.getName(b:bat[:oid,:any_2]):str address BKCgetBBPname; comment Gives back the logical name of a BAT. @@ -40669,10 +40657,6 @@ command bat.isSynced(b1:bat[:oid,:any_2] address BKCisSynced; comment Tests whether two BATs are synced or not. -command bat.isCached(b:bat[:oid,:any_2]):bit -address BKCisCached; -comment Bat is stored in main memory. - command bat.isPersistent(b:bat[:oid,:any_2]):bit address BKCisPersistent; command bat.isTransient(b:bat[:oid,:any_2]):bit @@ -40840,11 +40824,11 @@ address BKCmmap; comment For each individual heap, you can change the allocation mode to either STORE_MEM or STORE_MMAP. Passing an int(nil) means: no change. Changing a dirty STORE_MEM heap into STORE_MMAP, will cause a BAT save (this has to happen before the heap can be mapped into virtual memory). These modes are persistent. command bat.setHot(b:bat[:oid,:any_2]):void -address BKChotBAT; +address BKCsetHotBAT; comment Makes a BAT very hot for the BBP. The chance of being chosen for swapout is small, afterwards. command bat.setCold(b:bat[:oid,:any_1]):void -address BKCcoldBAT; +address BKCsetColdBAT; comment Makes a BAT very cold for the BBP. The chance of being choses for swapout is big, afterwards. command bat.save(nme:str):bit 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 @@ -31397,14 +31397,6 @@ command bat.append(i:bat[:any_1,:any_2], address BKCappend_val_force_wrap; comment append the value u to i -command bat.append(i:bat[:any_1,:void],u:any_1):bat[:any_1,:void] -address BKCappend_reverse_val_wrap; -comment append the value u to i - -command bat.append(i:bat[:void,:any_1],u:any_1):bat[:void,:any_1] -address BKCappend_val_wrap; -comment append the value u to i - command bat.append(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] address BKCappend_val_wrap; comment append the value u to i @@ -31441,10 +31433,6 @@ command bat.densebat(sz:wrd):bat[:oid,:o address BKCdensebat; comment Creates a new [void,void] BAT of size 'sz'. -command bat.getHeat(b:bat[:oid,:any_2]):lng -address BKCheat; -comment Return the current BBP heat (LRU stamp) - command bat.getName(b:bat[:oid,:any_2]):str address BKCgetBBPname; comment Gives back the logical name of a BAT. @@ -31521,10 +31509,6 @@ command bat.isSynced(b1:bat[:oid,:any_2] address BKCisSynced; comment Tests whether two BATs are synced or not. -command bat.isCached(b:bat[:oid,:any_2]):bit -address BKCisCached; -comment Bat is stored in main memory. - command bat.isPersistent(b:bat[:oid,:any_2]):bit address BKCisPersistent; command bat.isTransient(b:bat[:oid,:any_2]):bit @@ -31692,11 +31676,11 @@ address BKCmmap; comment For each individual heap, you can change the allocation mode to either STORE_MEM or STORE_MMAP. Passing an int(nil) means: no change. Changing a dirty STORE_MEM heap into STORE_MMAP, will cause a BAT save (this has to happen before the heap can be mapped into virtual memory). These modes are persistent. command bat.setHot(b:bat[:oid,:any_2]):void -address BKChotBAT; +address BKCsetHotBAT; comment Makes a BAT very hot for the BBP. The chance of being chosen for swapout is small, afterwards. command bat.setCold(b:bat[:oid,:any_1]):void -address BKCcoldBAT; +address BKCsetColdBAT; comment Makes a BAT very cold for the BBP. The chance of being choses for swapout is big, afterwards. command bat.save(nme:str):bit 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 @@ -40467,14 +40467,6 @@ command bat.append(i:bat[:any_1,:any_2], address BKCappend_val_force_wrap; comment append the value u to i -command bat.append(i:bat[:any_1,:void],u:any_1):bat[:any_1,:void] -address BKCappend_reverse_val_wrap; -comment append the value u to i - -command bat.append(i:bat[:void,:any_1],u:any_1):bat[:void,:any_1] -address BKCappend_val_wrap; -comment append the value u to i - command bat.append(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] address BKCappend_val_wrap; comment append the value u to i @@ -40511,10 +40503,6 @@ command bat.densebat(sz:wrd):bat[:oid,:o address BKCdensebat; comment Creates a new [void,void] BAT of size 'sz'. -command bat.getHeat(b:bat[:oid,:any_2]):lng -address BKCheat; -comment Return the current BBP heat (LRU stamp) - command bat.getName(b:bat[:oid,:any_2]):str address BKCgetBBPname; comment Gives back the logical name of a BAT. @@ -40595,10 +40583,6 @@ command bat.isSynced(b1:bat[:oid,:any_2] address BKCisSynced; comment Tests whether two BATs are synced or not. -command bat.isCached(b:bat[:oid,:any_2]):bit -address BKCisCached; -comment Bat is stored in main memory. - command bat.isPersistent(b:bat[:oid,:any_2]):bit address BKCisPersistent; command bat.isTransient(b:bat[:oid,:any_2]):bit @@ -40766,11 +40750,11 @@ address BKCmmap; comment For each individual heap, you can change the allocation mode to either STORE_MEM or STORE_MMAP. Passing an int(nil) means: no change. Changing a dirty STORE_MEM heap into STORE_MMAP, will cause a BAT save (this has to happen before the heap can be mapped into virtual memory). These modes are persistent. command bat.setHot(b:bat[:oid,:any_2]):void -address BKChotBAT; +address BKCsetHotBAT; comment Makes a BAT very hot for the BBP. The chance of being chosen for swapout is small, afterwards. command bat.setCold(b:bat[:oid,:any_1]):void -address BKCcoldBAT; +address BKCsetColdBAT; comment Makes a BAT very cold for the BBP. The chance of being choses for swapout is big, afterwards. command bat.save(nme:str):bit 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 @@ -31397,14 +31397,6 @@ command bat.append(i:bat[:any_1,:any_2], address BKCappend_val_force_wrap; comment append the value u to i -command bat.append(i:bat[:any_1,:void],u:any_1):bat[:any_1,:void] -address BKCappend_reverse_val_wrap; -comment append the value u to i - -command bat.append(i:bat[:void,:any_1],u:any_1):bat[:void,:any_1] -address BKCappend_val_wrap; -comment append the value u to i - command bat.append(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] address BKCappend_val_wrap; comment append the value u to i @@ -31441,10 +31433,6 @@ command bat.densebat(sz:wrd):bat[:oid,:o address BKCdensebat; comment Creates a new [void,void] BAT of size 'sz'. -command bat.getHeat(b:bat[:oid,:any_2]):lng -address BKCheat; -comment Return the current BBP heat (LRU stamp) - command bat.getName(b:bat[:oid,:any_2]):str address BKCgetBBPname; comment Gives back the logical name of a BAT. @@ -31521,10 +31509,6 @@ command bat.isSynced(b1:bat[:oid,:any_2] address BKCisSynced; comment Tests whether two BATs are synced or not. -command bat.isCached(b:bat[:oid,:any_2]):bit -address BKCisCached; -comment Bat is stored in main memory. - command bat.isPersistent(b:bat[:oid,:any_2]):bit address BKCisPersistent; command bat.isTransient(b:bat[:oid,:any_2]):bit @@ -31692,11 +31676,11 @@ address BKCmmap; comment For each individual heap, you can change the allocation mode to either STORE_MEM or STORE_MMAP. Passing an int(nil) means: no change. Changing a dirty STORE_MEM heap into STORE_MMAP, will cause a BAT save (this has to happen before the heap can be mapped into virtual memory). These modes are persistent. command bat.setHot(b:bat[:oid,:any_2]):void -address BKChotBAT; +address BKCsetHotBAT; comment Makes a BAT very hot for the BBP. The chance of being chosen for swapout is small, afterwards. command bat.setCold(b:bat[:oid,:any_1]):void -address BKCcoldBAT; +address BKCsetColdBAT; comment Makes a BAT very cold for the BBP. The chance of being choses for swapout is big, afterwards. command bat.save(nme:str):bit 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 @@ -40467,14 +40467,6 @@ command bat.append(i:bat[:any_1,:any_2], address BKCappend_val_force_wrap; comment append the value u to i -command bat.append(i:bat[:any_1,:void],u:any_1):bat[:any_1,:void] -address BKCappend_reverse_val_wrap; -comment append the value u to i - -command bat.append(i:bat[:void,:any_1],u:any_1):bat[:void,:any_1] -address BKCappend_val_wrap; -comment append the value u to i - command bat.append(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] address BKCappend_val_wrap; comment append the value u to i @@ -40511,10 +40503,6 @@ command bat.densebat(sz:wrd):bat[:oid,:o address BKCdensebat; comment Creates a new [void,void] BAT of size 'sz'. -command bat.getHeat(b:bat[:oid,:any_2]):lng -address BKCheat; -comment Return the current BBP heat (LRU stamp) - command bat.getName(b:bat[:oid,:any_2]):str address BKCgetBBPname; comment Gives back the logical name of a BAT. @@ -40595,10 +40583,6 @@ command bat.isSynced(b1:bat[:oid,:any_2] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list