Changeset: c657ce183569 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c657ce183569 Modified Files: sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out Branch: SciQL-2 Log Message:
Merge with Feb2013 branch. diffs (truncated from 480 to 300 lines): diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out b/sql/test/Dependencies/Tests/Dependencies.stable.out --- a/sql/test/Dependencies/Tests/Dependencies.stable.out +++ b/sql/test/Dependencies/Tests/Dependencies.stable.out @@ -288,7 +288,6 @@ Dependencies between database objects [ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] [ "id", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] [ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "id", "dependencies_schemas_on_users", "DEP_FUNC" ] [ "id", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] [ "id", "dependencies_tables_on_functions", "DEP_FUNC" ] @@ -380,16 +379,13 @@ Dependencies between database objects % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 15, 35, 8 # length +% 15, 31, 8 # length [ "=", "columnsize", "DEP_FUNC" ] [ "left_shift", "columnsize", "DEP_FUNC" ] [ "sql_mul", "columnsize", "DEP_FUNC" ] [ "pi", "degrees", "DEP_FUNC" ] [ "sql_div", "degrees", "DEP_FUNC" ] [ "sql_mul", "degrees", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_functions", "DEP_FUNC" ] [ "=", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "isnull", "dependencies_columns_on_indexes", "DEP_FUNC" ] @@ -398,34 +394,7 @@ Dependencies between database objects [ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "=", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "isnull", "dependencies_tables_on_indexes", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "=", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_views_on_triggers", "DEP_FUNC" ] [ ">", "f1", "DEP_FUNC" ] [ "not", "f1", "DEP_FUNC" ] [ "<", "f2", "DEP_FUNC" ] @@ -459,9 +428,8 @@ Dependencies between database objects % sys.f, sys.tri, .L # table_name % name, name, single_value # name % varchar, varchar, char # type -% 6, 12, 11 # length +% 5, 12, 11 # length [ "<>", "trigger_test", "DEP_TRIGGER" ] -[ "isnull", "trigger_test", "DEP_TRIGGER" ] [ "count", "trigger_test", "DEP_TRIGGER" ] #SELECT k.name, fk.name, 'DEP_FKEY' from keys as k, keys as fk where fk.rkey = k.id; % sys.k, sys.fk, .L # table_name @@ -508,16 +476,13 @@ Dependencies between functions with same % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 15, 35, 8 # length +% 15, 31, 8 # length [ "=", "columnsize", "DEP_FUNC" ] [ "left_shift", "columnsize", "DEP_FUNC" ] [ "sql_mul", "columnsize", "DEP_FUNC" ] [ "pi", "degrees", "DEP_FUNC" ] [ "sql_div", "degrees", "DEP_FUNC" ] [ "sql_mul", "degrees", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_functions", "DEP_FUNC" ] [ "=", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "isnull", "dependencies_columns_on_indexes", "DEP_FUNC" ] @@ -526,34 +491,7 @@ Dependencies between functions with same [ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "=", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "isnull", "dependencies_tables_on_indexes", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "=", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_views_on_triggers", "DEP_FUNC" ] [ ">", "f1", "DEP_FUNC" ] [ "not", "f1", "DEP_FUNC" ] [ "<", "f2", "DEP_FUNC" ] @@ -593,16 +531,13 @@ Dependencies between functions with same % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 15, 35, 8 # length +% 15, 31, 8 # length [ "=", "columnsize", "DEP_FUNC" ] [ "left_shift", "columnsize", "DEP_FUNC" ] [ "sql_mul", "columnsize", "DEP_FUNC" ] [ "pi", "degrees", "DEP_FUNC" ] [ "sql_div", "degrees", "DEP_FUNC" ] [ "sql_mul", "degrees", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_functions", "DEP_FUNC" ] [ "=", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "isnull", "dependencies_columns_on_indexes", "DEP_FUNC" ] @@ -611,34 +546,7 @@ Dependencies between functions with same [ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "=", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "isnull", "dependencies_tables_on_indexes", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "=", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_views_on_triggers", "DEP_FUNC" ] [ "<>", "heapsize", "DEP_FUNC" ] [ "and", "heapsize", "DEP_FUNC" ] [ "sql_add", "heapsize", "DEP_FUNC" ] @@ -828,7 +736,6 @@ Cleanup [ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] [ "id", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] [ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "id", "dependencies_schemas_on_users", "DEP_FUNC" ] [ "id", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] [ "id", "dependencies_tables_on_functions", "DEP_FUNC" ] @@ -913,40 +820,20 @@ Cleanup % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 15, 35, 8 # length +% 15, 31, 8 # length [ "<", "ms_stuff", "DEP_FUNC" ] [ "<>", "heapsize", "DEP_FUNC" ] [ "=", "columnsize", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_functions", "DEP_FUNC" ] [ "=", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "=", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "=", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "=", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "=", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "=", "dependencies_views_on_triggers", "DEP_FUNC" ] [ "=", "indexsize", "DEP_FUNC" ] [ "=", "ms_round", "DEP_FUNC" ] [ ">", "ms_stuff", "DEP_FUNC" ] [ "and", "heapsize", "DEP_FUNC" ] [ "columnsize", "storagemodel", "DEP_FUNC" ] [ "concat", "ms_stuff", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_functions", "DEP_FUNC" ] [ "hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "hash", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "hash", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "hash", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "hash", "dependencies_views_on_triggers", "DEP_FUNC" ] [ "heapsize", "storagemodel", "DEP_FUNC" ] [ "indexsize", "storagemodel", "DEP_FUNC" ] [ "isnull", "dependencies_columns_on_indexes", "DEP_FUNC" ] @@ -958,18 +845,8 @@ Cleanup [ "or", "ms_stuff", "DEP_FUNC" ] [ "pi", "degrees", "DEP_FUNC" ] [ "pi", "radians", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_functions", "DEP_FUNC" ] [ "rotate_xor_hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_views_on_triggers", "DEP_FUNC" ] [ "round", "ms_round", "DEP_FUNC" ] [ "sql_add", "heapsize", "DEP_FUNC" ] [ "sql_add", "ms_stuff", "DEP_FUNC" ] diff --git a/sql/test/leaks/Tests/check1.stable.out b/sql/test/leaks/Tests/check1.stable.out --- a/sql/test/leaks/Tests/check1.stable.out +++ b/sql/test/leaks/Tests/check1.stable.out @@ -93,8 +93,8 @@ Ready. [ "oid", "int", 94 ] [ "oid", "int", 94 ] [ "oid", "int", 177 ] -[ "oid", "int", 271 ] -[ "oid", "int", 271 ] +[ "oid", "int", 239 ] +[ "oid", "int", 239 ] [ "oid", "int", 420 ] [ "oid", "int", 420 ] [ "oid", "int", 420 ] @@ -161,7 +161,7 @@ Ready. [ "oid", "sht", 0 ] [ "oid", "sht", 94 ] [ "oid", "sht", 94 ] -[ "oid", "sht", 271 ] +[ "oid", "sht", 239 ] [ "oid", "str", 0 ] [ "oid", "str", 0 ] [ "oid", "str", 0 ] diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out b/sql/test/leaks/Tests/check1_nogeom.stable.out --- a/sql/test/leaks/Tests/check1_nogeom.stable.out +++ b/sql/test/leaks/Tests/check1_nogeom.stable.out @@ -81,8 +81,8 @@ Ready. [ "oid", "int", 61 ] [ "oid", "int", 61 ] [ "oid", "int", 155 ] -[ "oid", "int", 271 ] -[ "oid", "int", 271 ] +[ "oid", "int", 239 ] +[ "oid", "int", 239 ] [ "oid", "int", 326 ] [ "oid", "int", 326 ] [ "oid", "int", 326 ] @@ -141,7 +141,7 @@ Ready. [ "oid", "sht", 0 ] [ "oid", "sht", 61 ] [ "oid", "sht", 61 ] -[ "oid", "sht", 271 ] +[ "oid", "sht", 239 ] [ "oid", "str", 0 ] [ "oid", "str", 0 ] [ "oid", "str", 0 ] diff --git a/sql/test/leaks/Tests/check2.stable.out b/sql/test/leaks/Tests/check2.stable.out --- a/sql/test/leaks/Tests/check2.stable.out +++ b/sql/test/leaks/Tests/check2.stable.out @@ -93,8 +93,8 @@ Ready. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
