Changeset: a3bb2be8928c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3bb2be8928c Added Files: sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.out sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.sql sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.err sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.out Modified Files: sql/server/rel_updates.c sql/test/BugTracker-2019/Tests/All sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.sql sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.err Branch: Apr2019 Log Message:
Merge with Aug2018 branch. diffs (truncated from 348 to 300 lines): diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c --- a/sql/server/rel_updates.c +++ b/sql/server/rel_updates.c @@ -410,6 +410,8 @@ insert_allowed(mvc *sql, sql_table *t, c return sql_error(sql, 02, SQLSTATE(42000) "%s: %s partitioned table '%s' has no partitions set", op, isListPartitionTable(t)?"list":"range", tname); } else if (isRemote(t)) { return sql_error(sql, 02, SQLSTATE(42000) "%s: cannot %s remote table '%s' from this server at the moment", op, opname, tname); + } else if (isReplicaTable(t)) { + return sql_error(sql, 02, SQLSTATE(42000) "%s: cannot %s replica table '%s'", op, opname, tname); } else if (isStream(t)) { return sql_error(sql, 02, SQLSTATE(42000) "%s: cannot %s stream '%s'", op, opname, tname); } else if (t->access == TABLE_READONLY) { @@ -447,6 +449,8 @@ update_allowed(mvc *sql, sql_table *t, c return sql_error(sql, 02, SQLSTATE(42000) "%s: %s partitioned table '%s' has no partitions set", op, isListPartitionTable(t)?"list":"range", tname); } else if (isRemote(t)) { return sql_error(sql, 02, SQLSTATE(42000) "%s: cannot %s remote table '%s' from this server at the moment", op, opname, tname); + } else if (isReplicaTable(t)) { + return sql_error(sql, 02, SQLSTATE(42000) "%s: cannot %s replica table '%s'", op, opname, tname); } else if (isStream(t)) { return sql_error(sql, 02, SQLSTATE(42000) "%s: cannot %s stream '%s'", op, opname, tname); } else if (t->access == TABLE_READONLY || t->access == TABLE_APPENDONLY) { diff --git a/sql/test/BugTracker-2019/Tests/All b/sql/test/BugTracker-2019/Tests/All --- a/sql/test/BugTracker-2019/Tests/All +++ b/sql/test/BugTracker-2019/Tests/All @@ -1,3 +1,4 @@ copy-into-from-stdin-empty-line.Bug-6669 subselect-contradiction.Bug-6683 insert-replica-table.Bug-6684 +subselect-count.Bug-6686 diff --git a/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.sql b/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.sql --- a/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.sql +++ b/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.sql @@ -1,4 +1,7 @@ -start transaction; create replica table t1 (a int); insert into t1 values (1); -rollback; +update t1 set a = 2; +delete from t1; +insert into t1 values (1); +truncate t1; +drop table t1; diff --git a/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.err b/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.err --- a/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.err +++ b/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.err @@ -28,6 +28,26 @@ stderr of test 'insert-replica-table.Bug # 09:30:33 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-22747" "--port=38129" # 09:30:33 > +MAPI = (monetdb) /var/tmp/mtest-2676/.s.monetdb.31160 +QUERY = insert into t1 values (1); +ERROR = !INSERT INTO: cannot insert into replica table 't1' +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-2676/.s.monetdb.31160 +QUERY = update t1 set a = 2; +ERROR = !UPDATE: cannot update replica table 't1' +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-2676/.s.monetdb.31160 +QUERY = delete from t1; +ERROR = !DELETE FROM: cannot delete from replica table 't1' +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-2676/.s.monetdb.31160 +QUERY = insert into t1 values (1); +ERROR = !INSERT INTO: cannot insert into replica table 't1' +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-2676/.s.monetdb.31160 +QUERY = truncate t1; +ERROR = !TRUNCATE: cannot truncate replica table 't1' +CODE = 42000 # 09:30:33 > # 09:30:33 > "Done." diff --git a/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.out b/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.out @@ -0,0 +1,73 @@ +stdout of test 'insert-replica-table.Bug-6684` in directory 'sql/test/BugTracker-2019` itself: + + +# 09:32:22 > +# 09:32:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31160" "--set" "mapi_usock=/var/tmp/mtest-2676/.s.monetdb.31160" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019" "--set" "embedded_c=true" +# 09:32:22 > + +# MonetDB 5 server v11.31.14 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2019', 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:31160/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-2676/.s.monetdb.31160 +# 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 + +Ready. + +# 09:32:22 > +# 09:32:22 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-2676" "--port=31160" +# 09:32:22 > + +#create replica table t1 (a int); +#drop table t1; + +# 09:32:22 > +# 09:32:22 > "Done." +# 09:32:22 > + diff --git a/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.sql b/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.sql @@ -0,0 +1,31 @@ +START TRANSACTION; +CREATE TABLE "sys"."unitTestDontDelete" ("A" VARCHAR(255),"B" BIGINT,"C" DOUBLE,"D" TIMESTAMP); +INSERT INTO "sys"."unitTestDontDelete" VALUES (NULL, NULL, NULL, NULL), ('Cat1', 0, 0.5, '2013-06-10 11:10:10.000000'), +('Cat2', 1, 1.5, '2013-06-11 12:11:11.000000'), ('Cat1', 2, 2.5, '2013-06-12 13:12:12.000000'), +('Cat2', 3, 3.5, '2013-06-13 14:13:13.000000'), ('Cat1', 4, 4.5, '2013-06-14 15:14:14.000000'), +('Cat2', 5, 5.5, '2013-06-15 16:15:15.000000'), ('Cat1', 6, 6.5, '2013-06-16 17:16:16.000000'), +('Cat2', 7, 7.5, '2013-06-17 18:17:17.000000'), ('Cat1', 8, 8.5, '2013-06-18 19:18:18.000000'); +with "c3_t" as +( + select + "c1_t"."A", + "c1_t"."B", + "c1_t"."C", + "c1_t"."D" + from + "unitTestDontDelete" as "c1_t" +) +select + "c3_t"."C", + ( + select + count(*) + from + "c3_t" as "c4_t" + where + "c4_t"."C" >= coalesce("c3_t"."C", 0.0) + 1 + ) + as "c2_f1" +from + "c3_t"; +ROLLBACK; diff --git a/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.err b/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.err @@ -0,0 +1,35 @@ +stderr of test 'subselect-count.Bug-6686` in directory 'sql/test/BugTracker-2019` itself: + + +# 15:03:42 > +# 15:03:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32799" "--set" "mapi_usock=/var/tmp/mtest-12769/.s.monetdb.32799" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019" "--set" "embedded_c=true" +# 15:03:42 > + +# builtin opt gdk_dbpath = /home/ferreira/repositories/MonetDB-Aug2018/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 = 32799 +# cmdline opt mapi_usock = /var/tmp/mtest-12769/.s.monetdb.32799 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019 +# cmdline opt embedded_c = true +# cmdline opt gdk_debug = 553648138 + +# 15:03:43 > +# 15:03:43 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12769" "--port=32799" +# 15:03:43 > + + +# 15:03:43 > +# 15:03:43 > "Done." +# 15:03:43 > + diff --git a/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.out b/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2019/Tests/subselect-count.Bug-6686.stable.out @@ -0,0 +1,117 @@ +stdout of test 'subselect-count.Bug-6686` in directory 'sql/test/BugTracker-2019` itself: + + +# 15:03:42 > +# 15:03:42 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=32799" "--set" "mapi_usock=/var/tmp/mtest-12769/.s.monetdb.32799" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019" "--set" "embedded_c=true" +# 15:03:42 > + +# MonetDB 5 server v11.31.14 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2019', 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:32799/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12769/.s.monetdb.32799 +# 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 + +Ready. + +# 15:03:43 > +# 15:03:43 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12769" "--port=32799" +# 15:03:43 > + +#START TRANSACTION; +#CREATE TABLE "sys"."unitTestDontDelete" ("A" VARCHAR(255),"B" BIGINT,"C" DOUBLE,"D" TIMESTAMP); +#INSERT INTO "sys"."unitTestDontDelete" VALUES (NULL, NULL, NULL, NULL), ('Cat1', 0, 0.5, '2013-06-10 11:10:10.000000'), _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list