Peer review changes

lwasylow · lwasylow · commit 6ff7f38ba80a · 2022-04-12T23:14:15.000+01:00
diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
@@ -19,12 +19,11 @@ create or replace package body ut_suite_cache_manager is
   /*
   * Private code
   */
-
-  gc_get_bulk_cache_suite_sql    constant varchar2(32767) :=
-    q'[with  
+  cursor c_get_bulk_cache_suite(cp_suite_items in ut_suite_cache_rows) is
+    with  
       suite_items as (
         select  /*+ cardinality(c 500) */ value(c) as obj
-          from table(:suite_items) c),
+          from table(cp_suite_items) c),
       suitepaths as (
         select distinct substr(c.obj.path,1,instr(c.obj.path,'.',-1)-1) as suitepath,
                         c.obj.path as path,
@@ -65,9 +64,9 @@ create or replace package body ut_suite_cache_manager is
                ) as obj
           from logical_suite_data s
       )
-      select /*+ no_parallel */obj from suite_items
+      select /*+ no_parallel */ obj from suite_items
       union all
-      select /*+ no_parallel */ obj from logical_suites]';
+      select /*+ no_parallel */ obj from logical_suites;
 
   function get_missing_cache_objects(a_object_owner varchar2) return ut_varchar2_rows is
     l_result       ut_varchar2_rows;
@@ -126,6 +125,9 @@ create or replace package body ut_suite_cache_manager is
     
     Fourth SQL cover scenario where suitepath is populated with no filters
   */   
+
+  --TODO: Przenies w osobny with clause z nazwami jako opis.
+  -- i with clause na tablice.
   function expand_paths(a_schema_paths ut_path_items) return ut_path_items is
     l_schema_paths ut_path_items:= ut_path_items();
   begin   
@@ -310,26 +312,21 @@ create or replace package body ut_suite_cache_manager is
     a_tags             ut_varchar2_rows := null
   ) return ut_suite_cache_rows is
     l_results         ut_suite_cache_rows := ut_suite_cache_rows();
-    l_results2         ut_suite_cache_rows := ut_suite_cache_rows();
     l_suite_items     ut_suite_cache_rows := ut_suite_cache_rows();
     l_schema_paths    ut_path_items;
     l_tags            ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows());
-    l_sql             varchar2(32767);
   begin     
 
     l_schema_paths := a_schema_paths;
-    l_sql := gc_get_bulk_cache_suite_sql;
     l_suite_items := get_suite_items(a_schema_paths);
     if l_tags.count > 0 then
       l_suite_items := get_tags_suites(l_suite_items,l_tags);
     end if;
-    ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) );
-       
-    execute immediate l_sql
-      bulk collect into l_results
-      using l_suite_items;
+    
+    open c_get_bulk_cache_suite(l_suite_items);
+    fetch c_get_bulk_cache_suite bulk collect into l_results;
+    close c_get_bulk_cache_suite;
       
-    sort_and_randomize_tests(l_results,a_random_seed);
     return l_results;
   end;
     
diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks
@@ -40,6 +40,15 @@ create or replace package ut_suite_cache_manager authid definer is
   */
   procedure remove_missing_objs_from_cache(a_schema_name varchar2);
 
+  /*
+  *  We will sort a suites in hierarchical structure.
+  *  Sorting from bottom to top so when we consolidate
+  *  we will go in proper order.
+  */
+  procedure sort_and_randomize_tests(
+    a_suite_rows in out ut_suite_cache_rows,
+    a_random_seed  positive := null);
+
   /*
   * Retrieves suite items data from cache.
   * Returned data is not filtered by user access rights.
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -295,7 +295,8 @@ create or replace package body ut_suite_manager is
     end loop;
     close a_suite_data_cursor;
   end reconstruct_from_cache;
-
+  
+  --TODO: daj do public ut_suite_cache_rows i zmienic na SQL
   function get_filtered_cursor(
     a_unfiltered_rows in ut_suite_cache_rows,
     a_skip_all_objects boolean  := false
@@ -306,26 +307,21 @@ create or replace package body ut_suite_manager is
     if ut_metadata.user_has_execute_any_proc() or a_skip_all_objects then
       l_result := a_unfiltered_rows;
     else
-      for i in (
-          select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c
-            where sys_context( 'userenv', 'current_user' ) = upper(c.object_owner)
-          union all
-          select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c
-            where sys_context( 'userenv', 'current_user' ) != upper(c.object_owner)
-            and ( exists
-              ( select 1
-                  from all_objects a
-                  where a.object_name = c.object_name
-                    and a.owner       = c.object_owner
-                    and a.object_type = 'PACKAGE'
-              )
-            or c.self_type = 'UT_LOGICAL_SUITE'))
-      loop
-        l_result.extend;
-        l_result(l_result.last) := ut_suite_cache_row(i.id,i.self_type,i.path,i.object_owner,i.object_name,i.name,i.line_no,i.parse_time,
-          i.description,i.rollback_type,i.disabled_flag,i.disabled_reason,i.warnings,i.before_all_list,i.after_all_list,i.before_each_list,
-          i.before_test_list,i.after_each_list,i.after_test_list,i.expected_error_codes,i.tags,i.item);
-      end loop;
+      select obj bulk collect into l_result
+      from (
+        select /*+ no_parallel */  value(c) as obj from table(a_unfiltered_rows) c
+          where sys_context( 'userenv', 'current_user' ) = upper(c.object_owner)
+        union all
+        select /*+ no_parallel */ value(c) as obj from table(a_unfiltered_rows) c
+          where sys_context( 'userenv', 'current_user' ) != upper(c.object_owner)
+          and ( exists
+           ( select 1
+               from all_objects a
+               where a.object_name = c.object_name
+               and a.owner       = c.object_owner
+               and a.object_type = 'PACKAGE'
+            )
+          or c.self_type = 'UT_LOGICAL_SUITE'));
     end if; 
     return l_result;
   end;
@@ -373,6 +369,8 @@ create or replace package body ut_suite_manager is
     l_filtered_rows := get_filtered_cursor(l_unfiltered_rows,a_skip_all_objects);
     reconcile_paths_and_suites(a_schema_paths,l_filtered_rows);
     
+    ut_suite_cache_manager.sort_and_randomize_tests(l_filtered_rows,a_random_seed);
+
     open l_result for 
       select * from table(l_filtered_rows);
     return l_result;
diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks
@@ -39,6 +39,7 @@ create or replace package ut_suite_manager authid current_user is
    * @return array containing root suites-ready to be executed
    *
    */
+  --TODO:Zerknij czy mozna wywalic 
   function configure_execution_by_path(a_paths ut_varchar2_list, a_random_seed positive := null) return ut_suite_items;
 
   /**
diff --git a/source/create_grants.sql b/source/create_grants.sql
@@ -60,6 +60,7 @@ grant execute on &&ut3_owner..ut_file_mapping to &ut3_user;
 grant execute on &&ut3_owner..ut_file_mapper to &ut3_user;
 grant execute on &&ut3_owner..ut_suite_items_info to &ut3_user;
 grant execute on &&ut3_owner..ut_suite_item_info to &ut3_user;
+grant execute on &&ut3_owner..ut_suite_cache_rows to &ut3_user;
 grant execute on &&ut3_owner..ut_run_info to &ut3_user;
 grant execute on &&ut3_owner..ut_coverage_options to &ut3_user;
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ create or replace package ut_suite_manager authid current_user is`
`39`	`39`	`* @return array containing root suites-ready to be executed`
`40`	`40`	`*`
`41`	`41`	`*/`
	`42`	`+ --TODO:Zerknij czy mozna wywalic`
`42`	`43`	`function configure_execution_by_path(a_paths ut_varchar2_list, a_random_seed positive := null) return ut_suite_items;`
`43`	`44`
`44`	`45`	`/**`