Changeset: 83d67263d808 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83d67263d808
Added Files:
        sql/test/merge-partitions/Tests/mergepart29.py
        sql/test/merge-partitions/Tests/mergepart29.stable.err
        sql/test/merge-partitions/Tests/mergepart29.stable.out
Modified Files:
        sql/test/merge-partitions/Tests/All
Branch: Apr2019
Log Message:

Partitioned merge tables working with remote tables.


diffs (246 lines):

diff --git a/sql/test/merge-partitions/Tests/All 
b/sql/test/merge-partitions/Tests/All
--- a/sql/test/merge-partitions/Tests/All
+++ b/sql/test/merge-partitions/Tests/All
@@ -27,3 +27,4 @@ mergepart25
 mergepart26
 mergepart27
 HAVE_DATA_PATH&HAVE_LIBPY?mergepart28
+mergepart29
diff --git a/sql/test/merge-partitions/Tests/mergepart29.py 
b/sql/test/merge-partitions/Tests/mergepart29.py
new file mode 100644
--- /dev/null
+++ b/sql/test/merge-partitions/Tests/mergepart29.py
@@ -0,0 +1,62 @@
+from __future__ import print_function
+
+import os
+import socket
+import sys
+import tempfile
+import shutil
+import 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
+
+
+farm_dir = tempfile.mkdtemp()
+
+node1_port = freeport()
+node1_proc = process.server(mapiport=node1_port, dbname='db1', 
dbfarm=os.path.join(farm_dir, 'db1'), stdin=process.PIPE, stdout=process.PIPE, 
stderr=process.PIPE)
+node1_conn = pymonetdb.connect(database='db1', port=node1_port, 
autocommit=True)
+node1_cur = node1_conn.cursor()
+
+node2_port = freeport()
+node2_proc = process.server(mapiport=node2_port, dbname='db2', 
dbfarm=os.path.join(farm_dir, 'db2'), stdin=process.PIPE, stdout=process.PIPE, 
stderr=process.PIPE)
+node2_conn = pymonetdb.connect(database='db2', port=node2_port, 
autocommit=True)
+node2_cur = node2_conn.cursor()
+
+node2_cur.execute('CREATE TABLE "tb2" ("col1" int, "col2" int);')
+node2_cur.execute('INSERT INTO "tb2" VALUES (1, 1), (2, 2), (3, 3);')
+
+node1_cur.execute('CREATE MERGE TABLE "tb1" ("col1" int, "col2" int) PARTITION 
BY RANGE ON ("col1");')
+node1_cur.execute('CREATE REMOTE TABLE "tb2" ("col1" int, "col2" int) ON 
\'mapi:monetdb://localhost:'+str(node2_port)+'/db2\';')
+try:
+    node1_cur.execute('ALTER TABLE "tb1" ADD TABLE "tb2" AS PARTITION BETWEEN 
0 AND 1;')  # error
+except Exception as ex:
+    sys.stderr.write(ex.__str__())
+node1_cur.execute('ALTER TABLE "tb1" ADD TABLE "tb2" AS PARTITION BETWEEN 0 
AND 100;')
+try:
+    node1_cur.execute('INSERT INTO "tb1" VALUES (4, 4)')  # TODO, inserts on 
remote tables
+except Exception as ex:
+    sys.stderr.write(ex.__str__())
+node1_cur.execute('SELECT "col1", "col2" FROM "tb1";')
+output = node1_cur.fetchall()
+
+out2, err2 = node2_proc.communicate()
+sys.stdout.write(out2)
+sys.stderr.write(err2)
+print('\n')
+out1, err1 = node1_proc.communicate()
+sys.stdout.write(out1)
+sys.stderr.write(err1)
+print(output)
+
+shutil.rmtree(farm_dir)
diff --git a/sql/test/merge-partitions/Tests/mergepart29.stable.err 
b/sql/test/merge-partitions/Tests/mergepart29.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/merge-partitions/Tests/mergepart29.stable.err
@@ -0,0 +1,42 @@
+stderr of test 'mergepart29` in directory 'sql/test/merge-partitions` itself:
+
+
+# 10:47:53 >  
+# 10:47:53 >  "/usr/bin/python2" "mergepart29.py" "mergepart29"
+# 10:47:53 >  
+
+ALTER TABLE: there are values in the column col1 outside the partition range
+42000!INSERT: cannot insert remote table 'tb2' from this server at the moment
+# builtin opt  gdk_dbpath = 
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/monetdb5/dbfarm/demo
+# 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  monet_prompt = 
+# cmdline opt  mapi_port = 53697
+# cmdline opt  mapi_usock = /var/tmp/mtest-14851/.s.monetdb.53697
+# cmdline opt  gdk_dbpath = /tmp/tmp4wiJ3t/db2/db2
+# builtin opt  gdk_dbpath = 
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/monetdb5/dbfarm/demo
+# 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  monet_prompt = 
+# cmdline opt  mapi_port = 46431
+# cmdline opt  mapi_usock = /var/tmp/mtest-14851/.s.monetdb.46431
+# cmdline opt  gdk_dbpath = /tmp/tmp4wiJ3t/db1/db1
+
+# 10:47:55 >  
+# 10:47:55 >  "Done."
+# 10:47:55 >  
+
diff --git a/sql/test/merge-partitions/Tests/mergepart29.stable.out 
b/sql/test/merge-partitions/Tests/mergepart29.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/merge-partitions/Tests/mergepart29.stable.out
@@ -0,0 +1,119 @@
+stdout of test 'mergepart29` in directory 'sql/test/merge-partitions` itself:
+
+
+# 10:47:53 >  
+# 10:47:53 >  "/usr/bin/python2" "mergepart29.py" "mergepart29"
+# 10:47:53 >  
+
+# MonetDB 5 server v11.33.0 (hg id: 487bb52813ac+)
+# This is an unreleased version
+# Serving database 'db2', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.528 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on 
mapi:monetdb://localhost.localdomain:53697/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-14851/.s.monetdb.53697
+# 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: 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_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: 60_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: 85_bam.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 5 server v11.33.0 (hg id: 487bb52813ac+)
+# This is an unreleased version
+# Serving database 'db1', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.528 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on 
mapi:monetdb://localhost.localdomain:46431/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-14851/.s.monetdb.46431
+# 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: 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_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: 60_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: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+# MonetDB/SQL module loaded
+[(1, 1), (2, 2), (3, 3)]
+
+# 10:47:55 >  
+# 10:47:55 >  "Done."
+# 10:47:55 >  
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to