Changeset: 65c4c37316f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65c4c37316f2
Modified Files:
monetdb5/ChangeLog
testing/Mconvert.py.in
testing/Mz.py.in
Branch: default
Log Message:
The option to keep transients away from the disk is --dbextra=:memory:.
diffs (80 lines):
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -2,6 +2,6 @@
# This file is updated with Maddlog
* Wed Sep 9 2020 Sjoerd Mullender <sjo...@acm.org>
-- By using the option "--dbextra=:inmemory", mserver5 can be instructed
+- By using the option "--dbextra=:memory:", mserver5 can be instructed
to keep transient BATs completely in memory.
diff --git a/testing/Mconvert.py.in b/testing/Mconvert.py.in
--- a/testing/Mconvert.py.in
+++ b/testing/Mconvert.py.in
@@ -881,7 +881,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
@@ -1798,7 +1798,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=""
@@ -1848,7 +1848,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/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -843,7 +843,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
@@ -1607,7 +1607,7 @@ def create_mserver5(dbpath, timeout=0, e
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:')
return ServerClass(cmd,
outfile,
errfile,
@@ -1720,7 +1720,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=""
@@ -1770,7 +1770,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:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
