Changeset: 2e353d854477 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e353d854477
Modified Files:
sql/test/sciql/Tests/ngram.stable.err
sql/test/sciql/Tests/ngram.stable.out
sql/test/sciql/Tests/sciql00.stable.err
sql/test/sciql/Tests/sciql00.stable.out
sql/test/sciql/Tests/sciql01.stable.err
sql/test/sciql/Tests/sciql01.stable.out
sql/test/sciql/Tests/sciql02.sql
sql/test/sciql/Tests/sciql02.stable.err
sql/test/sciql/Tests/sciql02.stable.out
sql/test/sciql/Tests/sciql03.stable.err
sql/test/sciql/Tests/sciql03.stable.out
sql/test/sciql/Tests/sciql04.stable.err
sql/test/sciql/Tests/sciql04.stable.out
sql/test/sciql/Tests/sciql05.stable.err
sql/test/sciql/Tests/sciql05.stable.out
sql/test/sciql/Tests/sciql06.stable.err
sql/test/sciql/Tests/sciql06.stable.out
sql/test/sciql/Tests/sciql08.stable.err
sql/test/sciql/Tests/sciql08.stable.out
sql/test/sciql/Tests/sciql09.stable.err
sql/test/sciql/Tests/sciql09.stable.out
sql/test/sciql/Tests/sciql10.stable.err
sql/test/sciql/Tests/sciql10.stable.out
sql/test/sciql/Tests/sciql12.stable.err
sql/test/sciql/Tests/sciql12.stable.out
sql/test/sciql/Tests/sciql13.stable.err
sql/test/sciql/Tests/sciql13.stable.out
sql/test/sciql/Tests/sciql14.stable.err
sql/test/sciql/Tests/sciql14.stable.out
sql/test/sciql/Tests/sciql15.stable.err
sql/test/sciql/Tests/sciql15.stable.out
sql/test/sciql/Tests/sciql16.sql
sql/test/sciql/Tests/sciql16.stable.err
sql/test/sciql/Tests/sciql16.stable.out
sql/test/sciql/Tests/sciql17.stable.err
sql/test/sciql/Tests/sciql17.stable.out
sql/test/sciql/Tests/sciql18.stable.err
sql/test/sciql/Tests/sciql18.stable.out
sql/test/sciql/Tests/sciql19.sql
sql/test/sciql/Tests/sciql19.stable.err
sql/test/sciql/Tests/sciql19.stable.out
sql/test/sciql/Tests/sciql20.stable.err
sql/test/sciql/Tests/sciql20.stable.out
sql/test/sciql/Tests/sciql21.sql
sql/test/sciql/Tests/sciql21.stable.err
sql/test/sciql/Tests/sciql21.stable.out
sql/test/sciql/Tests/sciql22.stable.err
sql/test/sciql/Tests/sciql22.stable.out
sql/test/sciql/Tests/sciql23.stable.err
sql/test/sciql/Tests/sciql23.stable.out
sql/test/sciql/Tests/sciql24.stable.err
sql/test/sciql/Tests/sciql24.stable.out
sql/test/sciql/Tests/sciql25.stable.err
sql/test/sciql/Tests/sciql25.stable.out
sql/test/sciql/Tests/sciql26.stable.err
sql/test/sciql/Tests/sciql26.stable.out
sql/test/sciql/Tests/sciql27.stable.err
sql/test/sciql/Tests/sciql27.stable.out
sql/test/sciql/Tests/sciql28.stable.err
sql/test/sciql/Tests/sciql28.stable.out
sql/test/sciql/Tests/sciql29.stable.err
sql/test/sciql/Tests/sciql29.stable.out
sql/test/sciql/Tests/smooth.sql
sql/test/sciql/Tests/smooth.stable.err
sql/test/sciql/Tests/smooth.stable.out
sql/test/sciql/Tests/texture.sql
sql/test/sciql/Tests/texture.stable.err
sql/test/sciql/Tests/texture.stable.out
Branch: sciql
Log Message:
some clean up in the stable.{out,err}
added missing stable.{our,err} for the tests 'ngram' and 'smooth'
minor corrections in the queries, detected by the parser
diffs (truncated from 1364 to 300 lines):
diff --git a/sql/test/sciql/Tests/ngram.stable.err
b/sql/test/sciql/Tests/ngram.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/sciql/Tests/ngram.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'ngram` in directory 'test/sciql` itself:
+
+
+# 00:04:46 >
+# 00:04:46 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/export/scratch0/zhang/monet-install/sciql/debug/var/MonetDB" --set
mapi_open=true --set mapi_port=32992 --set monet_prompt= --trace --forcemito
--set mal_listing=2 "--dbname=mTests_test_sciql" --set mal_listing=0 ; echo ;
echo Over..
+# 00:04:46 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/export/scratch0/zhang/monet-install/sciql/debug/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# 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 default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/export/scratch0/zhang/monet-install/sciql/debug/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32992
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_sciql
+# cmdline opt mal_listing = 0
+
+# 00:04:46 >
+# 00:04:46 > mclient -lsql -ftest -i -e --host=jarl --port=32992
+# 00:04:46 >
+
+
+# 00:04:46 >
+# 00:04:46 > Done.
+# 00:04:46 >
+
diff --git a/sql/test/sciql/Tests/ngram.stable.out
b/sql/test/sciql/Tests/ngram.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/sciql/Tests/ngram.stable.out
@@ -0,0 +1,33 @@
+stdout of test 'ngram` in directory 'test/sciql` itself:
+
+
+# 00:04:46 >
+# 00:04:46 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/export/scratch0/zhang/monet-install/sciql/debug/var/MonetDB" --set
mapi_open=true --set mapi_port=32992 --set monet_prompt= --trace --forcemito
--set mal_listing=2 "--dbname=mTests_test_sciql" --set mal_listing=0 ; echo ;
echo Over..
+# 00:04:46 >
+
+# MonetDB 5 server v11.4.0
+# This is an unreleased version
+# Serving database 'mTests_test_sciql', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.749 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://jarl.ins.cwi.nl:32992/
+# MonetDB/SQL module loaded
+# MonetDB/GIS module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 00:04:46 >
+# 00:04:46 > mclient -lsql -ftest -i -e --host=jarl --port=32992
+# 00:04:46 >
+
+
+# 00:04:46 >
+# 00:04:46 > Done.
+# 00:04:46 >
+
diff --git a/sql/test/sciql/Tests/sciql00.stable.err
b/sql/test/sciql/Tests/sciql00.stable.err
--- a/sql/test/sciql/Tests/sciql00.stable.err
+++ b/sql/test/sciql/Tests/sciql00.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'sciql00` in directory 'src/test/sciql` itself:
+stderr of test 'sciql00` in directory 'test/sciql` itself:
# 15:51:48 >
@@ -74,15 +74,6 @@
# 15:51:48 > mclient -lsql -ftest -i -e --host=eir --port=36638
# 15:51:48 >
-MAPI = monetdb@eir:32790
-QUERY = CREATE ARRAY A1( x integer DIMENSION[4], val float DEFAULT 0.0);
-ERROR = !Array not type checked yet
-MAPI = monetdb@eir:32790
-QUERY = CREATE ARRAY A2 ( x integer DIMENSION[0:4:1], val float DEFAULT 0.0);
-ERROR = !Array not type checked yet
-MAPI = monetdb@eir:32790
-QUERY = CREATE ARRAY A3 ( x integer DIMENSION range, val float DEFAULT 0.0);
-ERROR = !syntax error, unexpected IDENT, expecting ')' or ',' in: "create
array a3 ( x integer dimension range"
# 15:51:48 >
# 15:51:48 > Done.
diff --git a/sql/test/sciql/Tests/sciql00.stable.out
b/sql/test/sciql/Tests/sciql00.stable.out
--- a/sql/test/sciql/Tests/sciql00.stable.out
+++ b/sql/test/sciql/Tests/sciql00.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'sciql00` in directory 'src/test/sciql` itself:
+stdout of test 'sciql00` in directory 'test/sciql` itself:
# 15:51:48 >
diff --git a/sql/test/sciql/Tests/sciql01.stable.err
b/sql/test/sciql/Tests/sciql01.stable.err
--- a/sql/test/sciql/Tests/sciql01.stable.err
+++ b/sql/test/sciql/Tests/sciql01.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'sciql01` in directory 'src/test/sciql` itself:
+stderr of test 'sciql01` in directory 'test/sciql` itself:
# 15:51:48 >
@@ -74,18 +74,6 @@
# 15:51:48 > mclient -lsql -ftest -i -e --host=eir --port=36638
# 15:51:48 >
-MAPI = monetdb@eir:32790
-QUERY = CREATE ARRAY matrix ( x integer DIMENSION[4], y integer DIMENSION[4],
val float DEFAULT 0.0 );
-ERROR = !Array not type checked yet
-MAPI = monetdb@eir:32790
-QUERY = CREATE ARRAY grid( x integer DIMENSION[4] CHECK(mod(x,2) = 0), y
integer DIMENSION[4], val float DEFAULT 0.0);
-ERROR = !Array not type checked yet
-MAPI = monetdb@eir:32790
-QUERY = CREATE ARRAY diagonal( x integer DIMENSION[4], y integer DIMENSION[4]
CHECK(x = y), val float );
-ERROR = !Array not type checked yet
-MAPI = monetdb@eir:32790
-QUERY = CREATE ARRAY sparse( x integer DIMENSION[4], y integer DIMENSION[4],
val float DEFAULT 0.0 CHECK(val>0));
-ERROR = !Array not type checked yet
# 15:51:48 >
# 15:51:48 > Done.
diff --git a/sql/test/sciql/Tests/sciql01.stable.out
b/sql/test/sciql/Tests/sciql01.stable.out
--- a/sql/test/sciql/Tests/sciql01.stable.out
+++ b/sql/test/sciql/Tests/sciql01.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'sciql01` in directory 'src/test/sciql` itself:
+stdout of test 'sciql01` in directory 'test/sciql` itself:
# 15:51:48 >
diff --git a/sql/test/sciql/Tests/sciql02.sql b/sql/test/sciql/Tests/sciql02.sql
--- a/sql/test/sciql/Tests/sciql02.sql
+++ b/sql/test/sciql/Tests/sciql02.sql
@@ -6,3 +6,10 @@
tick TIMESTAMP DIMENSION,
payload FLOAT DEFAULT 0.0 );
+CREATE TABLE experiment2(
+ run date DIMENSION[ TIMESTAMP '2010-01-01':*: INTERVAL'1' day],
+ payload ARRAY (
+ x integer DIMENSION[4],
+ y integer DIMENSION[4],
+ val float DEFAULT 0.0)
+);
diff --git a/sql/test/sciql/Tests/sciql02.stable.err
b/sql/test/sciql/Tests/sciql02.stable.err
--- a/sql/test/sciql/Tests/sciql02.stable.err
+++ b/sql/test/sciql/Tests/sciql02.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'sciql02` in directory 'src/test/sciql` itself:
+stderr of test 'sciql02` in directory 'test/sciql` itself:
# 16:39:36 >
@@ -74,16 +74,6 @@
# 16:39:36 > mclient -lsql -ftest -i -e --host=eir --port=36317
# 16:39:36 >
-MAPI = monetdb@eir:36317
-QUERY = CREATE TABLE experiment(
- run date DIMENSION[ TIMESTAMP '2010-01-01':*: INTERVAL'1'
day],
- payload ARRAY (
- x integer DIMENSION[4],
- y integer DIMENSION[4],
- val float DEFAULT 0.0 ));
-ERROR = !syntax error, unexpected ARRAY in: "create table experiment(
- ! run date dimension[ timestamp '2010-01-01':*: interval'1'
day],
- ! payload array"
# 16:39:36 >
# 16:39:36 > Done.
diff --git a/sql/test/sciql/Tests/sciql02.stable.out
b/sql/test/sciql/Tests/sciql02.stable.out
--- a/sql/test/sciql/Tests/sciql02.stable.out
+++ b/sql/test/sciql/Tests/sciql02.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'sciql02` in directory 'src/test/sciql` itself:
+stdout of test 'sciql02` in directory 'test/sciql` itself:
# 16:39:36 >
diff --git a/sql/test/sciql/Tests/sciql03.stable.err
b/sql/test/sciql/Tests/sciql03.stable.err
--- a/sql/test/sciql/Tests/sciql03.stable.err
+++ b/sql/test/sciql/Tests/sciql03.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'sciql03` in directory 'src/test/sciql` itself:
+stderr of test 'sciql03` in directory 'test/sciql` itself:
# 22:23:57 >
@@ -74,17 +74,6 @@
# 22:23:57 > mclient -lsql -ftest -i -e --host=eir --port=37193
# 22:23:57 >
-MAPI = monetdb@eir:35615
-QUERY = UPDATE stripes SET val = x + y;
-ERROR = !UPDATE: no such table 'stripes'
-MAPI = monetdb@eir:35615
-QUERY = UPDATE grid
- SET val = CASE WHEN x > y THEN x + y WHEN X<y THEN x - y ELSE 0 END;
-ERROR = !UPDATE: no such table 'grid'
-MAPI = monetdb@eir:35615
-QUERY = UPDATE diagonal SET val = x +y; UPDATE sparse SET val = mod(rand(),16);
-ERROR = !UPDATE: no such table 'diagonal'
- !UPDATE: no such table 'sparse'
# 22:23:57 >
# 22:23:57 > Done.
diff --git a/sql/test/sciql/Tests/sciql03.stable.out
b/sql/test/sciql/Tests/sciql03.stable.out
--- a/sql/test/sciql/Tests/sciql03.stable.out
+++ b/sql/test/sciql/Tests/sciql03.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'sciql03` in directory 'src/test/sciql` itself:
+stdout of test 'sciql03` in directory 'test/sciql` itself:
# 22:23:57 >
@@ -25,6 +25,13 @@
# 22:23:57 > mclient -lsql -ftest -i -e --host=eir --port=37193
# 22:23:57 >
+#UPDATE matrix SET v = CASE
+# WHEN x>y THEN x + y
+# WHEN x<y THEN x - y
+# ELSE 0 END;
+[ 0 ]
+#UPDATE diagonal SET v = x +y;
+[ 0 ]
# 22:23:57 >
# 22:23:57 > Done.
diff --git a/sql/test/sciql/Tests/sciql04.stable.err
b/sql/test/sciql/Tests/sciql04.stable.err
--- a/sql/test/sciql/Tests/sciql04.stable.err
+++ b/sql/test/sciql/Tests/sciql04.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'sciql04` in directory 'src/test/sciql` itself:
+stderr of test 'sciql04` in directory 'test/sciql` itself:
# 15:51:49 >
@@ -74,9 +74,6 @@
# 15:51:49 > mclient -lsql -ftest -i -e --host=eir --port=36638
# 15:51:49 >
-MAPI = monetdb@eir:36638
-QUERY = INSERT INTO grid VALUES(1,1,25);
-ERROR = !INSERT INTO: no such table 'grid'
# 15:51:49 >
# 15:51:49 > Done.
diff --git a/sql/test/sciql/Tests/sciql04.stable.out
b/sql/test/sciql/Tests/sciql04.stable.out
--- a/sql/test/sciql/Tests/sciql04.stable.out
+++ b/sql/test/sciql/Tests/sciql04.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'sciql04` in directory 'src/test/sciql` itself:
+stdout of test 'sciql04` in directory 'test/sciql` itself:
# 15:51:49 >
@@ -21,12 +21,22 @@
Over..
-# 15:51:49 >
-# 15:51:49 > mclient -lsql -ftest -i -e --host=eir --port=36638
-# 15:51:49 >
+# 00:24:50 >
+# 00:24:50 > mclient -lsql -ftest -i -e --host=jarl --port=39569
+# 00:24:50 >
+#DELETE FROM matrix WHERE x = 2;
+[ 0 ]
+#INSERT INTO matrix SELECT x-1, y, v FROM matrix WHERE x > 2;
+[ 0 ]
+#INSERT INTO matrix SELECT x, y, 0 FROM matrix WHERE x = 3;
+[ 0 ]
+#INSERT INTO matrix(v) SELECT v FROM stripes;
+[ 0 ]
+#INSERT INTO stripes VALUES(1,1,25);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
