Changeset: 11af2136a055 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11af2136a055
Modified Files:
clients/Tests/All
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.oid32
clients/Tests/SQL-dump_geom.stable.out.32bit
clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/stream.c
gdk/gdk_firstn.c
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/jdbc/tests/Tests/All
sql/server/sql_scan.c
sql/test/BugTracker-2010/Tests/unicode-bom.Bug-2641.sql
sql/test/BugTracker-2010/Tests/unicode-bom.Bug-2641.stable.err
sql/test/BugTracker-2010/Tests/unicode-bom.Bug-2641.stable.out
sql/test/BugTracker-2011/Tests/All
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.sql
sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.stable.out
sql/test/Dependencies/Tests/All
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Tests/All
sql/test/bugs/Tests/All
sql/test/leaks/Tests/All
sql/test/leaks/Tests/check0_gsl.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out.int128
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out.int128
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out.int128
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out.int128
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out
sql/test/leaks/Tests/check5_bam.stable.out.int128
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out.int128
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out.int128
sql/test/leaks/Tests/drop3_gsl.stable.out
sql/test/leaks/Tests/select1_gsl.stable.out
sql/test/leaks/Tests/select2_gsl.stable.out
sql/test/leaks/Tests/temp1_gsl.stable.out
sql/test/leaks/Tests/temp2_gsl.stable.out
sql/test/leaks/Tests/temp3_gsl.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out.Windows
Branch: resultset
Log Message:
Merge with default
diffs (truncated from 10767 to 300 lines):
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,9 +1,9 @@
exports
-HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures_all
-HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_fits_geom
-!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_geom
-!HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT?MAL-signatures_none
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS?SQL-dump_all
-HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_geom
-!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_none
+HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_all
+HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_fits_geom
+!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_geom
+!HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_none
+HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_all
+HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_geom
+!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_none
MERCURIAL?malcheck
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
@@ -2661,41 +2661,33 @@ command algebra.uselect(b:bat[:any_1,:an
address ALGuselectInclusive;
comment See select() but limited to head values
-command alarm.alarm(secs:int,action:str):void
-address ALARMsetalarm;
-comment execute action in X secs
-
command alarm.ctime{unsafe}():str
address ALARMctime;
-comment current time as a string
+comment Return the current time as a C-time string.
command alarm.epilogue():void
address ALARMepilogue;
-comment Finalize alarm module
+comment Finalize alarm module.
command alarm.epoch{unsafe}():int
address ALARMepoch;
-comment current time as unix epoch
+comment Return the current time as UNIX epoch.
command alarm.prelude():void
address ALARMprelude;
-comment Initialize alarm module
-
-command alarm.sleep(secs:int):void
+comment Initialize alarm module.
+
+command alarm.sleep{unsafe}(secs:int):void
address ALARMsleep;
-comment sleep X secs
+comment Sleep a few seconds
command alarm.time{unsafe}():int
address ALARMtime;
-comment time in millisecs
-
-command alarm.timers{unsafe}():bat[:str,:str]
-address ALARMtimers;
-comment give a list of all active timers
+comment Return time in milliseconds.
command alarm.usec{unsafe}():lng
address ALARMusec;
-comment return cpu microseconds info
+comment Return time in microseconds.
command batbam.bam_flag(flags:bat[:oid,:sht],name:str):bat[:oid,:bit]
address bam_flag_bat;
@@ -31504,7 +31496,7 @@ command bat.append(i:bat[:any_1,:any_2],
address BKCappend_wrap;
comment append the content of u to i
-command bat.attach(tt:int,heapfile:str):bat[:void,:any_1]
+command bat.attach(tt:int,heapfile:str):bat[:oid,:any_1]
address BKCattach;
comment Returns a new BAT with dense head and tail of the given type and uses
the given file to initialize the tail. The file will be owned by the
server.
@@ -31524,9 +31516,9 @@ command bat.delete(b:bat[:any_1,:any_2],
address BKCdelete_bun;
comment Delete one specific BUN.
-command bat.densebat(size:wrd):bat[:oid,:oid]
+command bat.densebat(sz:wrd):bat[:oid,:oid]
address BKCdensebat;
-comment Creates a new [void,void] BAT of size 'size'.
+comment Creates a new [void,void] BAT of size 'sz'.
command bat.getHeat(b:bat[:oid,:any_2]):lng
address BKCheat;
@@ -31544,21 +31536,13 @@ command bat.getAlpha(b:bat[:any_1,:any_2
address BKCgetAlpha;
comment Obtain the list of BUNs added
-command bat.getSpaceUsed(b:bat[:any_1,:any_2]):lng
-address BKCgetSpaceUsed;
-comment Determine the total space (in bytes) occupied by a BAT.
-
-command bat.getStorageSize(b:bat[:any_1,:any_2]):lng
-address BKCgetStorageSize;
-comment Determine the total space (in bytes) reserved for a BAT.
-
command bat.getSequenceBase(b:bat[:oid,:any_1]):oid
address BKCgetSequenceBase;
comment Get the sequence base for the void column of a BAT.
-command bat.getAccess(b:bat[:any_1,:any_2]):str
+command bat.getAccess(b:bat[:oid,:any_1]):str
address BKCgetAccess;
-comment return the access mode attached to this BAT as a character.
+comment Return the access mode attached to this BAT as a character.
command bat.getRole(bid:bat[:oid,:any_2]):str
address BKCgetRole;
@@ -31576,33 +31560,13 @@ command bat.getCapacity(b:bat[:oid,:any_
address BKCgetCapacity;
comment Returns the current allocation size (in max number of elements) of a
BAT.
-command bat.getDiskSize(b:bat[:oid,:any_2]):lng
-address BKCbatdisksize;
-comment Approximate size of the (persistent) BAT heaps as stored on disk in
pages of 512 bytes. Indices are not included, as they only live temporarilyin
virtual memory.
-
-command bat.getMemorySize(b:bat[:oid,:any_2]):lng
-address BKCbatvmsize;
-comment Calculate the size of the BAT heaps and indices in bytesrounded to the
memory page size (see bbp.getPageSize()).
-
-command bat.getSize(b:bat[:oid,:any_2]):lng
-address BKCbatsize;
-comment Calculate the size of the BAT descriptor, heaps and indices in bytes.
-
-command bat.hasReadMode(b:bat[:any_1,:any_2]):bit
-address BKChasReadMode;
-comment return true if to this BAT is read only.
-
-command bat.hasWriteMode(b:bat[:any_1,:any_2]):bit
-address BKChasWriteMode;
-comment return true if to this BAT is read and write.
-
-command bat.hasAppendMode(b:bat[:any_1,:any_2]):bit
-address BKChasAppendMode;
-comment return true if to this BAT is append only.
+command bat.getSize(b:bat[:oid,:any_1]):lng
+address BKCgetSize;
+comment Calculate the actual size of the BAT descriptor, heaps, hashes and
imprint indices in bytes rounded to the memory page size (see
bbp.getPageSize()).
command bat.imprintsize(b:bat[:oid,:dbl]):lng
address CMDBATimprintsize;
-comment Return the size of the imprints
+comment Return the storage size of the imprints index structure.
command bat.imprintsize(b:bat[:oid,:flt]):lng
address CMDBATimprintsize;
@@ -31616,7 +31580,7 @@ command bat.imprintsize(b:bat[:oid,:bte]
address CMDBATimprintsize;
command bat.imprints(b:bat[:oid,:dbl]):void
address CMDBATimprints;
-comment Check/create an imprint index on the BAT
+comment Check for existence or create an imprint index on the BAT.
command bat.imprints(b:bat[:oid,:flt]):void
address CMDBATimprints;
@@ -31676,21 +31640,21 @@ command bat.insert(b:bat[:any_1,:any_2],
address BKCinsert_bat;
comment Insert all BUNs of the second BAT into the first.
-command bat.isSortedReverse(b:bat[:any_1,:any_2]):bit
+command bat.isSortedReverse(b:bat[:oid,:any_1]):bit
address BKCisSortedReverse;
-comment Returns whether a BAT is ordered on head or not.
-
-command bat.isSorted(b:bat[:any_1,:any_2]):bit
+comment Returns true if BAT values are reversely ordered.
+
+command bat.isSorted(b:bat[:oid,:any_1]):bit
address BKCisSorted;
-comment Returns whether a BAT is ordered on head or not.
-
-command bat.isaKey(b:bat[:any_1,:any_2]):bit
+comment Returns true if BAT values are ordered.
+
+command bat.isaKey(b:bat[:oid,:any_1]):bit
address BKCgetKey;
-comment return whether the head column of a BAT is unique (key).
+comment Return whether the column tail values are unique (key).
command bat.info(b:bat[:oid,:any_2]) (X_2:bat[:oid,:str],X_3:bat[:oid,:str])
address BKCinfo;
-comment Produce a BAT containing info about a BAT in [attribute,value] format.
It contains all properties of the BAT record. See the BAT documentation
in GDK for more information.
+comment Produce a table containing information about a BAT in
[attribute,value] format. It contains all properties of the BAT record.
See the BAT documentation in GDK for more information.
command bat.load(name:str):bat[:oid,:any_2]
address BKCload;
@@ -31706,10 +31670,12 @@ comment Returns the head-mirror image of
command bat.new(nme:str):bat[:oid,:any_1]
address CMDBATderivedByName;
-comment Localize a bat by name and produce a clone.
+comment Localize a BAT by name and produce a clone.
pattern bat.new(b:bat[:oid,:any_1],size:lng):bat[:oid,:any_1]
address CMDBATnewDerived;
+comment Create a new BAT using the inherited structure
+
pattern bat.new(b:bat[:oid,:any_1]):bat[:oid,:any_1]
address CMDBATnewDerived;
pattern bat.new_persistent(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1]
@@ -31718,20 +31684,16 @@ comment Creates a new BAT in the persist
pattern bat.new_persistent(ht:oid,tt:any_1,size:int):bat[:oid,:any_1]
address CMDBATnew_persistent;
-comment Creates a new BAT in the persistent farm with sufficient space.
-
pattern bat.new_persistent(ht:oid,tt:any_1):bat[:oid,:any_1]
address CMDBATnew_persistent;
comment Creates a new empty transient BAT in the persistent farm, with head-
and tail-types as indicated.
pattern bat.new(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1]
address CMDBATnew;
-comment Creates a new BAT and allocate space.
+comment Creates a new BAT with sufficient space.
pattern bat.new(ht:oid,tt:any_1,size:int):bat[:oid,:any_1]
address CMDBATnew;
-comment Creates a new BAT with sufficient space.
-
pattern bat.new(ht:oid,tt:any_1):bat[:oid,:any_1]
address CMDBATnew;
comment Creates a new empty transient BAT, with head- and tail-types as
indicated.
@@ -31746,7 +31708,7 @@ comment Sorts the BAT itself on the head
pattern bat.partition(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1]
address CMDBATpartition2;
-comment Create the n-th slice over the BAT broken into severral pieces.
+comment Create the n-th slice over the BAT broken into several pieces.
pattern bat.partition(b:bat[:oid,:any_1]):bat[:oid,:any_1]...
address CMDBATpartition;
@@ -31850,25 +31812,13 @@ command bat.setName(b:bat[:oid,:any_2],s
address BKCsetName;
comment Give a logical name to a BAT.
-command bat.setWriteMode(b:bat[:any_1,:any_2]):bat[:any_1,:any_2]
-address BKCsetWriteMode;
-comment Change access privilige of BAT to read and write
-
-command bat.setReadMode(b:bat[:any_1,:any_2]):bat[:any_1,:any_2]
-address BKCsetReadMode;
-comment Change access privilige of BAT to read only
-
-command bat.setAppendMode(b:bat[:any_1,:any_2]):bat[:any_1,:any_2]
-address BKCsetAppendMode;
-comment Change access privilige of BAT to append only
-
-command bat.setAccess(b:bat[:any_1,:any_2],mode:str):bat[:any_1,:any_2]
+command bat.setAccess(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1]
address BKCsetAccess;
-comment Try to change the update access priviliges to this BAT. Mode:
r[ead-only] - allow only read access. a[append-only] - allow reads
and update. w[riteable] - allow all operations. BATs are
updatable by default. On making a BAT read-only, all subsequent updates
fail with an error message.Returns the BAT itself.
-
-command bat.setKey(b:bat[:any_1,:any_2],mode:bit):bat[:any_1,:any_2]
+comment Try to change the update access priviliges to this BAT. Mode:
r[ead-only] - allow only read access. a[append-only] - allow reads
and update. w[riteable] - allow all operations. BATs are
updatable by default. On making a BAT read-only, all subsequent updates
fail with an error message. Returns the BAT itself.
+
+command bat.setKey(b:bat[:oid,:any_2],mode:bit):bat[:oid,:any_2]
address BKCsetkey;
-comment Sets the 'key' property of the head column to 'mode'. In 'key' mode,
the kernel will silently block insertions that cause a duplicate
entries in the head column. KNOWN BUG:when 'key' is set to TRUE, this
function does not automatically eliminate duplicates. Use b :=
b.kunique;
+comment Sets the 'key' property of the tail column to 'mode'. In 'key' mode,
the kernel will silently block insertions that cause a duplicate
entries in the head column. KNOWN BUG:when 'key' is set to TRUE, this
function does not automatically eliminate duplicates.
command bat.unload(name:str):bit
address BKCunload;
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
@@ -3172,41 +3172,33 @@ command algebra.uselect(b:bat[:any_1,:an
address ALGuselectInclusive;
comment See select() but limited to head values
-command alarm.alarm(secs:int,action:str):void
-address ALARMsetalarm;
-comment execute action in X secs
-
command alarm.ctime{unsafe}():str
address ALARMctime;
-comment current time as a string
+comment Return the current time as a C-time string.
command alarm.epilogue():void
address ALARMepilogue;
-comment Finalize alarm module
+comment Finalize alarm module.
command alarm.epoch{unsafe}():int
address ALARMepoch;
-comment current time as unix epoch
+comment Return the current time as UNIX epoch.
command alarm.prelude():void
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
