Added suite_cache.

Refactored lots of code for suite parsing/building. (Acceptance) tests need rework due to changes in test execution ordering.
utPLSQL · jgebal · Nov 18, 2018 · Oct 30, 2018 · Nov 2, 2018 · Nov 4, 2018
commit f475b7cfea9d7e080b937c31ef88c9c2074ea566
diff --git a/source/core/annotations/ut_annotated_object.tps b/source/core/annotations/ut_annotated_object.tps
@@ -18,7 +18,7 @@ create type ut_annotated_object as object(
   object_owner                  varchar2(250),
   object_name                   varchar2(250),
   object_type                   varchar2(50),
-  parse_time                    date,
+  parse_time                    timestamp,
   annotations                   ut_annotations
 )
 /

diff --git a/source/core/annotations/ut_annotation_cache_info.sql b/source/core/annotations/ut_annotation_cache_info.sql
@@ -16,7 +16,7 @@ create table ut_annotation_cache_info (
   object_owner    varchar2(250) not null,
   object_name     varchar2(250) not null,
   object_type     varchar2(250) not null,
-  parse_time      date          not null,
+  parse_time      timestamp     not null,
   constraint ut_annotation_cache_info_pk primary key(cache_id),
   constraint ut_annotation_cache_info_uk unique (object_owner, object_name, object_type)
 ) organization index;

diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb
@@ -22,14 +22,14 @@ create or replace package body ut_annotation_cache_manager as
     pragma autonomous_transaction;
   begin
     update ut_annotation_cache_info i
-       set i.parse_time = sysdate
+       set i.parse_time = systimestamp
      where (i.object_owner, i.object_name, i.object_type)
         in ((a_object.object_owner, a_object.object_name, a_object.object_type))
       returning cache_id into l_cache_id;
     if sql%rowcount = 0 then
       insert into ut_annotation_cache_info
              (cache_id, object_owner, object_name, object_type, parse_time)
-      values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, sysdate)
+      values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, systimestamp)
         returning cache_id into l_cache_id;
     end if;
 
@@ -66,15 +66,15 @@ create or replace package body ut_annotation_cache_manager as
          on (o.object_name = i.object_name
              and o.object_type = i.object_type
              and o.object_owner = i.object_owner)
-     when matched then update set parse_time = sysdate
+     when matched then update set parse_time = systimestamp
      when not matched then insert
            (cache_id, object_owner, object_name, object_type, parse_time)
-     values (ut_annotation_cache_seq.nextval, o.object_owner, o.object_name, o.object_type, sysdate);
+     values (ut_annotation_cache_seq.nextval, o.object_owner, o.object_name, o.object_type, systimestamp);
 
     commit;
   end;
 
-  function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_date date) return sys_refcursor is
+  function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor is
     l_results     sys_refcursor;
   begin
     open l_results for q'[
@@ -92,9 +92,9 @@ create or replace package body ut_annotation_cache_manager as
         join ut_annotation_cache_info i
           on o.object_owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type
         join ut_annotation_cache c on i.cache_id = c.cache_id
-       where ]'|| case when a_parse_date is null then ':a_parse_date is null' else 'i.parse_time > :a_parse_date' end ||q'[
+       where ]'|| case when a_parse_time is null then ':a_parse_date is null' else 'i.parse_time > :a_parse_time' end ||q'[
        group by i.object_owner, i.object_name, i.object_type, i.parse_time]'
-    using a_cached_objects, a_parse_date;
+    using a_cached_objects, a_parse_time;
     return l_results;
   end;
 

diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks
@@ -32,7 +32,7 @@ create or replace package ut_annotation_cache_manager authid definer as
    *
    * @param a_cached_objects a `ut_annotation_objs_cache_info` list with information about objects to get from cache
    */
-  function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_date date) return sys_refcursor;
+  function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor;
 
   /**
    * Removes cached information about annotations for objects on the list and updates parse_time in cache info table.

diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb
@@ -19,7 +19,7 @@ create or replace package body ut_annotation_manager as
   ------------------------------
   --private definitions
 
-  function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotation_objs_cache_info is
+  function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotation_objs_cache_info is
     l_rows         sys_refcursor;
     l_ut_owner     varchar2(250) := ut_utils.ut_owner;
     l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects');
@@ -31,7 +31,7 @@ create or replace package body ut_annotation_manager as
                     object_owner => o.owner,
                     object_name => o.object_name,
                     object_type => o.object_type,
-                    needs_refresh => case when o.last_ddl_time < i.parse_time then 'N' else 'Y' end
+                    needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end
                   )
            from ]'||l_objects_view||q'[ o
            left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i
@@ -44,7 +44,7 @@ create or replace package body ut_annotation_manager as
       || case
            when a_parse_date is null
            then ':a_parse_date is null'
-           else 'o.last_ddl_time > :a_parse_date'
+           else 'o.last_ddl_time > cast(:a_parse_date as date)'
          end;
     open l_rows for l_cursor_text  using a_object_owner, a_object_type, a_parse_date;
     fetch l_rows bulk collect into l_result limit 1000000;
@@ -148,37 +148,17 @@ create or replace package body ut_annotation_manager as
 
 
   procedure rebuild_annotation_cache( a_object_owner varchar2, a_object_type varchar2, a_info_rows ut_annotation_objs_cache_info) is
-    l_objects_in_cache_count integer;
     l_objects_to_parse       ut_annotation_objs_cache_info := ut_annotation_objs_cache_info();
   begin
-    --get list of objects in cache
-    select count(1) into l_objects_in_cache_count
-      from table(a_info_rows) x where x.needs_refresh = 'N';
-
-    --if cache is empty and there are objects to parse
-    if l_objects_in_cache_count = 0 and a_info_rows.count > 0 then
+    select value(x)bulk collect into l_objects_to_parse from table(a_info_rows) x where x.needs_refresh = 'Y';
 
+    --if some source needs parsing and putting into cache
+    if l_objects_to_parse.count > 0 then
       build_annot_cache_for_sources(
         a_object_owner, a_object_type,
-        --all schema objects
-        get_sources_to_annotate(a_object_owner, a_object_type),
-        a_info_rows
+        get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_parse),
+        l_objects_to_parse
       );
-
-    --if not all in cache, get list of objects to rebuild cache for
-    elsif l_objects_in_cache_count < a_info_rows.count then
-
-      select value(x)bulk collect into l_objects_to_parse from table(a_info_rows) x where x.needs_refresh = 'Y';
-
-      --if some source needs parsing and putting into cache
-      if l_objects_to_parse.count > 0 then
-        build_annot_cache_for_sources(
-          a_object_owner, a_object_type,
-          get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_parse),
-          l_objects_to_parse
-        );
-      end if;
-
     end if;
   end;
 
@@ -194,7 +174,7 @@ create or replace package body ut_annotation_manager as
     );
   end;
 
-  function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotated_objects pipelined is
+  function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotated_objects pipelined is
     l_info_rows              ut_annotation_objs_cache_info;
     l_cursor                 sys_refcursor;
     l_results                ut_annotated_objects;

diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks
@@ -30,7 +30,7 @@ create or replace package ut_annotation_manager authid current_user as
    * @param a_parse_date   date when object was last parsed
    * @return array containing annotated objects along with annotations for each object (nested)
    */
-  function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotated_objects pipelined;
+  function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotated_objects pipelined;
 
   /**
    * Rebuilds annotation cache for a specified schema and object type.

diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb
@@ -21,7 +21,7 @@ create or replace type body ut_logical_suite as
   ) return self as result is
   begin
     self.self_type := $$plsql_unit;
-    self.init(a_object_owner, a_object_name, a_name, 0);
+    self.init(a_object_owner, a_object_name, a_name, null);
     self.path := a_path;
     self.disabled_flag := ut_utils.boolean_to_int(false);
     self.items := ut_suite_items();
@@ -33,10 +33,26 @@ create or replace type body ut_logical_suite as
     return true;
   end;
 
-  member procedure add_item(self in out nocopy ut_logical_suite, a_item ut_suite_item) is
+  overriding member procedure add_item(
+    self in out nocopy ut_logical_suite,
+    a_item ut_suite_item,
+    a_expected_level integer := 1,
+    a_current_level integer :=1
+  ) is
   begin
-    self.items.extend;
-    self.items(self.items.last) := a_item;
+    if a_expected_level > a_current_level then
+      if self.items.last is not null then
+        self.items(self.items.last).add_item(a_item, a_expected_level, a_current_level+1);
+      else
+        raise_application_error(-20000, 'cannot add suite item to sub suite at level '||a_expected_level||'. suite items at level '||a_current_level||' are empty');
+      end if;
+    else
+      if self.items is null then
+        self.items := ut_suite_items();
+      end if;
+      self.items.extend;
+      self.items(self.items.last) := a_item;
+    end if;
   end;
 
   overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite) is

diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps
@@ -25,7 +25,12 @@ create or replace type ut_logical_suite under ut_suite_item (
     self in out nocopy ut_logical_suite, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_path varchar2
   ) return self as result,
   member function is_valid(self in out nocopy ut_logical_suite) return boolean,
-  member procedure add_item(self in out nocopy ut_logical_suite, a_item ut_suite_item),
+  overriding member procedure add_item(
+    self in out nocopy ut_logical_suite,
+    a_item ut_suite_item,
+    a_expected_level integer := 1,
+    a_current_level integer :=1
+  ),
   overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite),
   overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer),
   overriding member function  do_execute(self in out nocopy ut_logical_suite) return boolean,

diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb
@@ -51,6 +51,16 @@ create or replace type body ut_run as
     null;
   end;
 
+  overriding member procedure add_item(
+    self in out nocopy ut_run,
+    a_item ut_suite_item,
+    a_expected_level integer := 1,
+    a_current_level integer :=1
+  ) is
+  begin
+    raise_application_error(-20000, 'Cannot add a suite item to ut_run');
+  end;
+
   overriding member function do_execute(self in out nocopy ut_run) return boolean is
     l_completed_without_errors boolean;
   begin

diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps
@@ -36,6 +36,12 @@ create or replace type ut_run under ut_suite_item (
     a_client_character_set  varchar2 := null
   ) return self as result,
   overriding member procedure mark_as_skipped(self in out nocopy ut_run),
+  overriding member procedure add_item(
+    self in out nocopy ut_run,
+    a_item ut_suite_item,
+    a_expected_level integer := 1,
+    a_current_level integer :=1
+  ),
   overriding member function  do_execute(self in out nocopy ut_run) return boolean,
   overriding member procedure calc_execution_result(self in out nocopy ut_run),
   overriding member procedure mark_as_errored(self in out nocopy ut_run, a_error_stack_trace varchar2),

diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps
@@ -52,7 +52,7 @@ create or replace type ut_suite_item force under ut_event_item (
   /**
   * Time when the suite item was last parsed from package source
   */
-  parse_time    date,
+  parse_time    timestamp,
   --execution result fields
   start_time    timestamp with time zone,
   end_time      timestamp with time zone,
@@ -63,6 +63,12 @@ create or replace type ut_suite_item force under ut_event_item (
   member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_line_no integer),
   member function get_disabled_flag return boolean,
   not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item),
+  not instantiable member procedure add_item(
+    self in out nocopy ut_suite_item,
+    a_item ut_suite_item,
+    a_expected_level integer := 1,
+    a_current_level integer :=1
+  ),
   member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer),
   member function get_rollback_type return integer,
   member function create_savepoint_if_needed return varchar2,

diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb
@@ -34,6 +34,16 @@ create or replace type body ut_test as
     return;
   end;
 
+  overriding member procedure add_item(
+    self in out nocopy ut_test,
+    a_item ut_suite_item,
+    a_expected_level integer := 1,
+    a_current_level integer :=1
+  ) is
+  begin
+    raise_application_error(-20000, 'Cannot add a suite item to ut_test');
+  end;
+
   overriding member procedure mark_as_skipped(self in out nocopy ut_test) is
   begin
     ut_event_manager.trigger_event(ut_utils.gc_before_test, self);

diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps
@@ -60,6 +60,12 @@ create or replace type ut_test under ut_suite_item (
     a_line_no integer, a_expected_error_codes ut_integer_list := null
   ) return self as result,
   overriding member procedure mark_as_skipped(self in out nocopy ut_test),
+  overriding member procedure add_item(
+    self in out nocopy ut_test,
+    a_item ut_suite_item,
+    a_expected_level integer := 1,
+    a_current_level integer :=1
+  ),
   overriding member function do_execute(self in out nocopy ut_test) return boolean,
   overriding member procedure calc_execution_result(self in out nocopy ut_test),
   overriding member procedure mark_as_errored(self in out nocopy ut_test, a_error_stack_trace varchar2),