Changeset: ec5c89b4b05e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec5c89b4b05e
Added Files:
MacOSX/MonetDB_logo.png
clients/R/Tests/dplyr.timeout
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single
sql/test/BugTracker-2016/Tests/storagemodel.sql
sql/test/BugTracker-2016/Tests/storagemodel.stable.err
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Removed Files:
MacOSX/MonetDB logo.png
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
Modified Files:
MacOSX/MonetDB.pkgproj
clients/R/Tests/All
clients/R/Tests/dbapply.R
clients/R/Tests/dbi.R
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.stable.out
clients/R/Tests/dplyr.R
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_logger.c
gdk/gdk_tm.c
gdk/gdk_utils.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/bbp.c
monetdb5/optimizer/Tests/manifold2.stable.out.single
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Dependencies/Tests/Dependencies.stable.out
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (truncated from 19926 to 300 lines):
diff --git a/MacOSX/MonetDB.pkgproj b/MacOSX/MonetDB.pkgproj
--- a/MacOSX/MonetDB.pkgproj
+++ b/MacOSX/MonetDB.pkgproj
@@ -544,7 +544,7 @@
<key>BACKGROUND_PATH</key>
<dict>
<key>PATH</key>
- <string>MonetDB logo.png</string>
+ <string>MonetDB_logo.png</string>
<key>PATH_TYPE</key>
<integer>1</integer>
</dict>
diff --git a/MacOSX/MonetDB logo.png b/MacOSX/MonetDB_logo.png
rename from MacOSX/MonetDB logo.png
rename to MacOSX/MonetDB_logo.png
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -1,6 +1,6 @@
HAVE_LIBR?deps-install
+HAVE_LIBR?install
HAVE_LIBR?deps-test
-HAVE_LIBR?install
HAVE_LIBR?dbi
HAVE_LIBR?survey
HAVE_LIBR?dplyr
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,6 +1,5 @@
-ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
- ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
library(DBI, quietly = T)
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -1,6 +1,5 @@
-ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
- ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
library(DBI)
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
@@ -3,6 +3,9 @@ dir.create(unlist(strsplit(Sys.getenv("R
# autoinstall DBI and digest, we need those to install MonetDB.R
dd <- capture.output(suppressMessages(suppressWarnings({
- install.packages(c("devtools", "digest"),
repos="http://cran.rstudio.com/";, quiet=T)
+ repos <- "http://cran.rstudio.com/";
+ lp <- c("devtools", "digest")
+ install.packages(lp, repos=repos, quiet=T)
+ update.packages(repos=repos, ask=F, oldPkgs=lp)
devtools::install_github("rstats-db/DBI", quiet=T)
})))
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
@@ -5,6 +5,5 @@ dd <- capture.output(suppressMessages(su
repos <-
c('http://download.r-forge.r-project.org','http://cran.rstudio.com/')
if(length(np)) install.packages(np,repos=repos, quiet=T)
update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
- x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)})
})(c('Rcpp', 'dplyr','survey','sqlsurvey','Lahman','nycflights13'))
})))
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,6 +1,5 @@
-ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
- ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
ff <- textConnection("asdf", open="w")
# hide output from connect and attach since it would blow up the test output
diff --git a/clients/R/Tests/dplyr-flights.stable.out
b/clients/R/Tests/dplyr-flights.stable.out
--- a/clients/R/Tests/dplyr-flights.stable.out
+++ b/clients/R/Tests/dplyr-flights.stable.out
@@ -30,25 +30,25 @@ Ready.
# 11:44:05 >
[1] TRUE
-[1] 336776 16
-[1] 42 16
-[1] 42 16
-[1] 42 16
-[1] 42 16
-[1] 42 16
+[1] 336776 19
+[1] 42 19
+[1] 42 19
+[1] 42 19
+[1] 42 19
+[1] 42 19
[1] 42 3
[1] 42 3
-[1] 42 13
-[1] 42 1
[1] 42 16
[1] 42 1
+[1] 42 19
+[1] 42 1
[1] 42 2
-[1] 42 18
-[1] 42 18
+[1] 42 21
+[1] 42 21
[1] 42 2
[1] 1 1
-[1] 10 16
-[1] 42 16
+[1] 10 19
+[1] 42 19
[1] 42 3
[1] 42 4
[1] 42 4
diff --git a/clients/R/Tests/dplyr.R b/clients/R/Tests/dplyr.R
--- a/clients/R/Tests/dplyr.R
+++ b/clients/R/Tests/dplyr.R
@@ -1,6 +1,5 @@
-ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
- ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
ff <- textConnection("asdf", open="w")
# hide output from connect and attach since it would blow up the test output
diff --git a/clients/R/Tests/dplyr.timeout b/clients/R/Tests/dplyr.timeout
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/dplyr.timeout
@@ -0,0 +1,1 @@
+2
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -188,7 +188,7 @@ int BBPincref(bat b, int logical);
bat BBPindex(const char *nme);
void BBPkeepref(bat i);
bat BBPlimit;
-void BBPlock(const char *s);
+void BBPlock(void);
str BBPlogical(bat b, str buf);
int BBPout;
str BBPphysical(bat b, str buf);
@@ -199,7 +199,7 @@ void BBPresetfarms(void);
gdk_return BBPsave(BAT *b);
void BBPshare(bat b);
gdk_return BBPsync(int cnt, bat *subcommit);
-void BBPunlock(const char *s);
+void BBPunlock(void);
gdk_return BUNappend(BAT *b, const void *right, bit force);
gdk_return BUNdelete(BAT *b, oid o);
BUN BUNfnd(BAT *b, const void *right);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1764,11 +1764,11 @@ gdk_export int BBPcurstamp(void);
#define BBPRENAME_ILLEGAL (-2)
#define BBPRENAME_LONG (-3)
-gdk_export void BBPlock(const char *s);
+gdk_export void BBPlock(void);
gdk_export void BBPhot(bat b);
gdk_export void BBPcold(bat b);
-gdk_export void BBPunlock(const char *s);
+gdk_export void BBPunlock(void);
gdk_export str BBPlogical(bat b, str buf);
gdk_export str BBPphysical(bat b, str buf);
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -262,12 +262,11 @@ static int BBPunloadCnt = 0;
static MT_Lock GDKunloadLock MT_LOCK_INITIALIZER("GDKunloadLock");
void
-BBPlock(const char *nme)
+BBPlock(void)
{
int i;
/* wait for all pending unloads to finish */
- (void) nme;
MT_lock_set(&GDKunloadLock);
while (BBPunloadCnt > 0) {
MT_lock_unset(&GDKunloadLock);
@@ -288,11 +287,10 @@ BBPlock(const char *nme)
}
void
-BBPunlock(const char *nme)
+BBPunlock(void)
{
int i;
- (void) nme;
for (i = BBP_BATMASK; i >= 0; i--)
MT_lock_unset(&GDKswapLock(i));
for (i = BBP_THREADMASK; i >= 0; i--)
@@ -1297,7 +1295,7 @@ void
BBPresetfarms(void)
{
BBPexit();
- BBPunlock("BBPexit");
+ BBPunlock();
BBPsize = 0;
if (BBPfarms[0].dirname != NULL) {
GDKfree((void*) BBPfarms[0].dirname);
@@ -1434,7 +1432,7 @@ BBPexit(void)
bat i;
int skipped;
- BBPlock("BBPexit"); /* stop all threads ever touching more
descriptors */
+ BBPlock(); /* stop all threads ever touching more descriptors */
/* free all memory (just for leak-checking in Purify) */
do {
@@ -1448,8 +1446,13 @@ BBPexit(void)
skipped = 1;
continue;
}
- /* NIELS ?? Why reduce share count,
it's done in VIEWdestroy !!
if (isVIEW(b)) {
+ /* "manually"
+ * decrement parent
+ * references, since
+ * VIEWdestroy doesn't
+ * (and can't here due
+ * to locks) do it */
bat hp = VIEWhparent(b), tp =
VIEWtparent(b);
bat vhp = VIEWvhparent(b), vtp
= VIEWvtparent(b);
if (hp) {
@@ -1468,11 +1471,10 @@ BBPexit(void)
BBP_cache(vtp)->batSharecnt--;
--BBP_lrefs(vtp);
}
- }*/
- if (isVIEW(b))
VIEWdestroy(b);
- else
+ } else {
BATfree(b);
+ }
}
BBPuncacheit(i, TRUE);
if (BBP_logical(i) != BBP_bak(i))
@@ -1623,7 +1625,11 @@ BBPdir_subcommit(int cnt, bat *subcommit
char *p;
int n;
+#ifndef NDEBUG
assert(subcommit != NULL);
+ for (n = 2; n < cnt; n++)
+ assert(subcommit[n - 1] < subcommit[n]);
+#endif
if ((nbbpf = GDKfilelocate(0, "BBP", "w", "dir")) == NULL)
return GDK_FAIL;
@@ -4270,7 +4276,7 @@ BBPatom_drop(int atom)
const char *nme = ATOMname(atom);
int unknown = ATOMunknown_add(nme);
- BBPlock("BBPatom_drop");
+ BBPlock();
for (i = 0; i < (bat) ATOMIC_GET(BBPsize, BBPsizeLock); i++) {
if (BBPvalid(i)) {
BATstore *b = BBP_desc(i);
@@ -4284,7 +4290,7 @@ BBPatom_drop(int atom)
b->B.ttype = unknown;
}
}
- BBPunlock("BBPatom_drop");
+ BBPunlock();
}
void
@@ -4293,7 +4299,7 @@ BBPatom_load(int atom)
const char *nme;
int i, unknown;
- BBPlock("BBPatom_load");
+ BBPlock();
nme = ATOMname(atom);
unknown = ATOMunknown_find(nme);
ATOMunknown_del(unknown);
@@ -4310,7 +4316,7 @@ BBPatom_load(int atom)
b->B.ttype = atom;
}
}
- BBPunlock("BBPatom_load");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
