Changeset: d933aa77c13c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d933aa77c13c
Modified Files:
sql/test/sciql/Tests/sci01.sql
sql/test/sciql/Tests/sci03.sql
sql/test/sciql/Tests/sci06.sql
sql/test/sciql/Tests/sci09.sql
sql/test/sciql/Tests/sci13.sql
sql/test/sciql/Tests/sci18.sql
sql/test/sciql/Tests/sci20.sql
Branch: sciql
Log Message:
Be consistent with column name.
Use 'v' everywhere to prevent the error "SELECT: identifier 'v' unknown"
diffs (87 lines):
diff --git a/sql/test/sciql/Tests/sci01.sql b/sql/test/sciql/Tests/sci01.sql
--- a/sql/test/sciql/Tests/sci01.sql
+++ b/sql/test/sciql/Tests/sci01.sql
@@ -1,9 +1,9 @@
-CREATE ARRAY matrix ( x integer DIMENSION[4], y integer DIMENSION[4], val
float DEFAULT 0.0 );
-CREATE ARRAY grid( x integer DIMENSION[4] CHECK(mod(x,2) = 0), y integer
DIMENSION[4], val float DEFAULT 0.0);
-CREATE ARRAY diagonal( x integer DIMENSION[4], y integer DIMENSION[4] CHECK(x
= y), val float );
-CREATE ARRAY sparse( x integer DIMENSION[4], y integer DIMENSION[4], val float
DEFAULT 0.0 CHECK(val>=0.0));
+CREATE ARRAY matrix ( x integer DIMENSION[4], y integer DIMENSION[4], v float
DEFAULT 0.0 );
+CREATE ARRAY grid( x integer DIMENSION[4] CHECK(mod(x,2) = 0), y integer
DIMENSION[4], v float DEFAULT 0.0);
+CREATE ARRAY diagonal( x integer DIMENSION[4], y integer DIMENSION[4] CHECK(x
= y), v float );
+CREATE ARRAY sparse( x integer DIMENSION[4], y integer DIMENSION[4], v float
DEFAULT 0.0 CHECK(v>=0.0));
-CREATE ARRAY stripes( x integer DIMENSION[4], y integer DIMENSION[4], val
float DEFAULT 0.0 );
-CREATE ARRAY stripes2( x integer DIMENSION, y integer DIMENSION, val float
DEFAULT 0.0 );
-CREATE ARRAY stripes3( x integer DIMENSION[4], y integer DIMENSION, val float
DEFAULT 0.0 );
+CREATE ARRAY stripes( x integer DIMENSION[4], y integer DIMENSION[4], v float
DEFAULT 0.0 );
+CREATE ARRAY stripes2( x integer DIMENSION, y integer DIMENSION, v float
DEFAULT 0.0 );
+CREATE ARRAY stripes3( x integer DIMENSION[4], y integer DIMENSION, v float
DEFAULT 0.0 );
diff --git a/sql/test/sciql/Tests/sci03.sql b/sql/test/sciql/Tests/sci03.sql
--- a/sql/test/sciql/Tests/sci03.sql
+++ b/sql/test/sciql/Tests/sci03.sql
@@ -1,6 +1,11 @@
-UPDATE stripes SET val = x + y;
+UPDATE stripes SET v = x + y;
UPDATE stripes SET x = x+1; -- what does it mean
-- consider stripes
with free dimensions too
UPDATE grid
-SET val = CASE WHEN x > y THEN x + y WHEN X<y THEN x - y ELSE 0 END;
-UPDATE diagonal SET val = x +y; UPDATE sparse SET val = mod(rand(),16);
+SET v = CASE WHEN x > y THEN x + y WHEN X<y THEN x - y ELSE 0 END;
+UPDATE diagonal SET v = x +y;
+
+-- This query crashes mserver5 with: Segmentation fault.
+-- at .../monet/default/sql/server/sql_statement.c:708:
+-- n->data = push_project(sa, rows, n->data);
+UPDATE sparse SET v = mod(rand(),16);
diff --git a/sql/test/sciql/Tests/sci06.sql b/sql/test/sciql/Tests/sci06.sql
--- a/sql/test/sciql/Tests/sci06.sql
+++ b/sql/test/sciql/Tests/sci06.sql
@@ -1,4 +1,4 @@
-SELECT x, y, val FROM matrix WHERE val >2;
-SELECT x, y, val FROM stripes WHERE val >2;
-SELECT [x], [y], val FROM matrix WHERE val >2;
-SELECT [T.k], [y], val FROM matrix JOIN T ON matrix.x = T.i;
+SELECT x, y, v FROM matrix WHERE v >2;
+SELECT x, y, v FROM stripes WHERE v >2;
+SELECT [x], [y], v FROM matrix WHERE v >2;
+SELECT [T.k], [y], v FROM matrix JOIN T ON matrix.x = T.i;
diff --git a/sql/test/sciql/Tests/sci09.sql b/sql/test/sciql/Tests/sci09.sql
--- a/sql/test/sciql/Tests/sci09.sql
+++ b/sql/test/sciql/Tests/sci09.sql
@@ -1,5 +1,5 @@
SET vector[0:2].v = (expr1,expr2);
-SET vector[x].val = CASE WHEN vector[x].val < 0 THEN 0
- WHEN vector[x].val >10 THEN 10 * x END ;
+SET vector[x].v = CASE WHEN vector[x].v < 0 THEN 0
+ WHEN vector[x].v >10 THEN 10 * x END ;
diff --git a/sql/test/sciql/Tests/sci13.sql b/sql/test/sciql/Tests/sci13.sql
--- a/sql/test/sciql/Tests/sci13.sql
+++ b/sql/test/sciql/Tests/sci13.sql
@@ -1,1 +1,1 @@
-SELECT [x],sum(val) FROM matrix GROUP BY DISTINCT matrix[x][y: *];
+SELECT [x],sum(v) FROM matrix GROUP BY DISTINCT matrix[x][y: *];
diff --git a/sql/test/sciql/Tests/sci18.sql b/sql/test/sciql/Tests/sci18.sql
--- a/sql/test/sciql/Tests/sci18.sql
+++ b/sql/test/sciql/Tests/sci18.sql
@@ -1,4 +1,4 @@
-CREATE ARRAY tmp(x integer DIMENSION, y integer DIMENSION, val float);
+CREATE ARRAY tmp(x integer DIMENSION, y integer DIMENSION, v float);
INSERT INTO tmp SELECT x, y, avg(v)
FROM matrix
GROUP BY DISTINCT matrix[x:x+2][y:y+2];
diff --git a/sql/test/sciql/Tests/sci20.sql b/sql/test/sciql/Tests/sci20.sql
--- a/sql/test/sciql/Tests/sci20.sql
+++ b/sql/test/sciql/Tests/sci20.sql
@@ -1,6 +1,6 @@
CREATE SEQUENCE seq AS integer START WITH 0 INCREMENT BY 1 MAXVALUE 10;
CREATE FUNCTION random(n integer)
-RETURNS ARRAY( i integer DIMENSION[seq], val float)
+RETURNS ARRAY( i integer DIMENSION[seq], v float)
RETURN SELECT seq, rand() FROM SEQUENCES seq;
CREATE FUNCTION transpose ( a ARRAY( i integer DIMENSION, j integer DIMENSION,
v float))
RETURNS ARRAY( i integer DIMENSION, j integer DIMENSION, v float)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
