Changeset: c243f80eaa11 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c243f80eaa11
Added Files:
clients/R/Tests/deps-install.timeout
sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat
sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh
sql/jdbc/tests/Tests/SQLcopyinto.stable.err
sql/jdbc/tests/Tests/SQLcopyinto.stable.out
Modified Files:
clients/R/Tests/dbapply.R
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/deps-test.timeout
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.stable.err
clients/R/Tests/install.R
clients/mapiclient/tachograph.c
common/utils/mcrypt.c
configure.ag
gdk/gdk_utils.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_querylog.c
sql/jdbc/tests/Tests/All
sql/server/rel_updates.c
sql/storage/store.c
sql/test/Tests/seq-default.stable.out
sql/test/seq-default.sql
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Branch: client-filetrans
Log Message:
Merge with default branch.
diffs (truncated from 603 to 300 lines):
diff --git a/clients/R/Tests/dbapply.R b/clients/R/Tests/dbapply.R
--- a/clients/R/Tests/dbapply.R
+++ b/clients/R/Tests/dbapply.R
@@ -1,3 +1,5 @@
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+
if (Sys.getenv("TSTTRGDIR") != "") {
.libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
@@ -81,4 +83,6 @@ print(res)
dbRemoveTable(con,tname)
stopifnot(identical(FALSE, dbExistsTable(con,tname)))
+cat("#~EndProfilingOutput~#\n", file=stderr())
+
print("SUCCESS")
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -1,6 +1,6 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
options(warn = -1)
-packages_required <- c("digest", "DBI")
+packages_required <- c("digest", "DBI", "devtools")
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
diff --git a/clients/R/Tests/deps-install.timeout
b/clients/R/Tests/deps-install.timeout
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/deps-install.timeout
@@ -0,0 +1,1 @@
+2
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,4 +1,4 @@
-packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","devtools","DBItest")
+packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","DBItest")
install_or_upgrade_packages <- function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
diff --git a/clients/R/Tests/deps-test.timeout
b/clients/R/Tests/deps-test.timeout
--- a/clients/R/Tests/deps-test.timeout
+++ b/clients/R/Tests/deps-test.timeout
@@ -1,1 +1,1 @@
-5
+20
diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R
--- a/clients/R/Tests/dplyr-flights.R
+++ b/clients/R/Tests/dplyr-flights.R
@@ -1,3 +1,5 @@
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+
ff <- textConnection("asdf", open="w")
# hide output from connect and attach since it would blow up the test output
# dangerous since it might hide useful warnings
@@ -118,5 +120,6 @@ so(flights %>%
) %>%
filter(arr > 30 | dep > 30))
+cat("#~EndProfilingOutput~#\n", file=stderr())
print("SUCCESS")
diff --git a/clients/R/Tests/dplyr-flights.stable.err
b/clients/R/Tests/dplyr-flights.stable.err
--- a/clients/R/Tests/dplyr-flights.stable.err
+++ b/clients/R/Tests/dplyr-flights.stable.err
@@ -30,7 +30,6 @@ stderr of test 'dplyr-flights` in direct
# 11:44:05 > "R" "--vanilla" "--slave" "--args" "30588"
# 11:44:05 >
-Identifier(s) "year", "month", "day", "hour", "minute" are reserved SQL
keywords and need(s) to be quoted in queries.
# 11:44:15 >
# 11:44:15 > "Done."
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -2,13 +2,7 @@ options(warn = -1)
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
-install_submodule_git <- function(x, ...) {
- install_dir <- tempfile()
- system(paste("git clone --recursive --depth 1", shQuote(x),
-shQuote(install_dir)))
- devtools::install(install_dir, ...)
-}
-install_submodule_git("https://github.com/hannesmuehleisen/MonetDBLite-R";)
+devtools::install_github("hannesmuehleisen/MonetDBLite-R")
cat("#~EndProfilingOutput~#\n", file=stderr())
cat("#~EndProfilingOutput~#\n", file=stdout())
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -204,7 +204,7 @@ showBar(int level, int64_t clk, char *st
nl = level/2-prevlevel/2;
if( level != 100 && (nl == 0 || level/2 <= prevlevel/2))
return;
- assert(MSGLEN < BUFSIZ);
+ static_assert(MSGLEN < BUFSIZ, "MSGLEN too small");
if(prevlevel == 0)
printf("[");
else
diff --git a/common/utils/mcrypt.c b/common/utils/mcrypt.c
--- a/common/utils/mcrypt.c
+++ b/common/utils/mcrypt.c
@@ -76,7 +76,7 @@ mcrypt_MD5Sum(const char *string, size_t
unsigned char md[MD5_DIGEST_LENGTH];
char *ret;
- assert(MD5_DIGEST_LENGTH == 16);
+ static_assert(MD5_DIGEST_LENGTH == 16, "MD5_DIGEST_LENGTH should be
16");
MD5_Init(&c);
MD5_Update(&c, string, len);
MD5_Final(md, &c);
@@ -114,7 +114,7 @@ mcrypt_SHA1Sum(const char *string, size_
unsigned char md[SHA_DIGEST_LENGTH];
char *ret;
- assert(SHA_DIGEST_LENGTH == 20);
+ static_assert(SHA_DIGEST_LENGTH == 20, "SHA_DIGEST_LENGTH should be
20");
SHA1_Init(&c);
SHA1_Update(&c, string, len);
SHA1_Final(md, &c);
@@ -152,7 +152,7 @@ mcrypt_SHA224Sum(const char *string, siz
unsigned char md[SHA224_DIGEST_LENGTH];
char *ret;
- assert(SHA224_DIGEST_LENGTH == 28);
+ static_assert(SHA224_DIGEST_LENGTH == 28, "SHA224_DIGEST_LENGTH should
be 28");
SHA224_Init(&c);
SHA224_Update(&c, string, len);
SHA224_Final(md, &c);
@@ -193,7 +193,7 @@ mcrypt_SHA256Sum(const char *string, siz
unsigned char md[SHA256_DIGEST_LENGTH];
char *ret;
- assert(SHA256_DIGEST_LENGTH == 32);
+ static_assert(SHA256_DIGEST_LENGTH == 32, "SHA256_DIGEST_LENGTH should
be 32");
SHA256_Init(&c);
SHA256_Update(&c, string, len);
SHA256_Final(md, &c);
@@ -236,7 +236,7 @@ mcrypt_SHA384Sum(const char *string, siz
unsigned char md[SHA384_DIGEST_LENGTH];
char *ret;
- assert(SHA384_DIGEST_LENGTH == 48);
+ static_assert(SHA384_DIGEST_LENGTH == 48, "SHA384_DIGEST_LENGTH should
be 48");
SHA384_Init(&c);
SHA384_Update(&c, string, len);
SHA384_Final(md, &c);
@@ -283,7 +283,7 @@ mcrypt_SHA512Sum(const char *string, siz
unsigned char md[SHA512_DIGEST_LENGTH];
char *ret;
- assert(SHA512_DIGEST_LENGTH == 64);
+ static_assert(SHA512_DIGEST_LENGTH == 64, "SHA512_DIGEST_LENGTH should
be 64");
SHA512_Init(&c);
SHA512_Update(&c, string, len);
SHA512_Final(md, &c);
@@ -335,7 +335,7 @@ mcrypt_RIPEMD160Sum(const char *string,
unsigned char md[RIPEMD160_DIGEST_LENGTH];
char *ret;
- assert(RIPEMD160_DIGEST_LENGTH == 20);
+ static_assert(RIPEMD160_DIGEST_LENGTH == 20, "RIPEMD160_DIGEST_LENGTH
should be 20");
RIPEMD160_Init(&c);
RIPEMD160_Update(&c, string, len);
RIPEMD160_Final(md, &c);
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2848,6 +2848,12 @@ typedef enum {
@%:@include <stdbool.h>
@%:@include <assert.h>
+@%:@ifndef static_assert
+/* static_assert is a C11 feature, defined in assert.h which also exists
+ * in many other compilers we ignore it if the compiler doesn't support it */
+@%:@define static_assert(expr, mesg) ((void) 0)
+@%:@endif
+
@%:@if defined(HAVE___INT128)
typedef __int128 hge;
typedef unsigned __int128 uhge;
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -443,18 +443,18 @@ GDKinit(opt *set, int setlen)
char buf[16];
/* some sanity checks (should also find if symbols are not defined) */
- assert(sizeof(char) == SIZEOF_CHAR);
- assert(sizeof(short) == SIZEOF_SHORT);
- assert(sizeof(int) == SIZEOF_INT);
- assert(sizeof(long) == SIZEOF_LONG);
- assert(sizeof(lng) == SIZEOF_LNG);
+ static_assert(sizeof(char) == SIZEOF_CHAR, "error in configure: bad
value for SIZEOF_CHAR");
+ static_assert(sizeof(short) == SIZEOF_SHORT, "error in configure: bad
value for SIZEOF_SHORT");
+ static_assert(sizeof(int) == SIZEOF_INT, "error in configure: bad value
for SIZEOF_INT");
+ static_assert(sizeof(long) == SIZEOF_LONG, "error in configure: bad
value for SIZEOF_LONG");
+ static_assert(sizeof(lng) == SIZEOF_LNG, "error in configure: bad value
for SIZEOF_LNG");
#ifdef HAVE_HGE
- assert(sizeof(hge) == SIZEOF_HGE);
+ static_assert(sizeof(hge) == SIZEOF_HGE, "error in configure: bad value
for SIZEOF_HGE");
#endif
- assert(sizeof(oid) == SIZEOF_OID);
- assert(sizeof(void *) == SIZEOF_VOID_P);
- assert(sizeof(size_t) == SIZEOF_SIZE_T);
- assert(SIZEOF_OID == SIZEOF_INT || SIZEOF_OID == SIZEOF_LNG);
+ static_assert(sizeof(oid) == SIZEOF_OID, "error in configure: bad value
for SIZEOF_OID");
+ static_assert(sizeof(void *) == SIZEOF_VOID_P, "error in configure: bad
value for SIZEOF_VOID_P");
+ static_assert(sizeof(size_t) == SIZEOF_SIZE_T, "error in configure: bad
value for SIZEOF_SIZE_T");
+ static_assert(SIZEOF_OID == SIZEOF_INT || SIZEOF_OID == SIZEOF_LNG,
"SIZEOF_OID should be equal to SIZEOF_INT or SIZEOF_LNG");
#ifdef NEED_MT_LOCK_INIT
MT_lock_init(&MT_system_lock,"MT_system_lock");
diff --git a/monetdb5/optimizer/opt_candidates.c
b/monetdb5/optimizer/opt_candidates.c
--- a/monetdb5/optimizer/opt_candidates.c
+++ b/monetdb5/optimizer/opt_candidates.c
@@ -82,11 +82,11 @@ OPTcandidatesImplementation(Client cntxt
//chkTypes(cntxt->usermodule, mb, FALSE);
//chkFlow(mb);
//chkDeclarations(mb);
- /* keep all actions taken as a post block comment */
+
+ /* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","candidates",usec);
- newComment(mb,buf);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT "
usec","candidates",usec);
+ newComment(mb,buf);
addtoMalBlkHistory(mb);
-
return MAL_SUCCEED;
}
diff --git a/monetdb5/optimizer/opt_macro.c b/monetdb5/optimizer/opt_macro.c
--- a/monetdb5/optimizer/opt_macro.c
+++ b/monetdb5/optimizer/opt_macro.c
@@ -510,7 +510,7 @@ str OPTmacro(Client cntxt, MalBlkPtr mb,
chkDeclarations(mb);
usec += GDKusec() - clk;
/* keep all actions taken as a post block comment */
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","macro",usec);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT " usec","macro",usec);
newComment(mb,buf);
addtoMalBlkHistory(mb);
if (mb->errors)
@@ -553,7 +553,7 @@ str OPTorcam(Client cntxt, MalBlkPtr mb,
usec += GDKusec() - clk;
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","orcam",usec);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT " usec","orcam",usec);
newComment(mb,buf);
addtoMalBlkHistory(mb);
if (mb->errors)
diff --git a/monetdb5/optimizer/opt_profiler.c
b/monetdb5/optimizer/opt_profiler.c
--- a/monetdb5/optimizer/opt_profiler.c
+++ b/monetdb5/optimizer/opt_profiler.c
@@ -110,11 +110,11 @@ OPTprofilerImplementation(Client cntxt,
//chkTypes(cntxt->usermodule, mb, FALSE);
//chkFlow(mb);
//chkDeclarations(mb);
- //
- /* keep all actions taken as a post block comment */
+
+ /* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","profiler", usec);
- newComment(mb,buf);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT " usec","profiler",
usec);
+ newComment(mb,buf);
addtoMalBlkHistory(mb);
return MAL_SUCCEED;
}
diff --git a/monetdb5/optimizer/opt_querylog.c
b/monetdb5/optimizer/opt_querylog.c
--- a/monetdb5/optimizer/opt_querylog.c
+++ b/monetdb5/optimizer/opt_querylog.c
@@ -195,10 +195,10 @@ OPTquerylogImplementation(Client cntxt,
chkFlow(mb);
chkDeclarations(mb);
}
- /* keep all actions taken as a post block comment */
+ /* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
- snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","querylog", usec);
- newComment(mb,buf);
+ snprintf(buf,256,"%-20s actions= 1 time=" LLFMT " usec","querylog",
usec);
+ newComment(mb,buf);
addtoMalBlkHistory(mb);
return msg;
}
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -1,3 +1,4 @@
+HAVE_JDBCTESTS?SQLcopyinto
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
