Changeset: 72344c8c0948 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72344c8c0948
Removed Files:
monetdb5/tests/mapi/Tests/smack01-slow.MAL.bat
monetdb5/tests/mapi/Tests/smack01-slow.MAL.sh
monetdb5/tests/mapi/Tests/smack01-slow.stable.err
monetdb5/tests/mapi/Tests/smack01-slow.stable.out
Modified Files:
gdk/gdk_calc.c
monetdb5/tests/mapi/Tests/All
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/package.py
sql/test/testdb/Tests/testdb-package.py
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (truncated from 1408 to 300 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -73,19 +73,19 @@ checkbats(BAT *b1, BAT *b2, const char *
return GDK_SUCCEED;
}
-#define CHECKCAND(dst, i, candoff, NIL)
\
- /* cannot use do/while trick because of continue */ \
- /* NOTE: because of the continue, you *must* use the */ \
- /* index (i) to index src/dst */ \
- if (cand) { \
- if ((i) < *cand - (candoff)) { \
- nils++; \
- (dst)[i] = (NIL); \
- continue; \
- } \
- assert((i) == *cand - (candoff)); \
- if (++cand == (candend)) \
- end = (i) + 1; \
+#define CHECKCAND(dst, i, candoff, NIL) \
+ /* cannot use do/while trick because of continue */ \
+ /* NOTE: because of the continue, you *must* use the */ \
+ /* index (i) to index src/dst */ \
+ if (cand) { \
+ if ((i) < *cand - (candoff)) { \
+ nils++; \
+ (dst)[i] = (NIL); \
+ continue; \
+ } \
+ assert((i) == *cand - (candoff)); \
+ if (++cand == (candend)) \
+ end = (i) + 1; \
}
/* fill in NILs from low to high, used to write NILs before and after
@@ -1304,7 +1304,7 @@ BATcalcmax_no_nil(BAT *b1, BAT *b2, BAT
do { \
GDKerror("22003!overflow in calculation " \
FMT##TYPE1 OP FMT##TYPE2 ".\n", \
- CST##TYPE1 lft[i], CST##TYPE2 rgt[j]);
\
+ CST##TYPE1 lft[i], CST##TYPE2 rgt[j]); \
return BUN_NONE; \
} while (0)
@@ -8541,7 +8541,7 @@ static BUN
\
mod_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
const TYPE2 *rgt, int incr2, \
TYPE3 *restrict dst, BUN cnt, BUN start, \
- BUN end, const oid *restrict cand,
\
+ BUN end, const oid *restrict cand, \
const oid *candend, oid candoff, \
int abort_on_error) \
{ \
@@ -8573,7 +8573,7 @@ static BUN
\
mod_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
const TYPE2 *rgt, int incr2, \
TYPE3 *restrict dst, BUN cnt, BUN start, \
- BUN end, const oid *restrict cand,
\
+ BUN end, const oid *restrict cand, \
const oid *candend, oid candoff, \
int abort_on_error) \
{ \
@@ -12248,28 +12248,28 @@ BATcalcifthencstelsecst(BAT *b, const Va
* failed (only happens for conversion to str).
*/
-#define convertimpl_copy(TYPE) \
-static BUN \
+#define convertimpl_copy(TYPE) \
+static BUN \
convert_##TYPE##_##TYPE(const TYPE *src, TYPE *restrict dst, BUN cnt, \
BUN start, BUN end, const oid *restrict cand, \
- const oid *candend, oid candoff) \
-{ \
- BUN i, nils = 0; \
- \
- CANDLOOP(dst, i, TYPE##_nil, 0, start); \
- for (i = start; i < end; i++) { \
- CHECKCAND(dst, i, candoff, TYPE##_nil); \
- nils += src[i] == TYPE##_nil; \
- dst[i] = src[i]; \
- } \
- CANDLOOP(dst, i, TYPE##_nil, end, cnt); \
- return nils; \
+ const oid *candend, oid candoff) \
+{ \
+ BUN i, nils = 0; \
+ \
+ CANDLOOP(dst, i, TYPE##_nil, 0, start); \
+ for (i = start; i < end; i++) { \
+ CHECKCAND(dst, i, candoff, TYPE##_nil); \
+ nils += src[i] == TYPE##_nil; \
+ dst[i] = src[i]; \
+ } \
+ CANDLOOP(dst, i, TYPE##_nil, end, cnt); \
+ return nils; \
}
#define convertimpl_enlarge(TYPE1, TYPE2) \
static BUN \
convert_##TYPE1##_##TYPE2(const TYPE1 *src, TYPE2 *restrict dst, BUN cnt, \
- BUN start, BUN end, const oid *restrict cand,
\
+ BUN start, BUN end, const oid *restrict cand, \
const oid *candend, oid candoff) \
{ \
BUN i, nils = 0; \
@@ -12290,14 +12290,14 @@ convert_##TYPE1##_##TYPE2(const TYPE1 *s
#define CONV_OVERFLOW(TYPE1, TYPE2, value) \
do { \
GDKerror("22003!overflow in conversion of " \
- FMT##TYPE1 " to %s.\n", CST##TYPE1 (value), TYPE2);
\
+ FMT##TYPE1 " to %s.\n", CST##TYPE1 (value), TYPE2); \
return BUN_NONE; \
} while (0)
#define convertimpl_oid_enlarge(TYPE1) \
static BUN \
convert_##TYPE1##_oid(const TYPE1 *src, oid *restrict dst, BUN cnt, \
- BUN start, BUN end, const oid *restrict cand,
\
+ BUN start, BUN end, const oid *restrict cand, \
const oid *candend, oid candoff, \
int abort_on_error) \
{ \
@@ -12325,7 +12325,7 @@ convert_##TYPE1##_oid(const TYPE1 *src,
#define convertimpl_oid_reduce(TYPE1) \
static BUN \
convert_##TYPE1##_oid(const TYPE1 *src, oid *restrict dst, BUN cnt, \
- BUN start, BUN end, const oid *restrict cand,
\
+ BUN start, BUN end, const oid *restrict cand, \
const oid *candend, oid candoff, \
int abort_on_error) \
{ \
@@ -12354,7 +12354,7 @@ convert_##TYPE1##_oid(const TYPE1 *src,
#define convertimpl_reduce(TYPE1, TYPE2) \
static BUN \
convert_##TYPE1##_##TYPE2(const TYPE1 *src, TYPE2 *restrict dst, BUN cnt, \
- BUN start, BUN end, const oid *restrict cand,
\
+ BUN start, BUN end, const oid *restrict cand, \
const oid *candend, oid candoff, \
int abort_on_error) \
{ \
@@ -12385,7 +12385,7 @@ convert_##TYPE1##_##TYPE2(const TYPE1 *s
#define convertimpl_reduce_float(TYPE1, TYPE2) \
static BUN \
convert_##TYPE1##_##TYPE2(const TYPE1 *src, TYPE2 *restrict dst, BUN cnt, \
- BUN start, BUN end, const oid *restrict cand,
\
+ BUN start, BUN end, const oid *restrict cand, \
const oid *candend, oid candoff, \
int abort_on_error) \
{ \
@@ -12414,7 +12414,7 @@ convert_##TYPE1##_##TYPE2(const TYPE1 *s
#define convert2bit_impl(TYPE) \
static BUN \
convert_##TYPE##_bit(const TYPE *src, bit *restrict dst, BUN cnt, \
- BUN start, BUN end, const oid *restrict cand,
\
+ BUN start, BUN end, const oid *restrict cand, \
const oid *candend, oid candoff) \
{ \
BUN i, nils = 0; \
diff --git a/monetdb5/tests/mapi/Tests/All b/monetdb5/tests/mapi/Tests/All
--- a/monetdb5/tests/mapi/Tests/All
+++ b/monetdb5/tests/mapi/Tests/All
@@ -5,5 +5,4 @@ sample3
sample4
smack00
smack01
-smack01-slow
HAVE_PERL?perl_dbi
diff --git a/monetdb5/tests/mapi/Tests/smack01-slow.MAL.bat
b/monetdb5/tests/mapi/Tests/smack01-slow.MAL.bat
deleted file mode 100755
--- a/monetdb5/tests/mapi/Tests/smack01-slow.MAL.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-
-prompt # $t $g
-echo on
-
-smack01.exe %MAPIPORT% mal
diff --git a/monetdb5/tests/mapi/Tests/smack01-slow.MAL.sh
b/monetdb5/tests/mapi/Tests/smack01-slow.MAL.sh
deleted file mode 100755
--- a/monetdb5/tests/mapi/Tests/smack01-slow.MAL.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-Mlog -x smack01 $MAPIPORT mal
diff --git a/monetdb5/tests/mapi/Tests/smack01-slow.stable.err
b/monetdb5/tests/mapi/Tests/smack01-slow.stable.err
deleted file mode 100644
--- a/monetdb5/tests/mapi/Tests/smack01-slow.stable.err
+++ /dev/null
@@ -1,17 +0,0 @@
-stderr of test 'smack01-slow` in directory 'monetdb5/tests/mapi` itself:
-
-
-# 22:38:37 >
-# 22:38:37 > Mtimeout -timeout 180 Mserver
"--config=/var/tmp/_PREFIX_MONET_GNU_32_d__/etc/monet.conf" --debug=10 --set
"monet_mod_path=/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB" --set
"gdk_dbfarm=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/dbfarm" --set
"sql_logdir=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/log" --set
mapi_port=49350 --set sql_port=55436 --set monet_prompt= --trace
"--dbname=mTests_src_mapi_examples_C"
"/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB/mapi.mil" ; echo ; echo Over..
-# 22:38:37 >
-
-
-# 22:38:38 >
-# 22:38:38 > Mtimeout -timeout 60 ./smack01-slow.MAPI smack01-slow
-# 22:38:38 >
-
-
-# 22:38:46 >
-# 22:38:46 > Done.
-# 22:38:46 >
-
diff --git a/monetdb5/tests/mapi/Tests/smack01-slow.stable.out
b/monetdb5/tests/mapi/Tests/smack01-slow.stable.out
deleted file mode 100644
--- a/monetdb5/tests/mapi/Tests/smack01-slow.stable.out
+++ /dev/null
@@ -1,1034 +0,0 @@
-stdout of test 'smack01-slow` in directory 'monetdb5/tests/mapi` itself:
-
-
-# 22:38:37 >
-# 22:38:37 > Mtimeout -timeout 180 Mserver
"--config=/var/tmp/_PREFIX_MONET_GNU_32_d__/etc/monet.conf" --debug=10 --set
"monet_mod_path=/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB" --set
"gdk_dbfarm=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/dbfarm" --set
"sql_logdir=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/log" --set
mapi_port=49350 --set sql_port=55436 --set monet_prompt= --trace
"--dbname=mTests_src_mapi_examples_C"
"/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB/mapi.mil" ; echo ; echo Over..
-# 22:38:37 >
-
-# MonetDB server v5.3.0, based on kernel v1.21.0
-# Serving database 'mTests_tests_mapi'
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://koala.ins.cwi.nl:30765/
-
-Ready.
-#function user.main():void;
-# clients.quit();
-#end main;
-
-
-# 22:38:38 >
-# 22:38:38 > Mtimeout -timeout 60 ./smack01-slow.MAPI smack01-slow
-# 22:38:38 >
-
-
-# 22:10:05 >
-# 22:10:05 > smack01 40178
-# 22:10:05 >
-
-[ 0 ]
-[ 1 ]
-[ 2 ]
-[ 3 ]
-[ 4 ]
-[ 5 ]
-[ 6 ]
-[ 7 ]
-[ 8 ]
-[ 9 ]
-[ 10 ]
-[ 11 ]
-[ 12 ]
-[ 13 ]
-[ 14 ]
-[ 15 ]
-[ 16 ]
-[ 17 ]
-[ 18 ]
-[ 19 ]
-[ 20 ]
-[ 21 ]
-[ 22 ]
-[ 23 ]
-[ 24 ]
-[ 25 ]
-[ 26 ]
-[ 27 ]
-[ 28 ]
-[ 29 ]
-[ 30 ]
-[ 31 ]
-[ 32 ]
-[ 33 ]
-[ 34 ]
-[ 35 ]
-[ 36 ]
-[ 37 ]
-[ 38 ]
-[ 39 ]
-[ 40 ]
-[ 41 ]
-[ 42 ]
-[ 43 ]
-[ 44 ]
-[ 45 ]
-[ 46 ]
-[ 47 ]
-[ 48 ]
-[ 49 ]
-[ 50 ]
-[ 51 ]
-[ 52 ]
-[ 53 ]
-[ 54 ]
-[ 55 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
