Changeset: 5f6430e6aaf9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f6430e6aaf9 Added Files: sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Removed Files: sql/test/mergetables/Tests/forex.stable.err sql/test/mergetables/Tests/forex.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 gdk/gdk_bbp.c monetdb5/mal/Tests/tst049.mal monetdb5/mal/Tests/tst049.stable.out monetdb5/mal/Tests/tst285.mal monetdb5/mal/Tests/tst285.stable.out monetdb5/mal/Tests/tst960.mal monetdb5/mal/Tests/tst960.stable.out monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/bat5.mal monetdb5/modules/mal/Tests/inspect05.stable.out.int128 sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/storage/bat/bat_logger.c sql/test/mergetables/Tests/crash0.sql sql/test/mergetables/Tests/forex.sql sql/test/mergetables/Tests/mergekey.sql sql/test/mergetables/Tests/mergequery.stable.out sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/geometry.sql sql/test/pg_regress/Tests/path.sql sql/test/pg_regress/Tests/path.stable.err sql/test/pg_regress/Tests/path.stable.out sql/test/pg_regress/postgresql2sql99.sh sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: transaction-replication Log Message:
Merge with default branch diffs (truncated from 3332 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 @@ -39156,6 +39140,8 @@ command inet.broadcast(X_1:inet):inet address INETbroadcast; comment Returns the broadcast address for network +command inet.#cmp():int +address INETcompare; command inet.#fromstr():void address INETfromString; comment Convert a string to an inet 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 @@ -50123,6 +50107,8 @@ command inet.broadcast(X_1:inet):inet address INETbroadcast; comment Returns the broadcast address for network +command inet.#cmp():int +address INETcompare; command inet.#fromstr():void address INETfromString; comment Convert a string to an inet 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 @@ -39073,6 +39057,8 @@ command inet.broadcast(X_1:inet):inet address INETbroadcast; comment Returns the broadcast address for network +command inet.#cmp():int +address INETcompare; command inet.#fromstr():void address INETfromString; comment Convert a string to an inet 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 @@ -50045,6 +50029,8 @@ command inet.broadcast(X_1:inet):inet address INETbroadcast; comment Returns the broadcast address for network +command inet.#cmp():int +address INETcompare; command inet.#fromstr():void address INETfromString; comment Convert a string to an inet 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. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
