Changeset: 1d325c1166a4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d325c1166a4
Added Files:
sql/backends/monet5/vaults/bam/Tests/SingleServer
sql/test/concurrent/Tests/SingleServer
sql/test/copy/Tests/SingleServer
sql/test/scripts/Tests/All
sql/test/scripts/Tests/alastair_udf_mergetable_bug.py
sql/test/scripts/Tests/alastair_udf_mergetable_bug.stable.err
sql/test/scripts/Tests/alastair_udf_mergetable_bug.stable.out
sql/test/scripts/Tests/copy-from-lz4.py
sql/test/scripts/Tests/copy-from-lz4.stable.err
sql/test/scripts/Tests/copy-from-lz4.stable.out
sql/test/scripts/Tests/copy-into-lz4.sql.in
sql/test/scripts/Tests/copy-into-lz4.stable.err
sql/test/scripts/Tests/copy-into-lz4.stable.out
sql/test/scripts/Tests/fsum.sql
sql/test/scripts/Tests/fsum.stable.err
sql/test/scripts/Tests/fsum.stable.out
sql/test/scripts/Tests/fsum1.sql.src
sql/test/scripts/Tests/fsum1.stable.err.src
sql/test/scripts/Tests/fsum1.stable.out.src
sql/test/scripts/Tests/lz4-dump.sql
sql/test/scripts/Tests/testlz4.lz4
Removed Files:
sql/test/Tests/alastair_udf_mergetable_bug.py
sql/test/Tests/alastair_udf_mergetable_bug.stable.err
sql/test/Tests/alastair_udf_mergetable_bug.stable.out
sql/test/Tests/copy-from-lz4.py
sql/test/Tests/copy-from-lz4.stable.err
sql/test/Tests/copy-from-lz4.stable.out
sql/test/Tests/copy-into-lz4.sql.in
sql/test/Tests/copy-into-lz4.stable.err
sql/test/Tests/copy-into-lz4.stable.out
sql/test/Tests/fsum.sql
sql/test/Tests/fsum.stable.err
sql/test/Tests/fsum.stable.out
sql/test/Tests/fsum1.sql.src
sql/test/Tests/fsum1.stable.err.src
sql/test/Tests/fsum1.stable.out.src
sql/test/Tests/lz4-dump.sql
Modified Files:
sql/test/Tests/All
Branch: Nov2019
Log Message:
Speed up testing in more test dirs
Added dir sql/test/scripts/Tests/ for storing all tests which do not work with
SingleServer enabled
Moved 5 tests from sql/test/Tests/ to sql/test/scripts/Tests/
diffs (truncated from 9775 to 300 lines):
diff --git a/sql/backends/monet5/vaults/bam/Tests/SingleServer
b/sql/backends/monet5/vaults/bam/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -106,7 +106,6 @@ HAVE_JDBCCLIENT_JAR?bogus-auto-generated
str-pad
str-trim
-alastair_udf_mergetable_bug
copy-into-fwf
HAVE_LIBZ&HAVE_LIBBZ2&HAVE_LIBLZMA?copy-from-compressed
@@ -120,11 +119,6 @@ drop-trigger-if-exists
constant-not-in
-fsum
-THREADS=1?fsum1
-
-NOT_WIN32&HAVE_LIBLZ4?copy-into-lz4
-NOT_WIN32&HAVE_LIBLZ4?copy-from-lz4
unicode
window_functions
diff --git a/sql/test/Tests/alastair_udf_mergetable_bug.py
b/sql/test/Tests/alastair_udf_mergetable_bug.py
deleted file mode 100644
--- a/sql/test/Tests/alastair_udf_mergetable_bug.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import sys
-import os
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-def client(input):
- c = process.client('sql',
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- out, err = c.communicate(input)
- sys.stdout.write(out)
- sys.stderr.write(err)
-
-script1 = '''\
-create table tab1 (group_by_col int, index_col int, f float);
-create table tab2 (index_col int, f float);
-
-insert into tab1 values (1,1,1),(1,2,2),(2,1,3),(2,2,4),(3,1,5),(3,2,6);
-insert into tab2 values (1,111),(2,222),(3,333),(4,444);
-
-set optimizer='default_pipe';
-select optimizer;
-select tab1.group_by_col,SUM(fuse(cast (tab1.f as INT),cast (tab2.f as INT)))
from tab2 inner join tab1 on tab1.index_col = tab2.index_col group by
tab1.group_by_col;
-
-drop table tab1;
-drop table tab2;
-
-'''
-
-def main():
- s = process.server(args = ["--set", "gdk_nr_threads=2", "--forcemito"],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- client(script1)
- out, err = s.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
-
-if __name__ == '__main__':
- main()
diff --git a/sql/test/Tests/alastair_udf_mergetable_bug.stable.err
b/sql/test/Tests/alastair_udf_mergetable_bug.stable.err
deleted file mode 100644
--- a/sql/test/Tests/alastair_udf_mergetable_bug.stable.err
+++ /dev/null
@@ -1,30 +0,0 @@
-stderr of test 'alastair_udf_mergetable_bug` in directory 'sql/test` itself:
-
-
-# 14:10:49 >
-# 14:10:49 > "/usr/bin/python2" "alastair_udf_mergetable_bug.py"
"alastair_udf_mergetable_bug"
-# 14:10:49 >
-
-# builtin opt gdk_dbpath =
/export/scratch2/zhang/monet-install/Jan2014/debug/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 31835
-# cmdline opt mapi_usock = /var/tmp/mtest-11152/.s.monetdb.31835
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/export/scratch2/zhang/monet-install/Jan2014/debug/var/MonetDB/mTests_sql_test
-# cmdline opt gdk_nr_threads = 2
-
-# 14:10:50 >
-# 14:10:50 > "Done."
-# 14:10:50 >
-
diff --git a/sql/test/Tests/alastair_udf_mergetable_bug.stable.out
b/sql/test/Tests/alastair_udf_mergetable_bug.stable.out
deleted file mode 100644
--- a/sql/test/Tests/alastair_udf_mergetable_bug.stable.out
+++ /dev/null
@@ -1,74 +0,0 @@
-stdout of test 'alastair_udf_mergetable_bug` in directory 'sql/test` itself:
-
-
-# 14:10:49 >
-# 14:10:49 > "/usr/bin/python2" "alastair_udf_mergetable_bug.py"
"alastair_udf_mergetable_bug"
-# 14:10:49 >
-
-#create table tab1 (group_by_col int, index_col int, f float);
-#create table tab2 (index_col int, f float);
-#insert into tab1 values (1,1,1),(1,2,2),(2,1,3),(2,2,4),(3,1,5),(3,2,6);
-[ 6 ]
-#insert into tab2 values (1,111),(2,222),(3,333),(4,444);
-[ 4 ]
-#set optimizer='default_pipe';
-#select optimizer;
-% .L2 # table_name
-% L2 # name
-% varchar # type
-% 12 # length
-[ "default_pipe" ]
-#select tab1.group_by_col,SUM(fuse(cast (tab1.f as INT),cast (tab2.f as INT)))
from tab2 inner join tab1 on tab1.index_col = tab2.index_col group by
tab1.group_by_col;
-% sys.tab1, sys.L6 # table_name
-% group_by_col, L5 # name
-% int, bigint # type
-% 1, 11 # length
-[ 1, 12884902221 ]
-[ 2, 30064771405 ]
-[ 3, 47244640589 ]
-#drop table tab1;
-#drop table tab2;
-# MonetDB 5 server v11.17.14
-# This is an unreleased version
-# Serving database 'mTests_sql_test', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.591 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://riga.ins.cwi.nl:31835/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11152/.s.monetdb.31835
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_compress.sql
-# loading sql script: 18_dictionary.sql
-# loading sql script: 19_cluster.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 46_gsl.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 99_system.sql
-
-# 14:10:50 >
-# 14:10:50 > "Done."
-# 14:10:50 >
-
diff --git a/sql/test/Tests/copy-from-lz4.py b/sql/test/Tests/copy-from-lz4.py
deleted file mode 100644
--- a/sql/test/Tests/copy-from-lz4.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import os, sys, tempfile
-
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-(fd, tmpf) = tempfile.mkstemp(suffix='.lz4', text=True)
-os.close(fd)
-os.unlink(tmpf)
-
-s = process.server(args=[], stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
-
-data = open(os.path.join(os.getenv('TSTSRCDIR'), 'lz4-dump.sql')).read()
-
-c = process.client('sql', stdin=process.PIPE,
- stdout=process.PIPE, stderr=process.PIPE, log=True)
-out, err = c.communicate(data.replace('/tmp/testing-dump.lz4', tmpf))
-sys.stdout.write(out)
-sys.stderr.write(err)
-
-out, err = s.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
-
-try:
- os.unlink(tmpf)
-except:
- pass
diff --git a/sql/test/Tests/copy-from-lz4.stable.err
b/sql/test/Tests/copy-from-lz4.stable.err
deleted file mode 100644
--- a/sql/test/Tests/copy-from-lz4.stable.err
+++ /dev/null
@@ -1,34 +0,0 @@
-stderr of test 'copy-from-lz4` in directory 'sql/test` itself:
-
-
-# 18:01:50 >
-# 18:01:50 > "/usr/bin/python2" "copy-from-lz4.py" "copy-from-lz4"
-# 18:01:50 >
-
-
-# 18:01:50 >
-# 18:01:50 > Mtimeout -timeout 60 mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-16374 --port=35324 --database=mTests_sql_test <
"/home/ferreira/repositories/MonetDB-default/src/sql/test/Tests/lz4-dump.sql"
-# 18:01:50 >
-
-# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-default/BUILD/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 35324
-# cmdline opt mapi_usock = /var/tmp/mtest-16374/.s.monetdb.35324
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-default/BUILD/var/MonetDB/mTests_sql_test
-# cmdline opt gdk_debug = 553648138
-
-# 18:01:50 >
-# 18:01:50 > "Done."
-# 18:01:50 >
-
diff --git a/sql/test/Tests/copy-from-lz4.stable.out
b/sql/test/Tests/copy-from-lz4.stable.out
deleted file mode 100644
--- a/sql/test/Tests/copy-from-lz4.stable.out
+++ /dev/null
@@ -1,103 +0,0 @@
-stdout of test 'copy-from-lz4` in directory 'sql/test` itself:
-
-
-# 18:01:50 >
-# 18:01:50 > "/usr/bin/python2" "copy-from-lz4.py" "copy-from-lz4"
-# 18:01:50 >
-
-
-# 18:01:50 >
-# 18:01:50 > Mtimeout -timeout 60 mclient -lsql -ftest -tnone -Eutf-8 -i -e
--host=/var/tmp/mtest-16374 --port=35324 --database=mTests_sql_test <
"/home/ferreira/repositories/MonetDB-default/src/sql/test/Tests/lz4-dump.sql"
-# 18:01:50 >
-
-#CREATE TABLE outputlz4 (a bigint, b real, c clob);
-#CREATE TABLE readlz4 (a bigint, b real, c clob);
-#COPY 4 RECORDS INTO outputlz4 (a, b, c) FROM STDIN USING DELIMITERS
',','\n','"' NULL AS '';
-#1,2.0,"another"
-#2,2.1,"test"
-#3,2.2,"to perform"
-#,1.0,
-[ 4 ]
-#SELECT a, b, c FROM outputlz4;
-% sys.outputlz4, sys.outputlz4, sys.outputlz4 # table_name
-% a, b, c # name
-% bigint, real, clob # type
-% 1, 15, 10 # length
-[ 1, 2, "another" ]
-[ 2, 2.1, "test" ]
-[ 3, 2.2, "to perform" ]
-[ NULL, 1, NULL ]
-#COPY (SELECT a, b, c FROM outputlz4) INTO '/tmp/testing-dump.lz4' USING
DELIMITERS ',','\n','"' NULL AS '';
-[ 4 ]
-#COPY 4 RECORDS INTO readlz4 (a, b, c) FROM '/tmp/testing-dump.lz4' USING
DELIMITERS ',','\n','"' NULL AS '';
-[ 4 ]
-#SELECT a, b, c FROM readlz4;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
