Changeset: 4c4f5781eb22 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c4f5781eb22
Added Files:
sql/test/astro/Tests/astro.sql
sql/test/astro/Tests/astro.stable.err
sql/test/astro/Tests/astro.stable.out
sql/test/astro/Tests/astro.test
Removed Files:
sql/test/astro/Tests/drop.sql
sql/test/astro/Tests/drop.stable.err
sql/test/astro/Tests/drop.stable.out
sql/test/astro/Tests/drop.test
sql/test/astro/Tests/schema.sql
sql/test/astro/Tests/schema.stable.err
sql/test/astro/Tests/schema.stable.out
sql/test/astro/Tests/schema.test
sql/test/astro/Tests/update.sql
sql/test/astro/Tests/update.stable.err
sql/test/astro/Tests/update.stable.out
sql/test/astro/Tests/update.test
Modified Files:
sql/test/astro/Tests/All
Branch: mtest
Log Message:
Re-converted astro test directory. Use a single test file
diffs (truncated from 499 to 300 lines):
diff --git a/sql/test/astro/Tests/All b/sql/test/astro/Tests/All
--- a/sql/test/astro/Tests/All
+++ b/sql/test/astro/Tests/All
@@ -1,3 +1,1 @@
-schema
-update
-drop
+astro
diff --git a/sql/test/astro/Tests/schema.sql b/sql/test/astro/Tests/astro.sql
rename from sql/test/astro/Tests/schema.sql
rename to sql/test/astro/Tests/astro.sql
--- a/sql/test/astro/Tests/schema.sql
+++ b/sql/test/astro/Tests/astro.sql
@@ -24,4 +24,41 @@ CREATE TABLE "cm_flux" (
"avg_wfluxsq" DOUBLE NOT NULL,
"avg_dec_zone_deg" TINYINT NOT NULL
);
-COMMIT;
+
+plan UPDATE fluxz
+ SET (filter
+ ,f_datapoints
+ ,avg_flux
+ ,avg_fluxsq
+ ,avg_w
+ ,avg_wflux
+ ,avg_wfluxsq
+ ,avg_dec_zone_deg
+ )
+ =
+ (SELECT filter
+ ,f_datapoints
+ ,avg_flux
+ ,avg_fluxsq
+ ,avg_w
+ ,avg_wflux
+ ,avg_wfluxsq
+ ,avg_dec_zone_deg
+ FROM cm_flux
+ WHERE cm_flux.runcat = fluxz.runcat
+ AND cm_flux.active = TRUE
+ AND cm_flux.filter = 'g'
+ AND cm_flux.filter = fluxz.filter
+ )
+ WHERE EXISTS (SELECT runcat
+ FROM cm_flux
+ WHERE cm_flux.runcat = fluxz.runcat
+ AND cm_flux.active = TRUE
+ AND cm_flux.filter = 'g'
+ AND cm_flux.filter = fluxz.filter
+ );
+
+drop table "fluxz";
+drop table "cm_flux";
+
+ROLLBACK;
diff --git a/sql/test/astro/Tests/schema.stable.err
b/sql/test/astro/Tests/astro.stable.err
rename from sql/test/astro/Tests/schema.stable.err
rename to sql/test/astro/Tests/astro.stable.err
--- a/sql/test/astro/Tests/schema.stable.err
+++ b/sql/test/astro/Tests/astro.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'schema` in directory 'sql/test/astro` itself:
+stderr of test 'astro` in directory 'sql/test/astro` itself:
# 13:00:19 >
diff --git a/sql/test/astro/Tests/schema.stable.out
b/sql/test/astro/Tests/astro.stable.out
rename from sql/test/astro/Tests/schema.stable.out
rename to sql/test/astro/Tests/astro.stable.out
--- a/sql/test/astro/Tests/schema.stable.out
+++ b/sql/test/astro/Tests/astro.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'schema` in directory 'sql/test/astro` itself:
+stdout of test 'astro` in directory 'sql/test/astro` itself:
# 13:00:19 >
@@ -87,9 +87,56 @@ stdout of test 'schema` in directory 'sq
# "avg_wflux" DOUBLE NOT NULL,
# "avg_wfluxsq" DOUBLE NOT NULL,
# "avg_dec_zone_deg" TINYINT NOT NULL
-#COMMIT;
+#plan UPDATE fluxz
+# SET (filter
+# ,f_datapoints
+# ,avg_flux
+# ,avg_fluxsq
+# ,avg_w
+# ,avg_wflux
+# ,avg_wfluxsq
+# ,avg_dec_zone_deg
+# )
+# =
+# (SELECT filter
+# ,f_datapoints
+# ,avg_flux
+# ,avg_fluxsq
+# ,avg_w
+# ,avg_wflux
+# ,avg_wfluxsq
+# ,avg_dec_zone_deg
+# FROM cm_flux
+# WHERE cm_flux.runcat = fluxz.runcat
+# AND cm_flux.active = TRUE
+# AND cm_flux.filter = 'g'
+% .plan # table_name
+% rel # name
+% clob # type
+% 435 # length
+update(
+| table(sys.fluxz) [ "fluxz"."runcat" NOT NULL, "fluxz"."filter" NOT NULL,
"fluxz"."f_datapoints" NOT NULL, "fluxz"."active" NOT NULL, "fluxz"."avg_flux"
NOT NULL, "fluxz"."avg_fluxsq" NOT NULL, "fluxz"."avg_w" NOT NULL,
"fluxz"."avg_wflux" NOT NULL, "fluxz"."avg_wfluxsq" NOT NULL,
"fluxz"."avg_dec_zone_deg" NOT NULL, "fluxz"."%TID%" NOT NULL ] COUNT
+| single project (
+| | single left outer join (
+| | | semijoin (
+| | | | table(sys.fluxz) [ "fluxz"."runcat" NOT NULL, "fluxz"."filter" NOT
NULL, "fluxz"."f_datapoints" NOT NULL, "fluxz"."active" NOT NULL,
"fluxz"."avg_flux" NOT NULL, "fluxz"."avg_fluxsq" NOT NULL, "fluxz"."avg_w" NOT
NULL, "fluxz"."avg_wflux" NOT NULL, "fluxz"."avg_wfluxsq" NOT NULL,
"fluxz"."avg_dec_zone_deg" NOT NULL, "fluxz"."%TID%" NOT NULL ] COUNT ,
+| | | | select (
+| | | | | table(sys.cm_flux) [ "cm_flux"."runcat" NOT NULL, "cm_flux"."filter"
NOT NULL, "cm_flux"."active" NOT NULL ] COUNT
+| | | | ) [ "cm_flux"."active" NOT NULL = boolean "true", "cm_flux"."filter"
NOT NULL = char(1) "g" ]
+| | | ) [ "cm_flux"."runcat" NOT NULL = "fluxz"."runcat" NOT NULL,
"cm_flux"."filter" NOT NULL = "fluxz"."filter" NOT NULL ],
+| | | project (
+| | | | select (
+| | | | | table(sys.cm_flux) [ "cm_flux"."runcat" NOT NULL, "cm_flux"."filter"
NOT NULL, "cm_flux"."f_datapoints" NOT NULL, "cm_flux"."active" NOT NULL,
"cm_flux"."avg_flux" NOT NULL, "cm_flux"."avg_fluxsq" NOT NULL,
"cm_flux"."avg_w" NOT NULL, "cm_flux"."avg_wflux" NOT NULL,
"cm_flux"."avg_wfluxsq" NOT NULL, "cm_flux"."avg_dec_zone_deg" NOT NULL ] COUNT
+| | | | ) [ "cm_flux"."active" NOT NULL = boolean "true", "cm_flux"."filter"
NOT NULL = char(1) "g" ]
+| | | ) [ "cm_flux"."runcat" NOT NULL, "cm_flux"."filter" NOT NULL,
"cm_flux"."filter" NOT NULL as "%1"."%1", "cm_flux"."f_datapoints" NOT NULL as
"%2"."%2", "cm_flux"."avg_flux" NOT NULL as "%3"."%3", "cm_flux"."avg_fluxsq"
NOT NULL as "%4"."%4", "cm_flux"."avg_w" NOT NULL as "%5"."%5",
"cm_flux"."avg_wflux" NOT NULL as "%6"."%6", "cm_flux"."avg_wfluxsq" NOT NULL
as "%7"."%7", "cm_flux"."avg_dec_zone_deg" NOT NULL as "%10"."%10" ]
+| | ) [ "cm_flux"."runcat" NOT NULL = "fluxz"."runcat" NOT NULL,
"cm_flux"."filter" NOT NULL = "fluxz"."filter" NOT NULL ]
+| ) [ "fluxz"."%TID%" NOT NULL, "%1"."%1" NOT NULL as "fluxz"."filter",
"%2"."%2" NOT NULL as "fluxz"."f_datapoints", "%3"."%3" NOT NULL as
"fluxz"."avg_flux", "%4"."%4" NOT NULL as "fluxz"."avg_fluxsq", "%5"."%5" NOT
NULL as "fluxz"."avg_w", "%6"."%6" NOT NULL as "fluxz"."avg_wflux", "%7"."%7"
NOT NULL as "fluxz"."avg_wfluxsq", "%10"."%10" NOT NULL as
"fluxz"."avg_dec_zone_deg" ]
+) [ "fluxz"."%TID%" NOT NULL, "fluxz"."filter" NOT NULL,
"fluxz"."f_datapoints" NOT NULL, "fluxz"."avg_flux" NOT NULL,
"fluxz"."avg_fluxsq" NOT NULL, "fluxz"."avg_w" NOT NULL, "fluxz"."avg_wflux"
NOT NULL, "fluxz"."avg_wfluxsq" NOT NULL, "fluxz"."avg_dec_zone_deg" NOT NULL ]
+#drop table "fluxz";
+#drop table "cm_flux";
+#ROLLBACK;
-# 13:00:20 >
-# 13:00:20 > "Done."
-# 13:00:20 >
+# 16:41:02 >
+# 16:41:02 > "Done."
+# 16:41:02 >
diff --git a/sql/test/astro/Tests/schema.test b/sql/test/astro/Tests/astro.test
rename from sql/test/astro/Tests/schema.test
rename to sql/test/astro/Tests/astro.test
--- a/sql/test/astro/Tests/schema.test
+++ b/sql/test/astro/Tests/astro.test
@@ -30,6 +30,66 @@ CREATE TABLE "cm_flux" (
"avg_dec_zone_deg" TINYINT NOT NULL
)
+query T nosort
+plan UPDATE fluxz
+ SET (filter
+ ,f_datapoints
+ ,avg_flux
+ ,avg_fluxsq
+ ,avg_w
+ ,avg_wflux
+ ,avg_wfluxsq
+ ,avg_dec_zone_deg
+ )
+ =
+ (SELECT filter
+ ,f_datapoints
+ ,avg_flux
+ ,avg_fluxsq
+ ,avg_w
+ ,avg_wflux
+ ,avg_wfluxsq
+ ,avg_dec_zone_deg
+ FROM cm_flux
+ WHERE cm_flux.runcat = fluxz.runcat
+ AND cm_flux.active = TRUE
+ AND cm_flux.filter = 'g'
+ AND cm_flux.filter = fluxz.filter
+ )
+ WHERE EXISTS (SELECT runcat
+ FROM cm_flux
+ WHERE cm_flux.runcat = fluxz.runcat
+ AND cm_flux.active = TRUE
+ AND cm_flux.filter = 'g'
+ AND cm_flux.filter = fluxz.filter
+ )
+----
+update(
+| table(sys.fluxz) [ "fluxz"."runcat" NOT NULL, "fluxz"."filter" NOT NULL,
"fluxz"."f_datapoints" NOT NULL, "fluxz"."active" NOT NULL, "fluxz"."avg_flux"
NOT NULL, "fluxz"."avg_fluxsq" NOT NULL, "fluxz"."avg_w" NOT NULL,
"fluxz"."avg_wflux" NOT NULL, "fluxz"."avg_wfluxsq" NOT NULL,
"fluxz"."avg_dec_zone_deg" NOT NULL, "fluxz"."%TID%" NOT NULL ] COUNT
+| single project (
+| | single left outer join (
+| | | semijoin (
+| | | | table(sys.fluxz) [ "fluxz"."runcat" NOT NULL, "fluxz"."filter" NOT
NULL, "fluxz"."f_datapoints" NOT NULL, "fluxz"."active" NOT NULL,
"fluxz"."avg_flux" NOT NULL, "fluxz"."avg_fluxsq" NOT NULL, "fluxz"."avg_w" NOT
NULL, "fluxz"."avg_wflux" NOT NULL, "fluxz"."avg_wfluxsq" NOT NULL,
"fluxz"."avg_dec_zone_deg" NOT NULL, "fluxz"."%TID%" NOT NULL ] COUNT ,
+| | | | select (
+| | | | | table(sys.cm_flux) [ "cm_flux"."runcat" NOT NULL, "cm_flux"."filter"
NOT NULL, "cm_flux"."active" NOT NULL ] COUNT
+| | | | ) [ "cm_flux"."active" NOT NULL = boolean "true", "cm_flux"."filter"
NOT NULL = char(1) "g" ]
+| | | ) [ "cm_flux"."runcat" NOT NULL = "fluxz"."runcat" NOT NULL,
"cm_flux"."filter" NOT NULL = "fluxz"."filter" NOT NULL ],
+| | | project (
+| | | | select (
+| | | | | table(sys.cm_flux) [ "cm_flux"."runcat" NOT NULL, "cm_flux"."filter"
NOT NULL, "cm_flux"."f_datapoints" NOT NULL, "cm_flux"."active" NOT NULL,
"cm_flux"."avg_flux" NOT NULL, "cm_flux"."avg_fluxsq" NOT NULL,
"cm_flux"."avg_w" NOT NULL, "cm_flux"."avg_wflux" NOT NULL,
"cm_flux"."avg_wfluxsq" NOT NULL, "cm_flux"."avg_dec_zone_deg" NOT NULL ] COUNT
+| | | | ) [ "cm_flux"."active" NOT NULL = boolean "true", "cm_flux"."filter"
NOT NULL = char(1) "g" ]
+| | | ) [ "cm_flux"."runcat" NOT NULL, "cm_flux"."filter" NOT NULL,
"cm_flux"."filter" NOT NULL as "%1"."%1", "cm_flux"."f_datapoints" NOT NULL as
"%2"."%2", "cm_flux"."avg_flux" NOT NULL as "%3"."%3", "cm_flux"."avg_fluxsq"
NOT NULL as "%4"."%4", "cm_flux"."avg_w" NOT NULL as "%5"."%5",
"cm_flux"."avg_wflux" NOT NULL as "%6"."%6", "cm_flux"."avg_wfluxsq" NOT NULL
as "%7"."%7", "cm_flux"."avg_dec_zone_deg" NOT NULL as "%10"."%10" ]
+| | ) [ "cm_flux"."runcat" NOT NULL = "fluxz"."runcat" NOT NULL,
"cm_flux"."filter" NOT NULL = "fluxz"."filter" NOT NULL ]
+| ) [ "fluxz"."%TID%" NOT NULL, "%1"."%1" NOT NULL as "fluxz"."filter",
"%2"."%2" NOT NULL as "fluxz"."f_datapoints", "%3"."%3" NOT NULL as
"fluxz"."avg_flux", "%4"."%4" NOT NULL as "fluxz"."avg_fluxsq", "%5"."%5" NOT
NULL as "fluxz"."avg_w", "%6"."%6" NOT NULL as "fluxz"."avg_wflux", "%7"."%7"
NOT NULL as "fluxz"."avg_wfluxsq", "%10"."%10" NOT NULL as
"fluxz"."avg_dec_zone_deg" ]
+) [ "fluxz"."%TID%" NOT NULL, "fluxz"."filter" NOT NULL,
"fluxz"."f_datapoints" NOT NULL, "fluxz"."avg_flux" NOT NULL,
"fluxz"."avg_fluxsq" NOT NULL, "fluxz"."avg_w" NOT NULL, "fluxz"."avg_wflux"
NOT NULL, "fluxz"."avg_wfluxsq" NOT NULL, "fluxz"."avg_dec_zone_deg" NOT NULL ]
+
statement ok
-COMMIT
+drop table "fluxz"
+
+statement ok
+drop table "cm_flux"
+statement ok
+ROLLBACK
+
+
diff --git a/sql/test/astro/Tests/drop.sql b/sql/test/astro/Tests/drop.sql
deleted file mode 100644
--- a/sql/test/astro/Tests/drop.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-drop table "fluxz";
-drop table "cm_flux";
diff --git a/sql/test/astro/Tests/drop.stable.err
b/sql/test/astro/Tests/drop.stable.err
deleted file mode 100644
--- a/sql/test/astro/Tests/drop.stable.err
+++ /dev/null
@@ -1,31 +0,0 @@
-stderr of test 'drop` in directory 'sql/test/astro` itself:
-
-
-# 13:00:21 >
-# 13:00:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34568" "--set"
"mapi_usock=/var/tmp/mtest-1707270/.s.monetdb.34568" "--forcemito"
"--dbpath=/home/niels/scratch/rc-jun2020/Linux-x86_64/var/MonetDB/mTests_sql_test_astro"
"--set" "embedded_c=true"
-# 13:00:21 >
-
-# builtin opt gdk_dbpath =
/home/niels/scratch/rc-jun2020/Linux-x86_64/var/monetdb5/dbfarm/demo
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_ipv6 = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# builtin opt raw_strings = false
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 34568
-# cmdline opt mapi_usock = /var/tmp/mtest-1707270/.s.monetdb.34568
-# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-jun2020/Linux-x86_64/var/MonetDB/mTests_sql_test_astro
-# cmdline opt embedded_c = true
-
-# 13:00:21 >
-# 13:00:21 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1707270" "--port=34568"
-# 13:00:21 >
-
-
-# 13:00:21 >
-# 13:00:21 > "Done."
-# 13:00:21 >
-
diff --git a/sql/test/astro/Tests/drop.stable.out
b/sql/test/astro/Tests/drop.stable.out
deleted file mode 100644
--- a/sql/test/astro/Tests/drop.stable.out
+++ /dev/null
@@ -1,31 +0,0 @@
-stdout of test 'drop` in directory 'sql/test/astro` itself:
-
-
-# 13:00:21 >
-# 13:00:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34568" "--set"
"mapi_usock=/var/tmp/mtest-1707270/.s.monetdb.34568" "--forcemito"
"--dbpath=/home/niels/scratch/rc-jun2020/Linux-x86_64/var/MonetDB/mTests_sql_test_astro"
"--set" "embedded_c=true"
-# 13:00:21 >
-
-# MonetDB 5 server v11.37.8 (hg id: 585d13e0c34f+)
-# This is an unreleased version
-# Serving database 'mTests_sql_test_astro', using 8 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
-# Found 15.354 GiB available main-memory of which we use 12.513 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://xps13:34568/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-1707270/.s.monetdb.34568
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-# 13:00:21 >
-# 13:00:21 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1707270" "--port=34568"
-# 13:00:21 >
-
-#drop table "fluxz";
-#drop table "cm_flux";
-
-# 13:00:21 >
-# 13:00:21 > "Done."
-# 13:00:21 >
-
diff --git a/sql/test/astro/Tests/drop.test b/sql/test/astro/Tests/drop.test
deleted file mode 100644
--- a/sql/test/astro/Tests/drop.test
+++ /dev/null
@@ -1,6 +0,0 @@
-statement ok
-drop table "fluxz"
-
-statement ok
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
