Changeset: a977926e5870 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a977926e5870
Modified Files:
geom/BugTracker/Tests/All
geom/BugTracker/Tests/X_crash.SF-1971632.sql
monetdb5/extras/mal_optimizer_template/Tests/All
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
sql/backends/monet5/generator/Tests/generator04.sql
sql/backends/monet5/generator/Tests/generator04.stable.err
sql/test/BugTracker-2009/Tests/All
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql
sql/test/pg_regress/Tests/All
sql/test/pg_regress/Tests/int8.sql
Branch: Dec2016
Log Message:
Instead of condition THREADS=1, set the optimzer to sequential_pipe.
This way, when you run an individual test using Mtest.py, you will
still get the correct behavior.
diffs (137 lines):
diff --git a/geom/BugTracker/Tests/All b/geom/BugTracker/Tests/All
--- a/geom/BugTracker/Tests/All
+++ b/geom/BugTracker/Tests/All
@@ -1,7 +1,7 @@
# tests related to bug reports:
# <descriptive-name>.SF-<bug-report-id>[.<ext>]
-HAVE_GEOM&THREADS=1?X_crash.SF-1971632
+HAVE_GEOM?X_crash.SF-1971632
HAVE_GEOM?copy_into_crash.SF-1975402
HAVE_GEOM?copy_into_mbr.3492
diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.sql
b/geom/BugTracker/Tests/X_crash.SF-1971632.sql
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.sql
+++ b/geom/BugTracker/Tests/X_crash.SF-1971632.sql
@@ -1,3 +1,5 @@
+set optimizer = 'sequential_pipe'; -- to get predictable errors
+
CREATE TABLE geoms (id INTEGER, g GEOMETRY);
INSERT INTO geoms values (1, 'POINT(10 10)');
INSERT INTO geoms values (2, 'LINESTRING(10 10, 20 20, 30 40)');
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/All
b/monetdb5/extras/mal_optimizer_template/Tests/All
--- a/monetdb5/extras/mal_optimizer_template/Tests/All
+++ b/monetdb5/extras/mal_optimizer_template/Tests/All
@@ -1,1 +1,1 @@
-THREADS=1?opt_sql_append
+opt_sql_append
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
@@ -1,3 +1,5 @@
+set optimizer = 'sequential_pipe'; -- to get predictable errors
+
create table ttt (a int, b int, c int);
select optimizer;
select def from optimizers() where name = optimizer;
diff --git a/sql/backends/monet5/generator/Tests/generator04.sql
b/sql/backends/monet5/generator/Tests/generator04.sql
--- a/sql/backends/monet5/generator/Tests/generator04.sql
+++ b/sql/backends/monet5/generator/Tests/generator04.sql
@@ -1,3 +1,5 @@
+set optimizer = 'sequential_pipe'; -- to get predictable errors
+
-- some unit tests
select * from generate_series('a','a','c');
diff --git a/sql/backends/monet5/generator/Tests/generator04.stable.err
b/sql/backends/monet5/generator/Tests/generator04.stable.err
--- a/sql/backends/monet5/generator/Tests/generator04.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator04.stable.err
@@ -31,8 +31,8 @@ stderr of test 'generator04` in director
MAPI = (monetdb) /var/tmp/mtest-20019/.s.monetdb.36969
QUERY = select * from generate_series('a','a','c');
-ERROR = !conversion of string 'c' to type bte failed.
-MAPI = (monetdb) /var/tmp/mtest-20019/.s.monetdb.36969
+ERROR = !conversion of string 'a' to type bte failed.
+MAPI = (monetdb) /var/tmp/mtest-3000/.s.monetdb.31545
QUERY = select * from generate_series(false,true,false) ;
ERROR = !zero step size not allowed
MAPI = (monetdb) /var/tmp/mtest-20019/.s.monetdb.36969
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -25,7 +25,7 @@ bool-str-bug
rollback_bug
update-crash
correlated-selection-bug
-THREADS=1?segfault_when_quitting_debugger.SF-2538837
+segfault_when_quitting_debugger.SF-2538837
row_number_bug.SF-2546109
#set_history_and_drop_table.SF-2607045 not relevant anymore
TypeException_having_count_distinct.SF-2494227
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
+++
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
@@ -1,2 +1,4 @@
+set optimizer = 'sequential_pipe'; -- to get predictable errors
+
debug select * from tables;
n
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -1,5 +1,5 @@
HAVE_GEOM?storagemodel
-THREADS=1?convert-function-test.Bug-3460
+convert-function-test.Bug-3460
HAVE_HGE?convert-function-test-hge.Bug-3460
LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908
incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909
diff --git a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql
b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql
--- a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql
+++ b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql
@@ -1,6 +1,8 @@
-- test SQL functions: convert(fromType, toType) and cast(fromType as toType)
for all SQL data types and data values
-- See also https://www.monetdb.org/bugzilla/show_bug.cgi?id=3460
+set optimizer = 'sequential_pipe'; -- to get predictable errors
+
SET TIME ZONE INTERVAL '+02:00' HOUR TO MINUTE;
-- BOOLEAN (true, false)
diff --git a/sql/test/pg_regress/Tests/All b/sql/test/pg_regress/Tests/All
--- a/sql/test/pg_regress/Tests/All
+++ b/sql/test/pg_regress/Tests/All
@@ -13,12 +13,12 @@ varchar
text
int2
int4
-THREADS=1?int8
+int8
oid
float4
float8
# bit NOT supported in MonetDB. BIT is also not standard SQL so exclude this
test
-HAVE_HGE&THREADS=1?numeric
+HAVE_HGE?numeric
strings
strings_concat
strings_cast
@@ -27,7 +27,7 @@ strings_like
numerology
HAVE_GEOM?point
#HAVE_GEOM?lseg # lseg is NOT supported in MonetDB. lseg (Line Segment) is
also not part of OpenGIS standard so exclude this test
-HAVE_GEOM&THREADS=1?box # box is not supported in MonetDB but it can be
replaced with mbr (= minimum bounded rectangle)
+HAVE_GEOM?box # box is not supported in MonetDB but it can be replaced
with mbr (= minimum bounded rectangle)
HAVE_GEOM?path # path is not supported in MonetDB but it can be replaced
with linestring
HAVE_GEOM?polygon
#HAVE_GEOM?circle # circle is NOT supported in MonetDB. It is also not part of
OpenGIS standard so exclude this test
diff --git a/sql/test/pg_regress/Tests/int8.sql
b/sql/test/pg_regress/Tests/int8.sql
--- a/sql/test/pg_regress/Tests/int8.sql
+++ b/sql/test/pg_regress/Tests/int8.sql
@@ -1,3 +1,5 @@
+set optimizer = 'sequential_pipe'; -- to get predictable errors
+
--
-- bigint
-- Test bigint 64-bit integers.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
