Changeset: 444cbbf4e85a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=444cbbf4e85a
Added Files:
        sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
        sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
Modified Files:
        gdk/gdk_batop.c
        testing/Mtest.py.in
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (truncated from 5673 to 300 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1309,8 +1309,6 @@ do_sort(void *h, void *t, const void *ba
  * parameters may be NULL.  If they're all NULL, this function does
  * nothing.
  *
- * All BATs involved must be dense-headed.
- *
  * If o is specified, it is used to first rearrange b according to the
  * order specified in o, after which b is sorted taking g into
  * account.
@@ -1332,7 +1330,7 @@ do_sort(void *h, void *t, const void *ba
  * sorted results in (col1s, col2s, col3s):
  *     BATsort(&col1s, &ord1, &grp1, col1, NULL, NULL, 0, 0);
  *     BATsort(&col2s, &ord2, &grp2, col2, ord1, grp1, 0, 0);
- *     BATsort(&col3s, NULL, NULL, col3, ord2, grp2, 0, 0);
+ *     BATsort(&col3s,  NULL,  NULL, col3, ord2, grp2, 0, 0);
  * Note that the "reverse" parameter can be different for each call.
  */
 gdk_return
@@ -1358,7 +1356,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
             (o->ttype == TYPE_void &&         /* no nil tail */
              BATcount(o) != 0 &&
              is_oid_nil(o->tseqbase)))) {
-               GDKerror("BATsort: o must be [dense,oid] and same size as b\n");
+               GDKerror("BATsort: o must have type oid and same size as b\n");
                return GDK_FAIL;
        }
        if (g != NULL &&
@@ -1368,7 +1366,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
             (g->ttype == TYPE_void &&         /* no nil tail */
              BATcount(g) != 0 &&
              is_oid_nil(g->tseqbase)))) {
-               GDKerror("BATsort: g must be [dense,oid], sorted on the tail, 
and same size as b\n");
+               GDKerror("BATsort: g must have type oid, sorted on the tail, 
and same size as b\n");
                return GDK_FAIL;
        }
        assert(reverse == 0 || reverse == 1);
@@ -1437,7 +1435,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
            /* if we want a stable sort, the order index must be
             * stable, if we don't want stable, we don't care */
            (!stable || ((oid *) pb->torderidx->base)[2])) {
-               /* there is a order index that we can use */
+               /* there is an order index that we can use */
                on = COLnew(pb->hseqbase, TYPE_oid, BATcount(pb), TRANSIENT);
                if (on == NULL)
                        goto error;
@@ -1689,8 +1687,8 @@ BATsort(BAT **sorted, BAT **order, BAT *
        return GDK_FAIL;
 }
 
-/* return a new BAT of length n with a dense head with seqbase hseq,
- * and the constant v in the tail */
+/* return a new BAT of length n with seqbase hseq, and the constant v
+ * in the tail */
 BAT *
 BATconstant(oid hseq, int tailtype, const void *v, BUN n, int role)
 {
diff --git 
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64 
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
@@ -0,0 +1,77 @@
+stderr of test 'overflow.SF-2853458` in directory 'sql/test/BugTracker-2009` 
itself:
+
+
+# 22:26:13 >  
+# 22:26:13 >   mserver5 
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 
--set gdk_nr_threads=0 --set 
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"    
--set mapi_open=true --set xrpc_open=true --set mapi_port=35561 --set 
xrpc_port=42240 --set monet_prompt= --trace  
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit= 
include sql;" ; echo ; echo Over..
+# 22:26:13 >  
+
+# builtin opt  gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt  gdk_version = 1.32.0
+# builtin opt  prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# builtin opt  exec_prefix = ${prefix}
+# builtin opt  gdk_dbname = tst
+# builtin opt  gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt  gdk_debug = 8
+# builtin opt  gdk_alloc_map = yes
+# builtin opt  gdk_vmtrim = yes
+# builtin opt  monet_admin = adm
+# builtin opt  monet_prompt = >
+# builtin opt  monet_welcome = yes
+# builtin opt  monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt  monet_daemon = yes
+# builtin opt  host = localhost
+# builtin opt  mapi_port = 50000
+# builtin opt  mapi_noheaders = no
+# builtin opt  mapi_debug = 0
+# builtin opt  mapi_clients = 2
+# builtin opt  sql_debug = 0
+# builtin opt  standoff_ns = http://monetdb.cwi.nl/standoff
+# builtin opt  standoff_start = start
+# builtin opt  standoff_end = end
+# config opt   prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt   config = ${prefix}/etc/monetdb5.conf
+# config opt   prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt   exec_prefix = ${prefix}
+# config opt   gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt   gdk_dbname = demo
+# config opt   gdk_alloc_map = no
+# config opt   gdk_embedded = no
+# config opt   gdk_debug = 0
+# config opt   monet_mod_path = 
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt   monet_daemon = no
+# config opt   monet_welcome = yes
+# config opt   mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt   mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt   mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt   mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
+# config opt   mal_listing = 2
+# config opt   mapi_port = 50000
+# config opt   mapi_autosense = false
+# config opt   mapi_open = false
+# config opt   sql_optimizer = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# cmdline opt  config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  monet_mod_path = 
/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin
+# cmdline opt  gdk_dbfarm = 
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
+# cmdline opt  mapi_open = true
+# cmdline opt  xrpc_open = true
+# cmdline opt  mapi_port = 35561
+# cmdline opt  xrpc_port = 42240
+# cmdline opt  monet_prompt = 
+# cmdline opt  gdk_dbname = mTests_src_test_BugTracker-2009
+# cmdline opt  mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
+
+# 22:26:13 >  
+# 22:26:13 >  mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35561 
+# 22:26:13 >  
+
+MAPI  = (monetdb) /var/tmp/mtest-65872/.s.monetdb.34890
+QUERY = select cast(power(2,64) as bigint);
+ERROR = !overflow in conversion of 1.8446744073709552e+19 to lng.
+
+# 22:26:13 >  
+# 22:26:13 >  Done.
+# 22:26:13 >  
+
diff --git 
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64 
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
@@ -0,0 +1,42 @@
+stdout of test 'overflow.SF-2853458` in directory 'sql/test/BugTracker-2009` 
itself:
+
+
+# 22:26:13 >  
+# 22:26:13 >   mserver5 
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 
--set gdk_nr_threads=0 --set 
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"    
--set mapi_open=true --set xrpc_open=true --set mapi_port=35561 --set 
xrpc_port=42240 --set monet_prompt= --trace  
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit= 
include sql;" ; echo ; echo Over..
+# 22:26:13 >  
+
+# MonetDB server v5.14.0, based on kernel v1.32.0
+# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:35561/
+# MonetDB/SQL module v2.32.0 loaded
+
+Ready.
+#function user.main():void;
+#    clients.quit();
+#end main;
+
+
+# 22:26:13 >  
+# 22:26:13 >  mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35561 
+# 22:26:13 >  
+
+
+# 11:23:53 >  
+# 11:23:53 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-65872" "--port=34890"
+# 11:23:53 >  
+
+#select cast(power(2,63) as bigint);
+% .L2 # table_name
+% L2 # name
+% bigint # type
+% 19 # length
+[ 9223372036854775807  ]
+
+# 11:23:54 >  
+# 11:23:54 >  "Done."
+# 11:23:54 >  
+
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -0,0 +1,5360 @@
+stdout of test 'upgrade` in directory 'sql/test/emptydb-upgrade-chain` itself:
+
+
+# 16:53:35 >  
+# 16:53:35 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=39660" "--set" 
"mapi_usock=/var/tmp/mtest-30908/.s.monetdb.39660" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain"
 "--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:53:35 >  
+
+# MonetDB 5 server v11.21.16 (hg id: c20b591c1c70+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_emptydb-upgrade-chain', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.31'
+# Finished reading the write-ahead log 'sql_logs/sql/log.31'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
+
+Ready.
+Running database upgrade commands:
+set schema "sys";
+delete from sys.dependencies where id < 2000;
+delete from sys.types where id < 2000;
+insert into sys.types values (0, 'void', 'any', 0, 0, 0, 0, 2000);
+insert into sys.types values (1, 'bat', 'table', 0, 0, 0, 1, 2000);
+insert into sys.types values (2, 'ptr', 'ptr', 0, 0, 0, 1, 2000);
+insert into sys.types values (3, 'bit', 'boolean', 1, 0, 2, 2, 2000);
+insert into sys.types values (4, 'str', 'char', 0, 0, 0, 3, 2000);
+insert into sys.types values (5, 'str', 'varchar', 0, 0, 0, 4, 2000);
+insert into sys.types values (6, 'str', 'clob', 0, 0, 0, 4, 2000);
+insert into sys.types values (7, 'oid', 'oid', 63, 0, 2, 6, 2000);
+insert into sys.types values (8, 'bte', 'tinyint', 8, 1, 2, 7, 2000);
+insert into sys.types values (9, 'sht', 'smallint', 16, 1, 2, 7, 2000);
+insert into sys.types values (10, 'int', 'int', 32, 1, 2, 7, 2000);
+insert into sys.types values (11, 'lng', 'bigint', 64, 1, 2, 7, 2000);
+insert into sys.types values (12, 'lng', 'wrd', 64, 1, 2, 7, 2000);
+insert into sys.types values (13, 'hge', 'hugeint', 128, 1, 2, 7, 2000);
+insert into sys.types values (14, 'bte', 'decimal', 2, 1, 10, 10, 2000);
+insert into sys.types values (15, 'sht', 'decimal', 4, 1, 10, 10, 2000);
+insert into sys.types values (16, 'int', 'decimal', 9, 1, 10, 10, 2000);
+insert into sys.types values (17, 'lng', 'decimal', 18, 1, 10, 10, 2000);
+insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 2000);
+insert into sys.types values (19, 'flt', 'real', 24, 2, 2, 11, 2000);
+insert into sys.types values (20, 'dbl', 'double', 53, 2, 2, 11, 2000);
+insert into sys.types values (21, 'int', 'month_interval', 32, 0, 2, 8, 2000);
+insert into sys.types values (22, 'lng', 'sec_interval', 13, 1, 10, 9, 2000);
+insert into sys.types values (23, 'daytime', 'time', 7, 0, 0, 12, 2000);
+insert into sys.types values (24, 'daytime', 'timetz', 7, 1, 0, 12, 2000);
+insert into sys.types values (25, 'date', 'date', 0, 0, 0, 13, 2000);
+insert into sys.types values (26, 'timestamp', 'timestamp', 7, 0, 0, 14, 2000);
+insert into sys.types values (27, 'timestamp', 'timestamptz', 7, 1, 0, 14, 
2000);
+insert into sys.types values (28, 'sqlblob', 'blob', 0, 0, 0, 5, 2000);
+insert into sys.types values (29, 'wkb', 'geometry', 0, 0, 0, 15, 2000);
+insert into sys.types values (30, 'wkba', 'geometrya', 0, 0, 0, 16, 2000);
+insert into sys.types values (31, 'mbr', 'mbr', 0, 0, 0, 16, 2000);
+delete from sys.functions where id < 2000;
+delete from sys.args where func_id not in (select id from sys.functions);
+insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 
1, false, false, false, 2000);
+insert into sys.args values (14756, 32, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14757, 32, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (14758, 32, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (33, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 
1, false, false, false, 2000);
+insert into sys.args values (14759, 33, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14760, 33, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (14761, 33, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1, 
false, false, false, 2000);
+insert into sys.args values (14762, 34, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14763, 34, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (14764, 34, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (35, 'mbr_above', 'mbrAbove', 'geom', 0, 1, 
false, false, false, 2000);
+insert into sys.args values (14765, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14766, 35, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (14767, 35, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1, 
false, false, false, 2000);
+insert into sys.args values (14768, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14769, 36, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (14770, 36, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (37, 'mbr_below', 'mbrBelow', 'geom', 0, 1, 
false, false, false, 2000);
+insert into sys.args values (14771, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14772, 37, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (14773, 37, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
+insert into sys.args values (14774, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14775, 38, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (14776, 38, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (39, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
+insert into sys.args values (14777, 39, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14778, 39, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (14779, 39, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (40, 'mbr_left', 'mbrLeft', 'geom', 0, 1, 
false, false, false, 2000);
+insert into sys.args values (14780, 40, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14781, 40, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (14782, 40, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (41, 'mbr_left', 'mbrLeft', 'geom', 0, 1, 
false, false, false, 2000);
+insert into sys.args values (14783, 41, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14784, 41, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (14785, 41, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (42, 'mbr_overlap_or_above', 
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000);
+insert into sys.args values (14786, 42, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (14787, 42, 'arg_1', 'geometry', 0, 0, 1, 1);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to