Changeset: f8a6bc04ddd3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8a6bc04ddd3
Modified Files:
monetdb5/optimizer/opt_cquery.c
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/basket00.stable.out
sql/backends/monet5/Tests/cqcreate.stable.out
sql/backends/monet5/Tests/cquery.stable.out
sql/backends/monet5/Tests/cquery00.stable.out
sql/backends/monet5/Tests/cquery01.stable.out
sql/backends/monet5/Tests/cquery02.stable.out
sql/backends/monet5/Tests/cquery03.stable.out
sql/backends/monet5/Tests/cquery04.stable.out
sql/backends/monet5/Tests/pyapi08.sql
sql/backends/monet5/Tests/rapi13.sql
sql/backends/monet5/basket.mal
sql/backends/monet5/sql_basket.c
sql/backends/monet5/sql_cquery.c
sql/backends/monet5/sql_execute.c
sql/scripts/50_cquery.sql
sql/server/rel_psm.c
Branch: trails
Log Message:
Test fixes
diffs (truncated from 471 to 300 lines):
diff --git a/monetdb5/optimizer/opt_cquery.c b/monetdb5/optimizer/opt_cquery.c
--- a/monetdb5/optimizer/opt_cquery.c
+++ b/monetdb5/optimizer/opt_cquery.c
@@ -238,7 +238,6 @@ OPTcqueryImplementation(Client cntxt, Ma
for(j = 0; j < btop; j++)
if( input[j] && !output[j] ){
r = newStmt(mb,
basketRef, tumbleRef);
- r = pushArgument(mb,r,
lastmvc);
r = pushStr(mb,r,
schemas[j]);
r = pushStr(mb,r,
tables[j]);
lastmvc = getArg(r,0);
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -78,8 +78,6 @@ shutdown
HAVE_HGE?int_notation_1e5
basket00
-epoch
-
# use the continuous primitives
cqcreate
diff --git a/sql/backends/monet5/Tests/basket00.stable.out
b/sql/backends/monet5/Tests/basket00.stable.out
--- a/sql/backends/monet5/Tests/basket00.stable.out
+++ b/sql/backends/monet5/Tests/basket00.stable.out
@@ -18,11 +18,9 @@ stdout of test 'basket00` in directory '
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-Ready.
-
-# 13:08:27 >
-# 13:08:27 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-16206" "--port=39158"
-# 13:08:27 >
+# 11:29:56 >
+# 11:29:56 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-129719" "--port=34076"
+# 11:29:56 >
#create stream table s_tmp(i integer);
#insert into s_tmp values(1),(2);
diff --git a/sql/backends/monet5/Tests/cqcreate.stable.out
b/sql/backends/monet5/Tests/cqcreate.stable.out
--- a/sql/backends/monet5/Tests/cqcreate.stable.out
+++ b/sql/backends/monet5/Tests/cqcreate.stable.out
@@ -19,11 +19,9 @@ stdout of test 'cqcreate` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-
-# 10:26:34 >
-# 10:26:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24395" "--port=39287"
-# 10:26:34 >
+# 11:29:57 >
+# 11:29:57 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-129719" "--port=34076"
+# 11:29:57 >
#CREATE stream TABLE testing (a int);
#CREATE TABLE results (b int);
diff --git a/sql/backends/monet5/Tests/cquery.stable.out
b/sql/backends/monet5/Tests/cquery.stable.out
--- a/sql/backends/monet5/Tests/cquery.stable.out
+++ b/sql/backends/monet5/Tests/cquery.stable.out
@@ -19,7 +19,9 @@ stdout of test 'cquery` in directory 'sq
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
+# 11:29:57 >
+# 11:29:57 > "mclient" "-lmal" "-ftest" "-tnone" "-Eutf-8"
"--host=/var/tmp/mtest-129719" "--port=34076"
+# 11:29:57 >
# 22:02:28 >
# 22:02:28 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-9376" "--port=30916"
diff --git a/sql/backends/monet5/Tests/cquery00.stable.out
b/sql/backends/monet5/Tests/cquery00.stable.out
--- a/sql/backends/monet5/Tests/cquery00.stable.out
+++ b/sql/backends/monet5/Tests/cquery00.stable.out
@@ -19,7 +19,9 @@ stdout of test 'cquery00` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
+# 13:58:26 >
+# 13:58:26 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-226907" "--port=30092"
+# 13:58:26 >
# 22:52:08 >
# 22:52:08 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29156" "--port=34092"
diff --git a/sql/backends/monet5/Tests/cquery01.stable.out
b/sql/backends/monet5/Tests/cquery01.stable.out
--- a/sql/backends/monet5/Tests/cquery01.stable.out
+++ b/sql/backends/monet5/Tests/cquery01.stable.out
@@ -19,51 +19,9 @@ stdout of test 'cquery01` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-# 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_functions.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: 50_cquery.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_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
-
-# 14:38:22 >
-# 14:38:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12016" "--port=30485"
-# 14:38:22 >
+# 11:29:58 >
+# 11:29:58 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-129719" "--port=34076"
+# 11:29:58 >
#create stream table cqinput01(aaa integer) set window 5 stride 5; --ok
#alter stream table cqinput01 set window 6; --ok
diff --git a/sql/backends/monet5/Tests/cquery02.stable.out
b/sql/backends/monet5/Tests/cquery02.stable.out
--- a/sql/backends/monet5/Tests/cquery02.stable.out
+++ b/sql/backends/monet5/Tests/cquery02.stable.out
@@ -19,51 +19,9 @@ stdout of test 'cquery02` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-# 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_functions.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: 50_cquery.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_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
-
-# 14:29:21 >
-# 14:29:21 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11662" "--port=38794"
-# 14:29:21 >
+# 11:29:59 >
+# 11:29:59 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-129719" "--port=34076"
+# 11:29:59 >
#create stream table cqinput02(aaa integer) set window 4 stride 3;
#create table cqresult02(aaa integer);
diff --git a/sql/backends/monet5/Tests/cquery03.stable.out
b/sql/backends/monet5/Tests/cquery03.stable.out
--- a/sql/backends/monet5/Tests/cquery03.stable.out
+++ b/sql/backends/monet5/Tests/cquery03.stable.out
@@ -19,51 +19,9 @@ stdout of test 'cquery03` in directory '
# MonetDB/SQL module loaded
# MonetDB/Timetrails module loaded
-Ready.
-# 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_functions.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: 50_cquery.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_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
-
-# 14:15:08 >
-# 14:15:08 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10355" "--port=32676"
-# 14:15:08 >
+# 11:30:05 >
+# 11:30:05 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-129719" "--port=34076"
+# 11:30:05 >
#create stream table cqtbl(i integer);
#create procedure cqfoo(v integer)
diff --git a/sql/backends/monet5/Tests/cquery04.stable.out
b/sql/backends/monet5/Tests/cquery04.stable.out
--- a/sql/backends/monet5/Tests/cquery04.stable.out
+++ b/sql/backends/monet5/Tests/cquery04.stable.out
@@ -16,10 +16,6 @@ stdout of test 'cquery04` in directory '
# Listening for connection requests on
mapi:monetdb://dhcp-120.eduroam.cwi.nl:31081/
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-8493/.s.monetdb.31081
# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-# MonetDB/Timetrails module loaded
-
-Ready.
# SQL catalog created, loading sql scripts once
# loading sql script: 09_like.sql
# loading sql script: 10_math.sql
@@ -82,7 +78,7 @@ Ready.
% 1 # length
[ 2 ]
[ 2 ]
-#insert into cqinput06 values (5);
+#insert into cqinput04 values (5);
[ 1 ]
#select aaa from cqresult04; --output 2 tuples with value 2
% sys.cqresult04 # table_name
@@ -91,7 +87,7 @@ Ready.
% 1 # length
[ 2 ]
[ 2 ]
-#insert into cqinput06 values (6);
+#insert into cqinput04 values (6);
[ 1 ]
#select aaa from cqresult04; --output 3 tuples with value 2
% sys.cqresult04 # table_name
@@ -101,9 +97,10 @@ Ready.
[ 2 ]
[ 2 ]
[ 2 ]
-#drop procedure cq_basic06;
-#drop table cqinput06;
-#drop table cqresult06;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
