Changeset: f6b5bc765fed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6b5bc765fed Modified Files: sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out Branch: Dec2016 Log Message:
Make test output more stable by removing the table id and view name "geometry_columns" from the output diffs (124 lines): diff --git a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.sql b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.sql --- a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.sql +++ b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.sql @@ -1,8 +1,9 @@ CREATE VIEW sys.view_stats AS -SELECT s.name AS schema_nm, s.id AS schema_id, t.name AS table_nm, t.id AS table_id, t.system AS is_system_view +SELECT s.name AS schema_nm, s.id AS schema_id, t.name AS table_nm, /* t.id AS table_id, */ t.system AS is_system_view , (SELECT CAST(COUNT(*) as int) FROM sys.columns c WHERE c.table_id = t.id) AS "# columns" FROM sys.tables t JOIN sys.schemas s ON t.schema_id = s.id WHERE query IS NOT NULL + AND t.name <> 'geometry_columns' ; --ORDER BY s.name, t.name; SELECT * FROM sys.view_stats; diff --git a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out --- a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out +++ b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out @@ -28,60 +28,59 @@ Ready. # 10:01:40 > #CREATE VIEW sys.view_stats AS -#SELECT s.name AS schema_nm, s.id AS schema_id, t.name AS table_nm, t.id AS table_id, t.system AS is_system_view +#SELECT s.name AS schema_nm, s.id AS schema_id, t.name AS table_nm, /* t.id AS table_id, */ t.system AS is_system_view #, (SELECT CAST(COUNT(*) as int) FROM sys.columns c WHERE c.table_id = t.id) AS "# columns" # FROM sys.tables t JOIN sys.schemas s ON t.schema_id = s.id #WHERE query IS NOT NULL +# AND t.name <> 'geometry_columns' #; --ORDER BY s.name, t.name; #SELECT * FROM sys.view_stats; -% .view_stats, .view_stats, .view_stats, .view_stats, .view_stats, .view_stats # table_name -% schema_nm, schema_id, table_nm, table_id, is_system_view, "# columns" # name -% varchar, int, varchar, int, boolean, int # type -% 3, 4, 17, 4, 5, 2 # length -[ "sys", 2000, "tables", 5956, true, 9 ] -[ "sys", 2000, "columns", 5966, true, 10 ] -[ "sys", 2000, "users", 5988, true, 3 ] -[ "sys", 2000, "querylog_catalog", 6221, true, 8 ] -[ "sys", 2000, "querylog_calls", 6232, true, 9 ] -[ "sys", 2000, "querylog_history", 6250, true, 16 ] -[ "sys", 2000, "tracelog", 6289, true, 13 ] -[ "sys", 2000, "sessions", 6432, true, 6 ] -[ "sys", 2000, "optimizers", 6499, true, 3 ] -[ "sys", 2000, "environment", 6507, true, 2 ] -[ "sys", 2000, "queue", 6557, true, 8 ] -[ "sys", 2000, "rejects", 6587, true, 4 ] -[ "sys", 2000, "geometry_columns", 6914, true, 7 ] -[ "sys", 2000, "storage", 7743, true, 17 ] -[ "sys", 2000, "storagemodel", 7875, true, 13 ] -[ "sys", 2000, "tablestoragemodel", 7885, true, 8 ] -[ "sys", 2000, "view_stats", 8548, false, 6 ] +% .view_stats, .view_stats, .view_stats, .view_stats, .view_stats # table_name +% schema_nm, schema_id, table_nm, is_system_view, "# columns" # name +% varchar, int, varchar, boolean, int # type +% 3, 4, 17, 5, 2 # length +[ "sys", 2000, "tables", true, 9 ] +[ "sys", 2000, "columns", true, 10 ] +[ "sys", 2000, "users", true, 3 ] +[ "sys", 2000, "querylog_catalog", true, 8 ] +[ "sys", 2000, "querylog_calls", true, 9 ] +[ "sys", 2000, "querylog_history", true, 16 ] +[ "sys", 2000, "tracelog", true, 13 ] +[ "sys", 2000, "sessions", true, 6 ] +[ "sys", 2000, "optimizers", true, 3 ] +[ "sys", 2000, "environment", true, 2 ] +[ "sys", 2000, "queue", true, 8 ] +[ "sys", 2000, "rejects", true, 4 ] +[ "sys", 2000, "storage", true, 17 ] +[ "sys", 2000, "storagemodel", true, 13 ] +[ "sys", 2000, "tablestoragemodel", true, 8 ] +[ "sys", 2000, "view_stats", false, 5 ] #SELECT * FROM sys.view_stats WHERE is_system_view; -% .view_stats, .view_stats, .view_stats, .view_stats, .view_stats, .view_stats # table_name -% schema_nm, schema_id, table_nm, table_id, is_system_view, "# columns" # name -% varchar, int, varchar, int, boolean, int # type -% 3, 4, 17, 4, 5, 2 # length -[ "sys", 2000, "tables", 5956, true, 9 ] -[ "sys", 2000, "columns", 5966, true, 10 ] -[ "sys", 2000, "users", 5988, true, 3 ] -[ "sys", 2000, "querylog_catalog", 6221, true, 8 ] -[ "sys", 2000, "querylog_calls", 6232, true, 9 ] -[ "sys", 2000, "querylog_history", 6250, true, 16 ] -[ "sys", 2000, "tracelog", 6289, true, 13 ] -[ "sys", 2000, "sessions", 6432, true, 6 ] -[ "sys", 2000, "optimizers", 6499, true, 3 ] -[ "sys", 2000, "environment", 6507, true, 2 ] -[ "sys", 2000, "queue", 6557, true, 8 ] -[ "sys", 2000, "rejects", 6587, true, 4 ] -[ "sys", 2000, "geometry_columns", 6914, true, 7 ] -[ "sys", 2000, "storage", 7743, true, 17 ] -[ "sys", 2000, "storagemodel", 7875, true, 13 ] -[ "sys", 2000, "tablestoragemodel", 7885, true, 8 ] +% .view_stats, .view_stats, .view_stats, .view_stats, .view_stats # table_name +% schema_nm, schema_id, table_nm, is_system_view, "# columns" # name +% varchar, int, varchar, boolean, int # type +% 3, 4, 17, 5, 2 # length +[ "sys", 2000, "tables", true, 9 ] +[ "sys", 2000, "columns", true, 10 ] +[ "sys", 2000, "users", true, 3 ] +[ "sys", 2000, "querylog_catalog", true, 8 ] +[ "sys", 2000, "querylog_calls", true, 9 ] +[ "sys", 2000, "querylog_history", true, 16 ] +[ "sys", 2000, "tracelog", true, 13 ] +[ "sys", 2000, "sessions", true, 6 ] +[ "sys", 2000, "optimizers", true, 3 ] +[ "sys", 2000, "environment", true, 2 ] +[ "sys", 2000, "queue", true, 8 ] +[ "sys", 2000, "rejects", true, 4 ] +[ "sys", 2000, "storage", true, 17 ] +[ "sys", 2000, "storagemodel", true, 13 ] +[ "sys", 2000, "tablestoragemodel", true, 8 ] #SELECT * FROM sys.view_stats WHERE NOT is_system_view; -% .view_stats, .view_stats, .view_stats, .view_stats, .view_stats, .view_stats # table_name -% schema_nm, schema_id, table_nm, table_id, is_system_view, "# columns" # name -% varchar, int, varchar, int, boolean, int # type -% 3, 4, 10, 4, 5, 1 # length -[ "sys", 2000, "view_stats", 8548, false, 6 ] +% .view_stats, .view_stats, .view_stats, .view_stats, .view_stats # table_name +% schema_nm, schema_id, table_nm, is_system_view, "# columns" # name +% varchar, int, varchar, boolean, int # type +% 3, 4, 10, 5, 1 # length +[ "sys", 2000, "view_stats", false, 5 ] #DROP VIEW sys.view_stats; # 10:01:40 > _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
