Changeset: 9c558efac4b1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9c558efac4b1
Modified Files:
gdk/gdk_bbp.c
testing/Mtest.py.in
tools/mserver/mserver5.1.in
Branch: default
Log Message:
Changed --dbextra=:inmemory to --dbextra=:memory:.
diffs (63 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1137,7 +1137,7 @@ BBPaddfarm(const char *dirname, uint32_t
GDKerror("bad rolemask\n");
return GDK_FAIL;
}
- if (strcmp(dirname, ":inmemory") == 0) {
+ if (strcmp(dirname, ":memory:") == 0) {
dirname = NULL;
} else if (mkdir(dirname, MONETDB_DIRMODE) < 0) {
if (errno == EEXIST) {
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1358,7 +1358,7 @@ def PerformDir(env, testdir, testlist, B
ignore_errors = True)
os.makedirs(os.path.join(env['GDK_DBFARM'],
TSTPREF + '_transient'))
elif env.get('TRANS_INMEM'):
- cmd.append('--dbextra=:inmemory')
+ cmd.append('--dbextra=:memory:')
pSrvr = ServerClass(cmd,
open(os.path.join(TSTTRGDIR,
'SingleServer.out'), 'a'),
open(os.path.join(TSTTRGDIR,
'SingleServer.err'), 'a'),
@@ -1738,7 +1738,7 @@ def GetBitsAndModsAndThreads(env) :
ignore_errors = True)
os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
elif env.get('TRANS_INMEM'):
- cmd.append('--dbextra=:inmemory')
+ cmd.append('--dbextra=:memory:')
if procdebug:
print('GetBitsAndModsAndThreads: starting process "%s" (inpipe,
outpipe, errpipe)\n' % '" "'.join(cmd))
setpgrp = True
@@ -3117,7 +3117,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
ignore_errors = True)
os.makedirs(os.path.join(env['GDK_DBFARM'], TSTDB +
'_transient'))
elif env.get('TRANS_INMEM'):
- Srvr.append('--dbextra=:inmemory')
+ Srvr.append('--dbextra=:memory:')
if os.path.isfile(TST + '.options5'):
Srvr.extend(openutf8(TST + '.options5').read().split())
lang=""
@@ -3165,7 +3165,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
ignore_errors = True)
os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF +
'_transient'))
elif env.get('TRANS_INMEM'):
- Srvr.append('--dbextra=:inmemory')
+ Srvr.append('--dbextra=:memory:')
pSrvr = ServerClass(Srvr, SrvrOut, SrvrErr, TIMEOUT,
os.path.join(dbpath, '.started'), int(env['MAPIPORT']))
pSrvr.LaunchIt()
if savepath is not None:
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -72,7 +72,7 @@ option.
If the value of
.I path
is
-.BR :inmemory ,
+.BR :memory: ,
transient data is not stored on disk at all but kept in memory at all
times.
.TP
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
