Changeset: 9391c5ae912d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9391c5ae912d Modified Files: sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 Branch: default Log Message:
approved output, ie we don't keep the dependencies on the system function. These should simply exist (and cannot be removed). diffs (292 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 @@ -398,9 +398,7 @@ Dependencies between database objects % sys.f, sys.tri, .L # table_name % name, name, single_value # name % varchar, varchar, char # type -% 5, 12, 11 # length -[ "<>", "trigger_test", "DEP_TRIGGER" ] -[ "count", "trigger_test", "DEP_TRIGGER" ] +% 0, 0, 11 # length #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 % name, name, single_value # name diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 --- a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 +++ b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 @@ -334,62 +334,13 @@ Dependencies between database objects % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 17, 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_indexes", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ ">", "f1", "DEP_FUNC" ] -[ "isnull", "f1", "DEP_FUNC" ] -[ "not", "f1", "DEP_FUNC" ] -[ "or", "f1", "DEP_FUNC" ] -[ "<", "f2", "DEP_FUNC" ] -[ ">", "f2", "DEP_FUNC" ] +% 17, 13, 8 # length [ "f1", "f2", "DEP_FUNC" ] -[ "zero_or_one", "getproj4", "DEP_FUNC" ] -[ "=", "hashsize", "DEP_FUNC" ] -[ "sql_mul", "hashsize", "DEP_FUNC" ] -[ "<>", "heapsize", "DEP_FUNC" ] -[ "and", "heapsize", "DEP_FUNC" ] -[ "sql_add", "heapsize", "DEP_FUNC" ] -[ "sql_mul", "heapsize", "DEP_FUNC" ] -[ "=", "imprintsize", "DEP_FUNC" ] -[ "or", "imprintsize", "DEP_FUNC" ] -[ "sql_mul", "imprintsize", "DEP_FUNC" ] -[ "=", "ms_round", "DEP_FUNC" ] -[ "isnull", "ms_round", "DEP_FUNC" ] [ "ms_trunc", "ms_round", "DEP_FUNC" ] -[ "not", "ms_round", "DEP_FUNC" ] -[ "or", "ms_round", "DEP_FUNC" ] -[ "round", "ms_round", "DEP_FUNC" ] -[ "<", "ms_stuff", "DEP_FUNC" ] -[ ">", "ms_stuff", "DEP_FUNC" ] -[ "concat", "ms_stuff", "DEP_FUNC" ] -[ "length", "ms_stuff", "DEP_FUNC" ] -[ "or", "ms_stuff", "DEP_FUNC" ] -[ "sql_add", "ms_stuff", "DEP_FUNC" ] -[ "sql_add", "ms_stuff", "DEP_FUNC" ] -[ "sql_sub", "ms_stuff", "DEP_FUNC" ] -[ "substring", "ms_stuff", "DEP_FUNC" ] -[ "pi", "radians", "DEP_FUNC" ] -[ "sql_div", "radians", "DEP_FUNC" ] -[ "sql_mul", "radians", "DEP_FUNC" ] [ "st_numgeometries", "st_numpatches", "DEP_FUNC" ] [ "st_geometryn", "st_patchn", "DEP_FUNC" ] [ "getproj4", "st_transform", "DEP_FUNC" ] [ "internaltransform", "st_transform", "DEP_FUNC" ] -[ "isnull", "st_transform", "DEP_FUNC" ] -[ "not", "st_transform", "DEP_FUNC" ] -[ "or", "st_transform", "DEP_FUNC" ] [ "st_srid", "st_transform", "DEP_FUNC" ] [ "columnsize", "storagemodel", "DEP_FUNC" ] [ "hashsize", "storagemodel", "DEP_FUNC" ] @@ -399,9 +350,7 @@ Dependencies between database objects % sys.f, sys.tri, .L # table_name % name, name, single_value # name % varchar, varchar, char # type -% 5, 12, 11 # length -[ "<>", "trigger_test", "DEP_TRIGGER" ] -[ "count", "trigger_test", "DEP_TRIGGER" ] +% 0, 0, 11 # length #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 % name, name, single_value # name @@ -459,65 +408,15 @@ Dependencies between functions with same % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 17, 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_indexes", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ ">", "f1", "DEP_FUNC" ] -[ "isnull", "f1", "DEP_FUNC" ] -[ "not", "f1", "DEP_FUNC" ] -[ "or", "f1", "DEP_FUNC" ] -[ "<", "f2", "DEP_FUNC" ] -[ ">", "f2", "DEP_FUNC" ] +% 17, 13, 8 # length [ "f1", "f2", "DEP_FUNC" ] [ "f1", "f2", "DEP_FUNC" ] -[ "<", "f3", "DEP_FUNC" ] [ "f1", "f3", "DEP_FUNC" ] -[ "zero_or_one", "getproj4", "DEP_FUNC" ] -[ "=", "hashsize", "DEP_FUNC" ] -[ "sql_mul", "hashsize", "DEP_FUNC" ] -[ "<>", "heapsize", "DEP_FUNC" ] -[ "and", "heapsize", "DEP_FUNC" ] -[ "sql_add", "heapsize", "DEP_FUNC" ] -[ "sql_mul", "heapsize", "DEP_FUNC" ] -[ "=", "imprintsize", "DEP_FUNC" ] -[ "or", "imprintsize", "DEP_FUNC" ] -[ "sql_mul", "imprintsize", "DEP_FUNC" ] -[ "=", "ms_round", "DEP_FUNC" ] -[ "isnull", "ms_round", "DEP_FUNC" ] [ "ms_trunc", "ms_round", "DEP_FUNC" ] -[ "not", "ms_round", "DEP_FUNC" ] -[ "or", "ms_round", "DEP_FUNC" ] -[ "round", "ms_round", "DEP_FUNC" ] -[ "<", "ms_stuff", "DEP_FUNC" ] -[ ">", "ms_stuff", "DEP_FUNC" ] -[ "concat", "ms_stuff", "DEP_FUNC" ] -[ "length", "ms_stuff", "DEP_FUNC" ] -[ "or", "ms_stuff", "DEP_FUNC" ] -[ "sql_add", "ms_stuff", "DEP_FUNC" ] -[ "sql_add", "ms_stuff", "DEP_FUNC" ] -[ "sql_sub", "ms_stuff", "DEP_FUNC" ] -[ "substring", "ms_stuff", "DEP_FUNC" ] -[ "pi", "radians", "DEP_FUNC" ] -[ "sql_div", "radians", "DEP_FUNC" ] -[ "sql_mul", "radians", "DEP_FUNC" ] [ "st_numgeometries", "st_numpatches", "DEP_FUNC" ] [ "st_geometryn", "st_patchn", "DEP_FUNC" ] [ "getproj4", "st_transform", "DEP_FUNC" ] [ "internaltransform", "st_transform", "DEP_FUNC" ] -[ "isnull", "st_transform", "DEP_FUNC" ] -[ "not", "st_transform", "DEP_FUNC" ] -[ "or", "st_transform", "DEP_FUNC" ] [ "st_srid", "st_transform", "DEP_FUNC" ] [ "columnsize", "storagemodel", "DEP_FUNC" ] [ "hashsize", "storagemodel", "DEP_FUNC" ] @@ -530,55 +429,12 @@ Dependencies between functions with same % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 17, 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_indexes", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "zero_or_one", "getproj4", "DEP_FUNC" ] -[ "=", "hashsize", "DEP_FUNC" ] -[ "sql_mul", "hashsize", "DEP_FUNC" ] -[ "<>", "heapsize", "DEP_FUNC" ] -[ "and", "heapsize", "DEP_FUNC" ] -[ "sql_add", "heapsize", "DEP_FUNC" ] -[ "sql_mul", "heapsize", "DEP_FUNC" ] -[ "=", "imprintsize", "DEP_FUNC" ] -[ "or", "imprintsize", "DEP_FUNC" ] -[ "sql_mul", "imprintsize", "DEP_FUNC" ] -[ "=", "ms_round", "DEP_FUNC" ] -[ "isnull", "ms_round", "DEP_FUNC" ] +% 17, 13, 8 # length [ "ms_trunc", "ms_round", "DEP_FUNC" ] -[ "not", "ms_round", "DEP_FUNC" ] -[ "or", "ms_round", "DEP_FUNC" ] -[ "round", "ms_round", "DEP_FUNC" ] -[ "<", "ms_stuff", "DEP_FUNC" ] -[ ">", "ms_stuff", "DEP_FUNC" ] -[ "concat", "ms_stuff", "DEP_FUNC" ] -[ "length", "ms_stuff", "DEP_FUNC" ] -[ "or", "ms_stuff", "DEP_FUNC" ] -[ "sql_add", "ms_stuff", "DEP_FUNC" ] -[ "sql_add", "ms_stuff", "DEP_FUNC" ] -[ "sql_sub", "ms_stuff", "DEP_FUNC" ] -[ "substring", "ms_stuff", "DEP_FUNC" ] -[ "pi", "radians", "DEP_FUNC" ] -[ "sql_div", "radians", "DEP_FUNC" ] -[ "sql_mul", "radians", "DEP_FUNC" ] [ "st_numgeometries", "st_numpatches", "DEP_FUNC" ] [ "st_geometryn", "st_patchn", "DEP_FUNC" ] [ "getproj4", "st_transform", "DEP_FUNC" ] [ "internaltransform", "st_transform", "DEP_FUNC" ] -[ "isnull", "st_transform", "DEP_FUNC" ] -[ "not", "st_transform", "DEP_FUNC" ] -[ "or", "st_transform", "DEP_FUNC" ] [ "st_srid", "st_transform", "DEP_FUNC" ] [ "columnsize", "storagemodel", "DEP_FUNC" ] [ "hashsize", "storagemodel", "DEP_FUNC" ] @@ -843,60 +699,17 @@ Cleanup % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 17, 31, 8 # length -[ "<", "ms_stuff", "DEP_FUNC" ] -[ "<>", "heapsize", "DEP_FUNC" ] -[ "=", "columnsize", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "=", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "=", "hashsize", "DEP_FUNC" ] -[ "=", "imprintsize", "DEP_FUNC" ] -[ "=", "ms_round", "DEP_FUNC" ] -[ ">", "ms_stuff", "DEP_FUNC" ] -[ "and", "heapsize", "DEP_FUNC" ] +% 17, 13, 8 # length [ "columnsize", "storagemodel", "DEP_FUNC" ] -[ "concat", "ms_stuff", "DEP_FUNC" ] [ "getproj4", "st_transform", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "hashsize", "storagemodel", "DEP_FUNC" ] [ "heapsize", "storagemodel", "DEP_FUNC" ] [ "imprintsize", "storagemodel", "DEP_FUNC" ] [ "internaltransform", "st_transform", "DEP_FUNC" ] -[ "isnull", "ms_round", "DEP_FUNC" ] -[ "isnull", "st_transform", "DEP_FUNC" ] -[ "left_shift", "columnsize", "DEP_FUNC" ] -[ "length", "ms_stuff", "DEP_FUNC" ] [ "ms_trunc", "ms_round", "DEP_FUNC" ] -[ "not", "ms_round", "DEP_FUNC" ] -[ "not", "st_transform", "DEP_FUNC" ] -[ "or", "imprintsize", "DEP_FUNC" ] -[ "or", "ms_round", "DEP_FUNC" ] -[ "or", "ms_stuff", "DEP_FUNC" ] -[ "or", "st_transform", "DEP_FUNC" ] -[ "pi", "degrees", "DEP_FUNC" ] -[ "pi", "radians", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "round", "ms_round", "DEP_FUNC" ] -[ "sql_add", "heapsize", "DEP_FUNC" ] -[ "sql_add", "ms_stuff", "DEP_FUNC" ] -[ "sql_add", "ms_stuff", "DEP_FUNC" ] -[ "sql_div", "degrees", "DEP_FUNC" ] -[ "sql_div", "radians", "DEP_FUNC" ] -[ "sql_mul", "columnsize", "DEP_FUNC" ] -[ "sql_mul", "degrees", "DEP_FUNC" ] -[ "sql_mul", "hashsize", "DEP_FUNC" ] -[ "sql_mul", "heapsize", "DEP_FUNC" ] -[ "sql_mul", "imprintsize", "DEP_FUNC" ] -[ "sql_mul", "radians", "DEP_FUNC" ] -[ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "sql_sub", "ms_stuff", "DEP_FUNC" ] [ "st_geometryn", "st_patchn", "DEP_FUNC" ] [ "st_numgeometries", "st_numpatches", "DEP_FUNC" ] [ "st_srid", "st_transform", "DEP_FUNC" ] -[ "substring", "ms_stuff", "DEP_FUNC" ] -[ "zero_or_one", "getproj4", "DEP_FUNC" ] #SELECT f.name, tri.name, 'DEP_TRIGGER' from functions as f, triggers as tri, dependencies as dep where dep.id = f.id AND dep.depend_id =tri.id AND dep.depend_type = 8; % sys.f, sys.tri, .L # table_name % name, name, single_value # name diff --git a/sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 b/sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 --- a/sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 +++ b/sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 @@ -118,8 +118,8 @@ Ready. % sys.L1 # table_name % L1 # name % wrd # type -% 3 # length -[ 106 ] +% 2 # length +[ 97 ] # 10:37:19 > # 10:37:19 > Done. _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
