Changeset: 8d6f55e76ed8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d6f55e76ed8
Removed Files:
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Windows
sql/test/Dump/Tests/dump.stable.out.Windows
Modified Files:
gdk/gdk_group.c
testing/Mfilter.py.in
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 4035 to 300 lines):
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -203,7 +203,7 @@
* Note this algorithm depends critically on the fact that our hash
* chains go from higher to lower BUNs.
*/
-#define GRP_use_existing_hash_table(INIT_0,INIT_1,HASH,COMP) \
+#define GRP_use_existing_hash_table(INIT_0,INIT_1,COMP)
\
do { \
INIT_0; \
for (r = lo, p = r, q = hi; \
@@ -259,7 +259,6 @@
GRP_use_existing_hash_table( \
/* INIT_0 */ const TYPE *w = (TYPE *) Tloc(b, 0), \
/* INIT_1 */ , \
- /* HASH */ hash_##TYPE(hs, &w[p]) , \
/* COMP */ w[p] == w[hb] \
)
@@ -267,7 +266,6 @@
GRP_use_existing_hash_table( \
/* INIT_0 */ , \
/* INIT_1 */ v = BUNtail(bi, p) , \
- /* HASH */ HASHprobe(hs, v) , \
/* COMP */ cmp(v, BUNtail(bi, hb)) == 0 \
)
@@ -765,6 +763,7 @@ BATgroup_internal(BAT **groups, BAT **ex
lo = (BUN) ((b->T->heap.base - b2->T->heap.base) >>
b->T->shift) + BUNfirst(b);
hi = lo + BATcount(b);
b = b2;
+ bi = bat_iterator(b);
} else {
lo = BUNfirst(b);
hi = BUNlast(b);
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
b/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
deleted file mode 100644
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
+++ /dev/null
@@ -1,3781 +0,0 @@
-stdout of test 'casts` in directory 'monetdb5/tests/gdkTests` itself:
-
-
-# 12:38:12 >
-# 12:38:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/sjoerd/Monet-devel/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=34829" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_tests_gdkTests" "casts.mal"
-# 12:38:12 >
-
-# MonetDB 5 server v11.10.0 (hg id: 9d539a55f543)
-# This is an unreleased version
-# Serving database 'mTests_tests_gdkTests', using 1 thread
-# Compiled for i686-pc-linux-gnu/32bit with 32bit OIDs dynamically linked
-# Found 0.980 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://localhost.localdomain:34829/
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-function user.main():void;
- io.printf("# casting to int\n");
- io.printf("# io.print(0);\n");
- io.print(0);
- io.printf("# io.print(1);\n");
- io.print(1);
- io.printf("# io.print(32767);\n");
- io.print(32767);
- io.printf("# io.print(32768);\n");
- io.print(32768);
- io.printf("# io.print(32769);\n");
- io.print(32769);
- io.printf("# io.print(2147483647);\n");
- io.print(2147483647);
- io.printf("# io.print(2147483648);\n");
- io.print(2147483648);
- io.printf("# io.print(2147483649);\n");
- io.print(2147483649);
- io.printf("# io.print(-2147483647);\n");
- io.print(-2147483647);
- io.printf("# io.print(-2147483648);\n");
- io.print(-2147483648);
- io.printf("# io.print(-2147483649);\n");
- io.print(-2147483649);
- io.printf("# int from bit\n");
- io.printf("# bi:= true:int; io.print(bi);\n");
- bi := 1:int;
- io.print(bi);
- io.printf("# bi:= false:int; io.print(bi);\n");
- bi := 0:int;
- io.print(bi);
- io.printf("# int from sht\n");
- io.printf("# sh:= 1:sht; si:= calc.int(sh); io.print(si);\n");
- sh := 1:sht;
- si := calc.int(sh);
- io.print(si);
- io.printf("# sh:= 32767:sht; si:= calc.int(sh); io.print(si);\n");
- sh := 32767:sht;
- si := calc.int(sh);
- io.print(si);
- io.printf("# int from int\n");
- io.printf("# io.print(1:int);\n");
- io.print(1:int);
- io.printf("# io.print(32767:int);\n");
- io.print(32767:int);
- io.printf("# io.print(32768:int);\n");
- io.print(32768:int);
- io.printf("# io.print(2147483647:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(-2147483647:int);\n");
- io.print(-2147483647:int);
- io.printf("# i:= 2147483647:int+1:int;\n");
- i := calc.+(2147483647:int,1:int);
-catch MALException:str;
- io.printf("Caught exception\n");
-exit MALException:str;
- io.printf("# io.print(i);\n");
- io.print(i);
- io.printf("# z:= -2147483647:int - 1:int;\n");
- z := calc.-(-2147483647:int,1:int);
-catch MALException:str;
- io.printf("Caught exception\n");
-exit MALException:str;
- io.printf("# io.print(z);\n");
- io.print(z);
- io.printf("# should this produce nil (overflow)?\n");
- io.printf("# z:= 2147483647:int + 2:int;\n");
- z := calc.+(2147483647:int,2:int);
-catch MALException:str;
- io.printf("Caught exception\n");
-exit MALException:str;
- io.printf("# io.print(z);\n");
- io.print(z);
- io.printf("# should this produce nil (overflow)?\n");
- io.printf("# z:= -2147483647:int - 2:int;\n");
- z := calc.-(-2147483647:int,2:int);
-catch MALException:str;
- io.printf("Caught exception\n");
-exit MALException:str;
- io.printf("# io.print(z);\n");
- io.print(z);
- io.printf("# int from lng\n");
- io.printf("# io.print(1LL:int);\n");
- io.print(1:int);
- io.printf("# io.print(2147483647LL:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(2147483648LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(2147483649LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483647LL:int);\n");
- io.print(-2147483647:int);
- io.printf("# io.print(-2147483648LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483649LL:int);\n");
- io.print(nil:int);
- io.printf("# int from flt\n");
- io.printf("# io.print(0.0:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.1:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.5:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.9:int);\n");
- io.print(0:int);
- io.printf("# io.print(1.0:int);\n");
- io.print(1:int);
- io.printf("# io.print(-0.1:int);\n");
- io.print(0:int);
- io.printf("# io.print(-0.5:int);\n");
- io.print(0:int);
- io.printf("# io.print(-0.9:int);\n");
- io.print(0:int);
- io.printf("# io.print(-1.0:int);\n");
- io.print(-1:int);
-# avoid being around the int edge, e.g PowerPC has different internal
-# representation, leading to non-nil integer results
- io.printf("# io.print(2147483847.0:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483647.0:int);\n");
- io.print(-2147483647:int);
- io.printf("# io.print(-2147483648.0:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483649.0:int);\n");
- io.print(nil:int);
- io.printf("# int from dbl\n");
- io.printf("# io.print(0.0LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.1LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.5LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(0.9LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(1.0LL:int);\n");
- io.print(1:int);
- io.printf("# io.print(-0.1LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(-0.5LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(-0.9LL:int);\n");
- io.print(0:int);
- io.printf("# io.print(-1.0LL:int);\n");
- io.print(-1:int);
- io.printf("# io.print(2147483647.0LL:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(2147483648.0LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(2147483649.0LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483647.0LL:int);\n");
- io.print(-2147483647:int);
- io.printf("# io.print(-2147483648.0LL:int);\n");
- io.print(nil:int);
- io.printf("# io.print(-2147483649.0LL:int);\n");
- io.print(nil:int);
- io.printf("# int from oid\n");
- io.printf("# io.print(2@0:int);\n");
- io.print(2:int);
- io.printf("# io.print(2@1:int);\n");
- io.print(2:int);
- io.printf("# io.print(2147483647@0:int);\n");
- io.print(2147483647:int);
- io.printf("# io.print(2147483648@0:int);\n");
- io.print(nil:int);
- io.printf("# io.print(2147483649@0:int);\n");
- io.print(nil:int);
- io.printf("# int from str\n");
- io.printf("# s := \"0\"; s_int := calc.int(s); io.print(s_int);\n");
- s := "0";
- s_int := calc.int(s);
- io.print(s_int);
- io.printf("# s := \"32767\"; s_int := calc.int(s); io.print(s_int);\n");
- s := "32767";
- s_int := calc.int(s);
- io.print(s_int);
- io.printf("# s := \"2147483647\"; s_int := calc.int(s);
io.print(s_int);\n");
- s := "2147483647";
- s_int := calc.int(s);
- io.print(s_int);
- io.printf("# s := \"2147483648\"; s_int := calc.int(s);
io.print(s_int);\n");
- s := "2147483648";
- s_int := calc.int(s);
- io.print(s_int);
-catch SQLException:str;
- io.printf("Caught exception\n");
-exit SQLException:str;
- io.printf("# s := \"2147483649\"; s_int := calc.int(s);
io.print(s_int);\n");
- s := "2147483649";
- s_int := calc.int(s);
- io.print(s_int);
-catch SQLException:str;
- io.printf("Caught exception\n");
-exit SQLException:str;
- io.printf("# s := \"-2147483647\"; s_int := calc.int(s);
io.print(s_int);\n");
- s := "-2147483647";
- s_int := calc.int(s);
- io.print(s_int);
- io.printf("# s := \"-2147483648\"; s_int := calc.int(s);
io.print(s_int);\n");
- s := "-2147483648";
- s_int := calc.int(s);
- io.print(s_int);
-catch SQLException:str;
- io.printf("Caught exception\n");
-exit SQLException:str;
- io.printf("# s := \"-2147483649\"; s_int := calc.int(s);
io.print(s_int);\n");
- s := "-2147483649";
- s_int := calc.int(s);
- io.print(s_int);
-catch SQLException:str;
- io.printf("Caught exception\n");
-exit SQLException:str;
- io.printf("# s := \"\"; s_int := calc.int(s); io.print(s_int);\n");
- s := "";
- s_int := calc.int(s);
- io.print(s_int);
-catch SQLException:str;
- io.printf("Caught exception\n");
-exit SQLException:str;
- io.printf("# s := \"random string\"; s_int := calc.int(s);
io.print(s_int);\n");
- s := "random string";
- s_int := calc.int(s);
- io.print(s_int);
-catch SQLException:str;
- io.printf("Caught exception\n");
-exit SQLException:str;
- io.printf("# to bit\n");
- io.printf("# bit from bit\n");
- io.printf("# io.print(true:bit);\n");
- io.print(true:bit);
- io.printf("# io.print(false:bit);\n");
- io.print(false:bit);
- io.printf("# bit from sht\n");
- io.printf("# j:= 0:sht; b:= calc.bit(j); io.print(b);\n");
- j := 0:sht;
- b := calc.bit(j);
- io.print(b);
- io.printf("# j:= 1:sht; b:= calc.bit(j); io.print(b);\n");
- j := 1:sht;
- b := calc.bit(j);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
