Changeset: 7ceca719d7d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ceca719d7d5
Modified Files:
clients/R/Tests/dbi.R
clients/nodejs/monetdb/mapiclient.js
gdk/gdk_bbp.c
sql/backends/monet5/sql_scenario.c
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (132 lines):
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
@@ -90,15 +90,15 @@ dbRemoveTable(con,tname)
stopifnot(identical(dbExistsTable(con,tname),FALSE))
# test csv import
-file <- tempfile()
-write.table(iris,file,sep=",",row.names=FALSE)
+tf <- tempfile()
+write.table(iris,tf,sep=",",row.names=FALSE)
tname2 <- "Need to quote this table name"
-monetdb.read.csv(con,file,tname)
-monetdb.read.csv(con,file,tname2)
+monetdb.read.csv(con,tf,tname)
+monetdb.read.csv(con,tf,tname2)
###
dbListTables(con)
-unlink(file)
+unlink(tf)
stopifnot(identical(dbExistsTable(con,tname),TRUE))
stopifnot(identical(dbExistsTable(con,tname2),TRUE))
iris3 <- dbReadTable(con,tname)
diff --git a/clients/nodejs/monetdb/mapiclient.js
b/clients/nodejs/monetdb/mapiclient.js
--- a/clients/nodejs/monetdb/mapiclient.js
+++ b/clients/nodejs/monetdb/mapiclient.js
@@ -34,7 +34,7 @@ function MonetDBConnection(options, conn
});
/* some setup */
this.request('Xreply_size -1', undefined, true);
- this.request('Xauto_commit 1', undefined, true);
+ if (!options.autocommit) this.request('Xauto_commit 0', undefined,
true);
/* get server environment into connector */
this.request('SELECT * FROM env()', function(err, resp) {
if (err) {
@@ -497,7 +497,7 @@ function __get_connect_args(options) {
__check_arg(options, 'language', 'string' , 'sql');
__check_arg(options, 'debug' , 'boolean' , false);
__check_arg(options, 'q' , 'function', undefined);
-
+ __check_arg(options, 'autocommit', 'boolean', true);
return options;
}
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -952,7 +952,6 @@ BBPheader(FILE *fp, oid *BBPoid, int *OI
exit(1);
}
if (bbpversion != GDKLIBRARY &&
- bbpversion != GDKLIBRARY_INET_COMPARE &&
bbpversion != GDKLIBRARY_64_BIT_INT) {
GDKfatal("BBPinit: incompatible BBP version: expected 0%o, got
0%o.", GDKLIBRARY, bbpversion);
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -411,12 +411,14 @@ SQLinitClient(Client c)
backend *be;
bstream *bfd = NULL;
stream *fd = NULL;
+ static int maybeupgrade = 1;
#ifdef _SQL_SCENARIO_DEBUG
mnstr_printf(GDKout, "#SQLinitClient\n");
#endif
if (SQLinitialized == 0 && (msg = SQLprelude(NULL)) != MAL_SUCCEED)
return msg;
+ MT_lock_set(&sql_contextLock, "SQLinitClient");
/*
* Based on the initialization return value we can prepare a SQLinit
* string with all information needed to initialize the catalog
@@ -478,6 +480,7 @@ SQLinitClient(Client c)
str fullname;
SQLnewcatalog = 0;
+ maybeupgrade = 0;
snprintf(path, PATHLENGTH, "createdb");
slash_2_dir_sep(path);
fullname = MSP_locate_sqlscript(path, 1);
@@ -524,8 +527,11 @@ SQLinitClient(Client c)
} else { /* handle upgrades */
if (!m->sa)
m->sa = sa_create();
- SQLupgrades(c,m);
+ if (maybeupgrade)
+ SQLupgrades(c,m);
+ maybeupgrade = 0;
}
+ MT_lock_unset(&sql_contextLock, "SQLinitClient");
fflush(stdout);
fflush(stderr);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3525,6 +3525,8 @@ def main(argv) :
'use multiple dbfarms (developers only)'),
('nomito', None, 'nomito', None,
'Do not pass --forcemito to server'),
+ ('jenkins', None, 'jenkins', None,
+ 'special handling for Jenkins'),
]
if THISFILE == 'Mtest.py':
@@ -3604,6 +3606,7 @@ def main(argv) :
releaserun = opts.get('releaserun', releaserun)
nomito = opts.get('nomito', False)
CONDITIONALS['RELEASERUN'] = releaserun
+ jenkins = False
if THISFILE == "Mtest.py":
_IGNORE = dftIGNORE
par['IGNORE'] = opts.get('ignore', _IGNORE)
@@ -3645,6 +3648,7 @@ def main(argv) :
a = opts.get('multifarm')
if a is not None:
env['MULTIFARM'] = 'True'
+ jenkins = opts.get('jenkins', False)
if THISFILE == 'Mapprove.py':
a = opts.get('ext')
if a is None:
@@ -4266,6 +4270,8 @@ VALUES (%s, '%s', '%s', '%s',
After that, re-run Mtest.
""" % os.path.join(TSTTRGBASE, TSTPREF, "index.html")
+ if jenkins:
+ sys.exit(0)
sys.exit(1)
else:
if quiet:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
