Changeset: e5f6d746b764 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5f6d746b764
Removed Files:
sql/test/BugTracker-2020/Tests/values-like-join.Bug-6954.stable.out.single
Modified Files:
sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.out
sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.out
sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py
sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err
sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.out
sql/test/BugTracker-2020/Tests/remote-table-like.Bug-6841.py
sql/test/BugTracker-2020/Tests/remote-table-like.Bug-6841.stable.out
sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.py
sql/test/BugTracker-2020/Tests/table-udf-on-remote.Bug-6971.stable.out
sql/test/BugTracker-2020/Tests/values-like-join.Bug-6954.sql
sql/test/BugTracker-2020/Tests/values-like-join.Bug-6954.stable.out
Branch: mtest
Log Message:
Silenced BugTracker-2020 Python tests, plus replaced plan/explain outputs with
profiler statement
diffs (truncated from 680 to 300 lines):
diff --git a/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
b/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
--- a/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
+++ b/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
@@ -1,27 +1,26 @@
-import sys
+import sys, os, pymonetdb
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
+db = os.getenv("TSTDB")
+port = int(os.getenv("MAPIPORT"))
-with process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as c1, \
- process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE) as c2:
- out, err = c1.communicate('''\
+client1 = pymonetdb.connect(database=db, port=port, autocommit=True)
+cursor1 = client1.cursor()
+cursor1.execute("""
CREATE TABLE "testVarcharToClob" ("varcharColumn" varchar(255));
INSERT INTO "testVarcharToClob" VALUES ('value1'), ('value2');
ALTER TABLE "testVarcharToClob" add "clobColumn" TEXT NULL;
UPDATE "testVarcharToClob" SET "clobColumn" = "varcharColumn";
ALTER TABLE "testVarcharToClob" drop "varcharColumn";
-''')
- sys.stdout.write(out)
- sys.stderr.write(err)
+""")
- out, err = c2.communicate('''\
+client2 = pymonetdb.connect(database=db, port=port, autocommit=True)
+cursor2 = client2.cursor()
+cursor2.execute("""
INSERT INTO "testVarcharToClob" VALUES ('value3');
DROP TABLE "testVarcharToClob";
-''')
- sys.stdout.write(out)
- sys.stderr.write(err)
+""")
+
+cursor1.close()
+client1.close()
+cursor2.close()
+client2.close()
diff --git
a/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.out
b/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.out
--- a/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.out
+++ b/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.stable.out
@@ -5,16 +5,6 @@ stdout of test 'alter-table-add-column.B
# 11:33:03 > "/usr/bin/python3" "alter-table-add-column.Bug-6816.py"
"alter-table-add-column.Bug-6816"
# 11:33:03 >
-#CREATE TABLE "testVarcharToClob" ("varcharColumn" varchar(255));
-#INSERT INTO "testVarcharToClob" VALUES ('value1'), ('value2');
-[ 2 ]
-#ALTER TABLE "testVarcharToClob" add "clobColumn" TEXT NULL;
-#UPDATE "testVarcharToClob" SET "clobColumn" = "varcharColumn";
-[ 2 ]
-#ALTER TABLE "testVarcharToClob" drop "varcharColumn";
-#INSERT INTO "testVarcharToClob" VALUES ('value3');
-[ 1 ]
-#DROP TABLE "testVarcharToClob";
# 11:33:03 >
# 11:33:03 > "Done."
diff --git
a/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
b/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
--- a/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
+++ b/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.SQL.py
@@ -1,63 +1,61 @@
-import os, socket, sys, tempfile
+import os, socket, sys, tempfile, pymonetdb
try:
from MonetDBtesting import process
except ImportError:
import process
-def freeport():
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock.bind(('', 0))
- port = sock.getsockname()[1]
- sock.close()
- return port
-
-def client(input):
- with process.client('sql', port=myport, dbname='db1', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE) as c:
- out, err = c.communicate(input)
- sys.stdout.write(out)
- sys.stderr.write(err)
-
-def server_stop(s):
- out, err = s.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
-
-create = '''\
-CREATE FUNCTION myfunc1(input1 INT, input2 INT) RETURNS INT BEGIN RETURN
input1 + input2; END;
-CREATE FUNCTION myfunc2(input1 INT, input2 INT) RETURNS INT LANGUAGE PYTHON
{return (input1 + input2)};
-CREATE FUNCTION myfunc3(input1 INT, input2 INT) RETURNS INT LANGUAGE
PYTHON_MAP {return (input1 + input2)};
-CREATE FUNCTION myfunc4(input1 INT, input2 INT) RETURNS INT LANGUAGE PYTHON3
{return (input1 + input2)};
-CREATE FUNCTION myfunc5(input1 INT, input2 INT) RETURNS INT LANGUAGE
PYTHON3_MAP {return (input1 + input2)};
-CREATE FUNCTION myfunc6(input1 INT, input2 INT) RETURNS INT LANGUAGE R {return
(input1 + input2)};
-CREATE FUNCTION myfunc7(input1 INT, input2 INT) RETURNS INTEGER LANGUAGE C {
- result->initialize(result, input1.count);
- for(size_t i = 0; i < input1.count; i++) {
- result->data[i] = input1.data[i] + input2.data[i];
- }
-};
-'''
-run = 'SELECT CAST(myfunc1(1, 1) + myfunc2(1, 1) + myfunc3(1, 1) + myfunc4(1,
1) + myfunc5(1, 1) + myfunc6(1, 1) + myfunc7(1, 1) AS BIGINT);'
-
-drop = '''\
-DROP FUNCTION myfunc1;
-DROP FUNCTION myfunc2;
-DROP FUNCTION myfunc3;
-DROP FUNCTION myfunc4;
-DROP FUNCTION myfunc5;
-DROP FUNCTION myfunc6;
-DROP FUNCTION myfunc7;
-'''
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+sock.bind(('', 0))
+port = sock.getsockname()[1]
+sock.close()
server_args = ['--set', 'embedded_py=3', '--set', 'embedded_r=true', '--set',
'embedded_c=true']
with tempfile.TemporaryDirectory() as farm_dir:
os.mkdir(os.path.join(farm_dir, 'db1'))
- myport = freeport()
- with process.server(args = server_args, mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE) as s:
- client(create + run)
- server_stop(s)
+ with process.server(args = server_args, mapiport=port, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE) as s:
+ client1 = pymonetdb.connect(database='db1', port=port, autocommit=True)
+ cursor1 = client1.cursor()
+ cursor1.execute("""
+ CREATE FUNCTION myfunc1(input1 INT, input2 INT) RETURNS INT BEGIN
RETURN input1 + input2; END;
+ CREATE FUNCTION myfunc2(input1 INT, input2 INT) RETURNS INT LANGUAGE
PYTHON {return (input1 + input2)};
+ CREATE FUNCTION myfunc3(input1 INT, input2 INT) RETURNS INT LANGUAGE
PYTHON_MAP {return (input1 + input2)};
+ CREATE FUNCTION myfunc4(input1 INT, input2 INT) RETURNS INT LANGUAGE
PYTHON3 {return (input1 + input2)};
+ CREATE FUNCTION myfunc5(input1 INT, input2 INT) RETURNS INT LANGUAGE
PYTHON3_MAP {return (input1 + input2)};
+ CREATE FUNCTION myfunc6(input1 INT, input2 INT) RETURNS INT LANGUAGE R
{return (input1 + input2)};
+ CREATE FUNCTION myfunc7(input1 INT, input2 INT) RETURNS INTEGER
LANGUAGE C {
+ result->initialize(result, input1.count);
+ for(size_t i = 0; i < input1.count; i++) {
+ result->data[i] = input1.data[i] + input2.data[i];
+ }
+ }; """)
+ cursor1.execute("SELECT CAST(myfunc1(1, 1) + myfunc2(1, 1) +
myfunc3(1, 1) + myfunc4(1, 1) + myfunc5(1, 1) + myfunc6(1, 1) + myfunc7(1, 1)
AS BIGINT);")
+ result = cursor1.fetchall()[0][0]
+ if result != 14:
+ sys.stderr.write("The result should have been 14")
+ cursor1.close()
+ client1.close()
+ out, err = s.communicate()
+ sys.stderr.write(err)
- with process.server(args = server_args, mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE) as s:
- client(run + drop)
- server_stop(s)
+ with process.server(args = server_args, mapiport=port, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE) as s:
+ client1 = pymonetdb.connect(database='db1', port=port, autocommit=True)
+ cursor1 = client1.cursor()
+ cursor1.execute("SELECT CAST(myfunc1(1, 1) + myfunc2(1, 1) +
myfunc3(1, 1) + myfunc4(1, 1) + myfunc5(1, 1) + myfunc6(1, 1) + myfunc7(1, 1)
AS BIGINT);")
+ result = cursor1.fetchall()[0][0]
+ if result != 14:
+ sys.stderr.write("The result should have been 14")
+ cursor1.execute("""
+ DROP FUNCTION myfunc1;
+ DROP FUNCTION myfunc2;
+ DROP FUNCTION myfunc3;
+ DROP FUNCTION myfunc4;
+ DROP FUNCTION myfunc5;
+ DROP FUNCTION myfunc6;
+ DROP FUNCTION myfunc7;
+ """)
+ cursor1.close()
+ client1.close()
+ out, err = s.communicate()
+ sys.stderr.write(err)
diff --git
a/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.out
b/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.out
--- a/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.out
+++ b/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.stable.out
@@ -5,106 +5,6 @@ stdout of test 'functions-not-persist.Bu
# 11:31:46 > "/usr/bin/python3" "functions-not-persist.Bug-6819.SQL.py"
"functions-not-persist.Bug-6819"
# 11:31:46 >
-#CREATE FUNCTION myfunc1(input1 INT, input2 INT) RETURNS INT BEGIN RETURN
input1 + input2; END;
-#CREATE FUNCTION myfunc2(input1 INT, input2 INT) RETURNS INT LANGUAGE PYTHON
{return (input1 + input2)};
-#CREATE FUNCTION myfunc3(input1 INT, input2 INT) RETURNS INT LANGUAGE
PYTHON_MAP {return (input1 + input2)};
-#CREATE FUNCTION myfunc4(input1 INT, input2 INT) RETURNS INT LANGUAGE PYTHON3
{return (input1 + input2)};
-#CREATE FUNCTION myfunc5(input1 INT, input2 INT) RETURNS INT LANGUAGE
PYTHON3_MAP {return (input1 + input2)};
-#CREATE FUNCTION myfunc6(input1 INT, input2 INT) RETURNS INT LANGUAGE R
{return (input1 + input2)};
-#CREATE FUNCTION myfunc7(input1 INT, input2 INT) RETURNS INTEGER LANGUAGE C {
-# result->initialize(result, input1.count);
-# for(size_t i = 0; i < input1.count; i++) {
-# result->data[i] = input1.data[i] + input2.data[i];
-# }
-#};
-#SELECT CAST(myfunc1(1, 1) + myfunc2(1, 1) + myfunc3(1, 1) + myfunc4(1, 1) +
myfunc5(1, 1) + myfunc6(1, 1) + myfunc7(1, 1) AS BIGINT);
-% . # table_name
-% %1 # name
-% bigint # type
-% 2 # length
-[ 14 ]
-# MonetDB 5 server v11.37.0 (hg id: c997d3a05c02+)
-# This is an unreleased version
-# Serving database 'db1', using 8 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 15.498 GiB available main-memory of which we use 12.631 GiB
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://localhost.localdomain:59451/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-171552/.s.monetdb.59451
-# MonetDB/GIS module loaded
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.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_temporal.sql
-# loading sql script: 18_index.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_views.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 39_analytics_hge.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 40_json_hge.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_profiler.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 58_hot_snapshot.sql
-# loading sql script: 60_wlcr.sql
-# loading sql script: 61_wlcr.sql
-# loading sql script: 72_fits.sql
-# loading sql script: 74_netcdf.sql
-# loading sql script: 75_lidar.sql
-# loading sql script: 75_shp.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 80_udf_hge.sql
-# loading sql script: 81_tracer.sql
-# loading sql script: 90_generator.sql
-# loading sql script: 90_generator_hge.sql
-# loading sql script: 99_system.sql
-# MonetDB/SQL module loaded
-# MonetDB/Python3 module loaded
-# MonetDB/R module loaded
-#SELECT CAST(myfunc1(1, 1) + myfunc2(1, 1) + myfunc3(1, 1) + myfunc4(1, 1) +
myfunc5(1, 1) + myfunc6(1, 1) + myfunc7(1, 1) AS BIGINT);
-% . # table_name
-% %1 # name
-% bigint # type
-% 2 # length
-[ 14 ]
-#DROP FUNCTION myfunc1;
-#DROP FUNCTION myfunc2;
-#DROP FUNCTION myfunc3;
-#DROP FUNCTION myfunc4;
-#DROP FUNCTION myfunc5;
-#DROP FUNCTION myfunc6;
-#DROP FUNCTION myfunc7;
-# MonetDB 5 server v11.37.0 (hg id: c997d3a05c02+)
-# This is an unreleased version
-# Serving database 'db1', using 8 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 15.498 GiB available main-memory of which we use 12.631 GiB
-# Copyright (c) 1993 - July 2008 CWI.
-# Copyright (c) August 2008 - 2020 MonetDB B.V., all rights reserved
-# Visit https://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://localhost.localdomain:59451/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-171552/.s.monetdb.59451
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-# MonetDB/Python3 module loaded
-# MonetDB/R module loaded
# 11:31:48 >
# 11:31:48 > "Done."
diff --git
a/sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py
b/sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py
--- a/sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py
+++ b/sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py
@@ -12,21 +12,27 @@ cursor1.execute('CREATE GLOBAL TEMPORARY
cursor1.execute('INSERT INTO tmp.close_d VALUES (1,1);')
cursor2.execute('SELECT qaid, value_ FROM tmp.close_d;')
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
