date:20171221

MonetDB: default - It now also really calls sql_remove_environme...

2017-12-21 Thread Martin van Dinther

Changeset: 97692de4df91 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97692de4df91
Modified Files:
sql/backends/monet5/sql_upgrades.c
Branch: default
Log Message:

It now also really calls sql_remove_environment_func() when the 
sys.environment() function exists.


diffs (52 lines):

diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1036,25 +1036,32 @@ sql_update_default_geom(Client c, mvc *s
 }
 
 static str
-sql_remove_environment_func(Client c)
+sql_remove_environment_func(Client c, mvc *sql)
 {
+   sql_schema *s = NULL;
+   sql_table *t = NULL;
size_t bufsize = 1000, pos = 0;
char *buf = GDKmalloc(bufsize), *err = NULL;
if (buf== NULL)
throw(SQL, "sql_remove_environment_func", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
 
+   /* because issueing sql: "drop view sys.environment cascade;" fails 
with with error: !SQLException:sql.drop_view:42000!DROP VIEW: cannot drop 
system view 'environment'
+  we need to drop the system view using internal function: 
mvc_drop_table() */
+   s = mvc_bind_schema(sql, "sys");
+   t = mvc_bind_table(sql, s, "environment");
+   mvc_drop_table(sql, s, t, 1);   // drop the system view: 
sys.environment cascade
+
pos += snprintf(buf + pos, bufsize - pos,
-   "drop view sys.environment cascade;\n"
-   "drop function sys.environment() cascade\n"
+   "drop function sys.environment() cascade;\n"
"create view sys.environment as select * from 
sys.env();\n"
"GRANT SELECT ON sys.environment TO PUBLIC;\n"
-   "update sys._tables set system = true where name = 
'environment' and schema_id in (select id from schemas where name = 'sys');\n");
+   "update sys._tables set system = true where system = 
false and name = 'environment' and schema_id in (select id from schemas where 
name = 'sys');\n");
 
pos += snprintf(buf + pos, bufsize - pos,
"delete from sys.systemfunctions where function_id not 
in (select id from sys.functions);\n");
 
assert(pos < bufsize);
-   printf("Running database upgrade commands:\n%s\n", buf);
+   printf("Running database upgrade commands:\ndrop view sys.environment 
cascade;\n%s\n", buf);
err = SQLstatementIntern(c, &buf, "update", 1, 0, NULL);
GDKfree(buf);
return err; /* usually MAL_SUCCEED */
@@ -1176,8 +1183,8 @@ SQLupgrades(Client c, mvc *m)
}
}
 
-   if (sql_bind_func(m->sa, s, "environment", NULL, NULL, F_FUNC)) {
-   if ((err = sql_remove_environment_func(c)) != NULL) {
+   if (sql_bind_func_(m->sa, s, "environment", NULL, F_UNION)) {
+   if ((err = sql_remove_environment_func(c, m)) != NULL) {
fprintf(stderr, "!%s\n", err);
freeException(err);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: mtestplusplus - Added --parallel mode to mtest.

2017-12-21 Thread Mark Raasveldt

Changeset: 3c06b3f71fe6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c06b3f71fe6
Modified Files:
testing/Mtest.py.in
testing/process.py
Branch: mtestplusplus
Log Message:

Added --parallel mode to mtest.


diffs (170 lines):

diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -37,6 +37,7 @@ procdebug = False
 verbose = False
 quiet = False
 fast_mode = False
+parallel_mode = False
 
 releaserun = False
 
@@ -1207,6 +1208,34 @@ def find_test_dirs(thisdir) :
 return testdirs
 ### find_test_dirs(thisdir) #
 
+def perform_dir(tpl):
+d = tpl[0]
+fid = tpl[1]
+env = tpl[2]
+BusyPorts = tpl[3]
+body_good = []
+body_bad = []
+t, elem, diff, interrupted = PerformDir(env, d, [], BusyPorts, True)
+#t_ = t_ + t
+if elem is not None:
+if diff <= F_OK:
+body_good.append(elem)
+else:
+body_bad.append(elem)
+if interrupted:
+return
+if global_timeout and start_time + global_timeout < time.time():
+print('\nGlobal testing timeout reached\n')
+return
+if not testweb:
+# after a directory has been tested, create
+# the index file so that we can look at test
+# results while the tests are running
+env['TSTDIR'] = ""
+env['TSTTRGDIR'] = os.path.join(TSTTRGBASE, TSTPREF)
+body = body_bad + body_good
+CreateHtmlIndex(env, *body)
+
 def PerformDir(env, testdir, testlist, BusyPorts, all_tests = False) :
 interrupted = False
 td = 0
@@ -2407,7 +2436,7 @@ def RunTest(env, TST, BusyPorts, COND, o
 cmd = ['diff']
 if ACCURACYout >= 0:
 cmd.append('-d')
-cmd.extend(['-Bb', '-F^#', '-I%s' % par['IGNORE'],
+cmd.extend(['-B', '-b', '-F^#', '-I%s' % par['IGNORE'],
 '-U%s' % par['CONTEXT'],
 '%s%s.FILTERED' % (TST, STABLEout),
 '%s.test.out.FILTERED' % TST])
@@ -2712,7 +2741,7 @@ def killProc(proc, outfile = None, cmd =
 except OSError:
 pass
 
-def LaunchIt(cmd, TestInput, TestOut, TestErr, TimeOut, RunningServer, SrvrOut 
= None) :
+def LaunchIt(cmd, TestInput, TestOut, TestErr, TimeOut, RunningServer, 
ServerType, SrvrOut = None) :
 global setpgrp
 if not SrvrOut:
 SrvrOut = process.PIPE
@@ -2725,7 +2754,7 @@ def LaunchIt(cmd, TestInput, TestOut, Te
 if procdebug:
 print('LaunchIt: starting process "%s" (inpipe)\n' % '" "'.join(cmd))
 setpgrp = True
-if 'SERVER_PROCESS' not in RunningServer or RunningServer['CONFIG'] != cmd 
or RunningServer['SERVER_PROCESS'].killed or 
RunningServer['SERVER_PROCESS'].stdin.closed:
+if ServerType == "MAL" or 'SERVER_PROCESS' not in RunningServer or 
RunningServer['CONFIG'] != cmd or RunningServer['SERVER_PROCESS'].killed or 
RunningServer['SERVER_PROCESS'].stdin.closed:
 # launch a new server, configuration changed
 if 'SERVER_PROCESS' in RunningServer and not 
RunningServer['SERVER_PROCESS'].killed:
 # if there is a running server, kill it
@@ -2741,9 +2770,9 @@ def LaunchIt(cmd, TestInput, TestOut, Te
 proc.stderr = TestErr
 
 # maybe buffer output as it comes to avoid deadlock
-if SrvrOut == process.PIPE:
+if SrvrOut == process.PIPE and not isinstance(proc.stdout, 
process._BufferedPipe):
 proc.stdout = process._BufferedPipe(proc.stdout)
-if TestErr == process.PIPE:
+if TestErr == process.PIPE and not isinstance(proc.stderr, 
process._BufferedPipe):
 proc.stderr = process._BufferedPipe(proc.stderr)
 proc.killed = False
 t = Timer(TimeOut, killProc, args = [proc, TestErr, cmd])
@@ -2936,7 +2965,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
 # enable Python integration in server
 Srvr.extend(['--set', 'embedded_py=true'])
 
-pSrvr, pSrvrTimer = LaunchIt(Srvr, 
'\nio.printf("\\nReady.\\n");\n', SrvrOut, SrvrErr, TIMEOUT, RUNNING_SERVER)
+pSrvr, pSrvrTimer = LaunchIt(Srvr, 
'\nio.printf("\\nReady.\\n");\n', SrvrOut, SrvrErr, TIMEOUT, RUNNING_SERVER, 
SERVER)
 
 
 ln="dummy"
@@ -3120,9 +3149,6 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
 else:
 CollectIt(pSrvr.stdout, SrvrOut, False)
 
-
-
-
 pSrvrTimer.cancel()
 if procdebug:
 print('DoIt: process exited "%s" (%s)\n' % ('" "'.join(Srvr), 
pSrvr.returncode))
@@ -4359,27 +4385,23 @@ def main(argv) :
 else:
 if verbose:
 print("\nRunning all tests in directories %s.\n" % 
str(testdirs))
-for d in testdirs:
-t, elem, diff, interrupted = PerformDir(env, d, [], 
BusyPorts, True)
-t_ = t_ + t
-if elem is not None:
-if diff <= F_OK:
-

MonetDB: default - make sure we can startup (ie disable to much ...

2017-12-21 Thread Niels Nes

Changeset: c8d1ed665259 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8d1ed665259
Modified Files:
monetdb5/optimizer/opt_wrapper.c
Branch: default
Log Message:

make sure we can startup (ie disable to much debug output).


diffs (24 lines):

diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -104,8 +104,8 @@ str OPTwrapper (Client cntxt, MalBlkPtr 
str msg = MAL_SUCCEED;
lng clk;
 
-if (cntxt->mode == FINISHCLIENT)
-throw(MAL, "optimizer", "prematurely stopped client");
+   if (cntxt->mode == FINISHCLIENT)
+   throw(MAL, "optimizer", "prematurely stopped client");
 
if( p == NULL)
throw(MAL, "opt_wrapper", "missing optimizer statement");
@@ -154,8 +154,7 @@ str OPTwrapper (Client cntxt, MalBlkPtr 
if (codes[i].nme == 0)
throw(MAL, optimizer, "Optimizer implementation '%s' missing", 
fcnnme);
 
-   //OPTIMIZERDEBUG {
-   {
+   OPTIMIZERDEBUG {
fprintf(stderr,"=FINISHED %s  %d\n",optimizer, actions);
fprintFunction(stderr,mb,0,LIST_MAL_DEBUG );
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: mtestplusplus - Add --fast mode to Mtest.py, keep serve...

2017-12-21 Thread Mark Raasveldt

Changeset: f0d1b166367c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0d1b166367c
Modified Files:
testing/Mtest.py.in
testing/process.py
Branch: mtestplusplus
Log Message:

Add --fast mode to Mtest.py, keep server open between different test runs.


diffs (189 lines):

diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -36,6 +36,7 @@ import glob
 procdebug = False
 verbose = False
 quiet = False
+fast_mode = False
 
 releaserun = False
 
@@ -1313,10 +1314,11 @@ def PerformDir(env, testdir, testlist, B
 if not verbose and not quiet:
 print('\nRunning in %s' % TSTDIR)
 alllinks = []
+RUNNING_SERVER = {}
 try:
 for TST,COND in testlist:
 os.environ['TST'] = TST
-tt, FtOut, FtErr, bodyline, reason, links = RunTest(env, TST, 
BusyPorts, COND, oktests, length, all_tests)
+tt, FtOut, FtErr, bodyline, reason, links = RunTest(env, TST, 
BusyPorts, COND, oktests, length, all_tests, RUNNING_SERVER)
 alllinks.extend(links)
 if tt:
 t = "%7.3f" % tt
@@ -1639,7 +1641,7 @@ def returnCode(proc, f = None):
 f.write('\nInterrupt\n')
 f.flush()
 return 'interrupt'  # Interrupt
-if proc.returncode < 0:
+if proc.returncode < 0 and proc.returncode:
 if f is not None:
 f.write('\nSignal %d\n' % -proc.returncode)
 f.flush()
@@ -1859,7 +1861,7 @@ def CategorizeResult(TST, SockTime):
 e = SockTime
 return o, e
 
-def RunTest(env, TST, BusyPorts, COND, oktests, length, all_tests) :
+def RunTest(env, TST, BusyPorts, COND, oktests, length, all_tests, 
RUNNING_SERVER) :
 global setpgrp
 Failed = F_SKIP
 FailedOut = F_SKIP
@@ -2187,7 +2189,7 @@ def RunTest(env, TST, BusyPorts, COND, o
 TestErr.close()
 
 t0 = time.time()
-tres = DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, 
TestErrFile, STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito, 
threads, COND, all_tests)
+tres = DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, 
TestErrFile, STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito, 
threads, COND, all_tests, RUNNING_SERVER)
 if tres == 'segfault':
 # rename core file, if any -- might have to check
 # /proc/sys/kernel/core_pattern in the future but hopefully
@@ -2710,7 +2712,7 @@ def killProc(proc, outfile = None, cmd =
 except OSError:
 pass
 
-def LaunchIt(cmd, TestInput, TestOut, TestErr, TimeOut, SrvrOut = None) :
+def LaunchIt(cmd, TestInput, TestOut, TestErr, TimeOut, RunningServer, SrvrOut 
= None) :
 global setpgrp
 if not SrvrOut:
 SrvrOut = process.PIPE
@@ -2723,8 +2725,21 @@ def LaunchIt(cmd, TestInput, TestOut, Te
 if procdebug:
 print('LaunchIt: starting process "%s" (inpipe)\n' % '" "'.join(cmd))
 setpgrp = True
-proc = process.Popen(cmd, stdin = process.PIPE, stdout = SrvrOut,
+if 'SERVER_PROCESS' not in RunningServer or RunningServer['CONFIG'] != cmd 
or RunningServer['SERVER_PROCESS'].killed or 
RunningServer['SERVER_PROCESS'].stdin.closed:
+# launch a new server, configuration changed
+if 'SERVER_PROCESS' in RunningServer and not 
RunningServer['SERVER_PROCESS'].killed:
+# if there is a running server, kill it
+killProc(RunningServer['SERVER_PROCESS'])
+proc = process.Popen(cmd, stdin = process.PIPE, stdout = SrvrOut,
  stderr = TestErr, universal_newlines = True)
+if fast_mode:
+# for fast mode, keep the server cached and don't kill it
+RunningServer['CONFIG'] = cmd
+RunningServer['SERVER_PROCESS'] = proc
+else:
+proc = RunningServer['SERVER_PROCESS']
+proc.stderr = TestErr
+
 # maybe buffer output as it comes to avoid deadlock
 if SrvrOut == process.PIPE:
 proc.stdout = process._BufferedPipe(proc.stdout)
@@ -2744,10 +2759,10 @@ def LaunchIt(cmd, TestInput, TestOut, Te
 return proc, t
 ### LaunchIt(cmd, TestIn, TestOut, TestErr, TimeOut, SrvrOut) #
 
-def CollectIt(pOut, TestOut) :
+def CollectIt(pOut, TestOut, blocking=True) :
 if pOut:
 while True:
-buf = pOut.read(8192)
+buf = pOut.read(8192, blocking)
 if not buf:
 break
 TestOut.write(buf)
@@ -2816,7 +2831,7 @@ def mapi_ping(port,lang) :
 return False
 ### mapi_ping() #
 
-def DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile, 
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito, threads, COND, 
all_tests) :
+def DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile, 
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito, threads, COND, 
all_tests, R

MonetDB: Jul2017 - Approve output

2017-12-21 Thread Martin van Dinther

Changeset: 0bf5cc770dbe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0bf5cc770dbe
Modified Files:
sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.out
Branch: Jul2017
Log Message:

Approve output


diffs (127 lines):

diff --git a/sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.out 
b/sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.out
--- a/sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.out
+++ b/sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.out
@@ -78,16 +78,18 @@ Ready.
 #where (true)
 #  or ((select pc from sys.tracelog)
 #   is not NULL);
-% .L23 # table_name
+% sys.L15 # table_name
 % c2 # name
 % varchar # type
 % 98 # length
 [ "+proj=longlat +ellps=bessel 
+towgs84=595.48,121.69,515.35,4.115,-2.9383,0.853,-3.408 +no_defs"  ]
 [ "+proj=longlat +ellps=aust_SA +no_defs"  ]
 [ "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs" ]
+[ "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs" ]
 [ "+proj=longlat +ellps=bessel +towgs84=682,-203,480,0,0,0,0 +no_defs" ]
 [ "+proj=longlat +ellps=airy +no_defs" ]
 [ "+proj=longlat +ellps=mod_airy +no_defs" ]
+[ "+proj=longlat +ellps=aust_SA +no_defs"  ]
 [ "+proj=longlat +ellps=bessel +no_defs"   ]
 [ "+proj=longlat +a=6377492.018 +b=6356173.508712696 +no_defs" ]
 [ "+proj=longlat +ellps=bess_nam +no_defs" ]
@@ -106,12 +108,14 @@ Ready.
 [ "+proj=longlat +ellps=helmert +no_defs"  ]
 [ "+proj=longlat +a=6378160 +b=6356774.50408554 +no_defs"  ]
 [ "+proj=longlat +ellps=intl +no_defs" ]
+[ "+proj=longlat +ellps=GRS80 +no_defs"]
 [ "+proj=longlat +ellps=krass +no_defs"]
 [ "+proj=longlat +ellps=WGS66 +no_defs"]
 [ "+proj=longlat +a=6376523 +b=6355862.933255573 +no_defs" ]
 [ "+proj=longlat +a=6378298.3 +b=6356657.142669561 +no_defs"   ]
 [ "+proj=longlat +a=6378300 +b=6356751.689189189 +no_defs" ]
 [ "+proj=longlat +ellps=WGS84 +no_defs"]
+[ "+proj=longlat +ellps=WGS84 +no_defs"]
 [ "+proj=longlat +a=6378136.2 +b=6356751.516927429 +no_defs"   ]
 [ "+proj=longlat +a=6378136.3 +b=6356751.616592146 +no_defs"   ]
 [ "+proj=longlat +a=6378249.144808011 +b=6356514.966204134 +no_defs"   ]
@@ -122,23 +126,35 @@ Ready.
 [ "+proj=longlat +ellps=WGS72 +no_defs"]
 [ "+proj=longlat +a=6377301.243 +b=6356100.230165384 +no_defs" ]
 [ "+proj=longlat +a=6377299.151 +b=6356098.145120132 +no_defs" ]
+[ "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs" ]
 [ "+proj=longlat +a=6371007 +b=6371007 +no_defs"   ]
 [ "+proj=longlat +a=6370997 +b=6370997 +no_defs"   ]
 [ "+proj=longlat +a=6371228 +b=6371228 +no_defs"   ]
 [ "+proj=longlat +a=6378273 +b=6356889.449 +no_defs"   ]
 [ "+proj=longlat +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +no_defs"
]
+[ "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs" ]
+[ "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs" ]
+[ "+proj=longlat +ellps=bessel +no_defs"   ]
 [ "+proj=longlat +ellps=GRS80 +towgs84=-199.87,74.79,246.62,0,0,0,0 +no_defs"  
]
+[ "+proj=longlat +a=6378135 +b=6356750.304921594 +no_defs" ]
 [ "+proj=longlat +ellps=intl 
+towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +no_defs"  ]
 [ "+proj=longlat +ellps=bessel +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 
+no_defs"   ]
 [ "+proj=longlat +ellps=bessel +towgs84=-404.78,685.68,45.47,0,0,0,0 +no_defs" 
]
+[ "+proj=longlat +ellps=GRS80 +no_defs"]
 [ "+proj=longlat +ellps=clrk66 
+towgs84=219.315,168.975,-166.145,0.198,5.926,-2.356,-57.104 +no_defs"  ]
+[ "+proj=longlat +ellps=clrk66 +no_defs"   ]
+[ "+proj=longlat +ellps=clrk66 +no_defs"   ]
 [ "+proj=longlat +ellps=WGS84 +towgs84=0,0,0,-0,-0,-0,0 +no_defs"  ]
 [ "+proj=longlat +a=6377276.345 +b=6356075.41314024 
+towgs84=198,881,317,0,0,0,0 +no_defs" ]
 [ "+proj=longlat +ellps=clrk80 +towgs84=-239.1,-170.02,397.5,0,0,0,0 +no_defs" 
]
 [ "+proj=longlat +ellps=GRS80 
+towgs84=0.055,-0.541,-0.185,0.0183,-0.0003,-0.007,-0.014 +no_defs"  ]
 [ "+proj=longlat +ellps=clrk80 
+towgs84=-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.7101 +no_defs" ]
 [ "+proj=longlat +ellps=clrk66 +towgs84=61,-285,-181,0,0,0,0 +no_defs" ]
+[ "+proj=longlat +ellps=clrk66 +no_defs"   ]
+[ "+proj=longlat +ellps=clrk66 +no_defs"   ]
+[ "+proj=longlat +ellps=clrk66 +no_defs"   ]
 [ "+proj=longlat +ellps=clrk66 +towgs84=11,72,-101,0,0,0,0 +no_defs"   ]
+[ "+proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs" ]
 [ "+proj=longlat +ellps=GRS80 +towgs84=-48,55,52,0,0,0,0 +no_defs" ]
 [ "+proj=longlat +ellps=clrk80 +towgs84=-125,53,467,0,0,0,0 +no_defs"  ]
 [ "+proj=longlat +ellps=clrk80 +towgs84=-124.76,53,466.79,0,0,0,0 +no_defs"
]
@@ -149,30 +165,52 @@ Ready.
 [ "+proj=longlat +ellps=WGS84 +towgs84=0,0,0,0,0,0,0 +no_defs" ]
 [ "+proj=longlat +ellps=bessel +towgs84=674.4,15.1,405.3,0,0,0,0 +no_defs" 
]
 [ "+proj=longlat +ellps=bess

MonetDB: Jul2017 - Approve outputs

2017-12-21 Thread Martin van Dinther

Changeset: eff1ed1a3d29 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eff1ed1a3d29
Added Files:

sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD

sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
Modified Files:
sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err

sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
Branch: Jul2017
Log Message:

Approve outputs


diffs (215 lines):

diff --git 
a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err 
b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err
--- a/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err
+++ b/sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err
@@ -31,12 +31,6 @@ stderr of test 'hexadecimal_literals.Bug
 # 17:24:30 >  
 
 MAPI  = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525
-QUERY = select 0xg;
-ERROR = !syntax error, unexpected IDENT, expecting SCOLON in: "select 0xg"
-MAPI  = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525
-QUERY = select 0xG;
-ERROR = !syntax error, unexpected IDENT, expecting SCOLON in: "select 0xg"
-MAPI  = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525
 QUERY = select 0x8000;
 ERROR = !invalid hexadecimal number or hexadecimal too large 
(0x8000) in: "select 0x8000"
 MAPI  = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525
@@ -77,12 +71,6 @@ QUERY = select 0x123456789abcdef01234567
 ERROR = !invalid hexadecimal number or hexadecimal too large 
(0x123456789abcdef0123456789abcdef01) in: "select 
0x123456789abcdef0123456789abcdef01"
 
 MAPI  = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525
-QUERY = select -0xg;
-ERROR = !syntax error, unexpected IDENT, expecting SCOLON in: "select -0xg"
-MAPI  = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525
-QUERY = select -0xG;
-ERROR = !syntax error, unexpected IDENT, expecting SCOLON in: "select -0xg"
-MAPI  = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525
 QUERY = select -0x8000;
 ERROR = !invalid hexadecimal number or hexadecimal too large 
(0x8000) in: "select -0x8000"
 MAPI  = (monetdb) /var/tmp/mtest-30147/.s.monetdb.33525
diff --git 
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out 
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
--- a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
@@ -39,18 +39,16 @@ Ready.
 #  FROM t2a
 #  GROUP BY cods, elrik, ether, jaelen, sora;
 % .L11,.L11,   .L11,   .L11,   .L11,   .L11 # table_name
-% cods,elrik,  ether,  jaelen, sora,   L1 # name
+% cods,elrik,  ether,  jaelen, sora,   L7 # name
 % int, int,int,int,int,bigint # type
 % 1,   1,  1,  1,  1,  1 # length
-[ 0,   0,  0,  0,  0,  NULL]
 #SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, SUM(tib0)
 # FROM t2a
 #GROUP BY cods, elrik, ether, jaelen, sora;
 % .L,  .L, .L, .L, .L, sys.L1 # table_name
-% cods,elrik,  ether,  jaelen, sora,   L1 # name
+% cods,elrik,  ether,  jaelen, sora,   L14 # name
 % tinyint, tinyint,tinyint,tinyint,tinyint,
bigint # type
 % 1,   1,  1,  1,  1,  1 # length
-[ 0,   0,  0,  0,  0,  NULL]
 #drop table t2a;
 #drop table t1a;
 
diff --git 
a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD 
b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD
new file mode 100644
--- /dev/null
+++ 
b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD
@@ -0,0 +1,76 @@
+stdout of test 'cleanup_statistics.Bug-6439` in directory 
'sql/test/BugTracker-2017` itself:
+
+
+# 17:52:04 >  
+# 17:52:04 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=33623" "--set" 
"mapi_usock=/var/tmp/mtest-15308/.s.monetdb.33623" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 17:52:04 >  
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit
+# Found 7.330 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:33623/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-15308/.s.monetdb.33623
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Read

MonetDB: default - It now also really calls sql_remove_environme...

MonetDB: mtestplusplus - Added --parallel mode to mtest.

MonetDB: default - make sure we can startup (ie disable to much ...

MonetDB: mtestplusplus - Add --fast mode to Mtest.py, keep serve...

MonetDB: Jul2017 - Approve output

MonetDB: Jul2017 - Approve outputs

6 matches

Site Navigation

Mail list logo

Footer information