Reworking annotation cache - not to use cast(Collect()) on dba_source.

Added filtering of dba_source by test containing annotations. Added cardinality hint with scaling. Removed public procedure `config_package` - used only for one unit test. Fixed naming of procedures. Performance improvements on collections.
utPLSQL · jgebal · Oct 26, 2017 · Oct 6, 2017 · Oct 6, 2017 · Oct 7, 2017
commit 4ec9eb594af2eaec961e90a9ab0b6773b251ef0b
diff --git a/development/cleanup.sh b/development/cleanup.sh
@@ -15,9 +15,10 @@ drop user ${UT3_USER} cascade;
 begin
   for i in (
     select decode(owner,'PUBLIC','drop public synonym "','drop synonym "'||owner||'"."')|| synonym_name ||'"' drop_orphaned_synonym from dba_synonyms a
-     where not exists (select null from dba_objects b where a.table_name=b.object_name and a.table_owner=b.owner )
-       and a.table_owner <> 'SYS'
+     where not exists (select 1 from dba_objects b where (a.table_name=b.object_name and a.table_owner=b.owner or b.owner='SYS' and a.table_owner=b.object_name) )
+       and a.table_owner not in ('SYS','SYSTEM')
   ) loop
+    dbms_output.put_line(i.drop_orphaned_synonym);
     execute immediate i.drop_orphaned_synonym;
   end loop;
 end;

diff --git a/examples/demo_of_expectations/demo_equal_matcher.sql b/examples/demo_of_expectations/demo_equal_matcher.sql
@@ -36,10 +36,6 @@ create or replace package demo_equal_matcher as
     -- %displayname(Gives success when comparing null actual to a null expected)
     procedure object_compare_null_both_ok;
 
-    -- %test
-    -- %displayname(Gives failure when comparing null actual to a null expected, setting null equal to false)
-    procedure object_compare_null_both_fail;
-
     -- %test
     -- %displayname(Gives failure when comparing identical objects containing different data)
     procedure object_compare_different_data;
@@ -94,14 +90,6 @@ create or replace package body demo_equal_matcher as
     ut.expect(anydata.convertObject(l_actual)).to_equal(anydata.convertObject(l_expected));
   end;
 
-  procedure object_compare_null_both_fail is
-    l_expected demo_department;
-    l_actual   demo_department;
-  begin
-    ut.expect(anydata.convertObject(l_actual)).to_equal(anydata.convertObject(l_expected),false);
-  end;
-
-
   procedure object_compare_different_data is
     l_expected demo_department;
     l_actual   demo_department;

diff --git a/examples/developer_examples/RunExampleTestAnnotationsParsingTimeHugePackage.sql b/examples/developer_examples/RunExampleTestAnnotationsParsingTimeHugePackage.sql
@@ -6,9 +6,9 @@ set echo off
 @@tst_pkg_huge.pks
 
 declare
-  l_suite ut_logical_suite;
+  l_suites ut_suite_items;
 begin
-  l_suite := ut_suite_manager.config_package(a_owner_name => USER,a_object_name => 'TST_PKG_HUGE');
+  l_suites := ut_suite_manager.configure_execution_by_path(USER||'.TST_PKG_HUGE');
 end;
 /
 

diff --git a/old_tests/RunAll.sql b/old_tests/RunAll.sql
@@ -328,6 +328,8 @@ begin
     'source/core/types',
     'source/core/annotations/ut_annotation_parser.pkb',
     'source/core/annotations/ut_annotation_parser.pks',
+    'source/core/annotations/ut_annotation_cache_manager.pkb',
+    'source/core/annotations/ut_annotation_cache_manager.pks',
     'source/core/ut_expectation_processor.pkb',
     'source/core/ut_expectation_processor.pks',
     'source/core/ut_file_mapper.pkb',

diff --git a/source/core/annotations/ut_annotated_object.tps b/source/core/annotations/ut_annotated_object.tps
@@ -1,4 +1,20 @@
 create type ut_annotated_object as object(
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
   object_owner                  varchar2(250),
   object_name                   varchar2(250),
   object_type                   varchar2(50),

diff --git a/source/core/annotations/ut_annotated_objects.tps b/source/core/annotations/ut_annotated_objects.tps
@@ -1,3 +1,20 @@
-create type ut_annotated_objects as table of ut_annotated_object
+create type ut_annotated_objects as
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+table of ut_annotated_object
 /
 
diff --git a/source/core/annotations/ut_annotation.tps b/source/core/annotations/ut_annotation.tps
@@ -1,4 +1,20 @@
 create type ut_annotation as object(
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
   position           number(5,0),
   name               varchar2(1000),
   text               varchar2(4000),

diff --git a/source/core/annotations/ut_annotation_cache.sql b/source/core/annotations/ut_annotation_cache.sql
@@ -1,12 +1,23 @@
 create table ut_annotation_cache (
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
   cache_id                      number(20,0)   not null,
   annotation_position           number(5,0)    not null,
   annotation_name               varchar2(1000) not null,
   annotation_text               varchar2(4000),
   subobject_name                varchar2(250),
---   subobject_name_not_null       varchar2(250) generated always as (nvl(subobject_name,'null')) not null,
   constraint ut_annotation_cache_pk primary key(cache_id, annotation_position),
---   constraint ut_annotation_cache_pk primary key(cache_id, annotation_position, subobject_name_not_null),
   constraint ut_annotation_cache_fk foreign key(cache_id) references ut_annotation_cache_info(cache_id) on delete cascade
 );
 

diff --git a/source/core/annotations/ut_annotation_cache_info.sql b/source/core/annotations/ut_annotation_cache_info.sql
@@ -1,12 +1,23 @@
 create table ut_annotation_cache_info (
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
   cache_id        number(20,0)  not null,
   object_owner    varchar2(250) not null,
   object_name     varchar2(250) not null,
   object_type     varchar2(250) not null,
   parse_time      date          not null,
-  is_annotated    varchar2(1)   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),
-  constraint ut_annotation_cache_info_ck1 check (is_annotated in ('Y','N'))
+  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
@@ -1,33 +1,42 @@
 create or replace package body ut_annotation_cache_manager as
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
 
-  procedure update_cache(a_object ut_annotated_object, a_cache_id integer) is
-    l_is_annotated   varchar2(1);
-    v_cache_id       integer := a_cache_id;
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+
+  procedure update_cache(a_object ut_annotated_object) is
+    v_cache_id       integer;
     l_current_schema varchar2(250) := ut_utils.ut_owner;
     pragma autonomous_transaction;
   begin
-    if a_object.annotations is not null and a_object.annotations.count > 0 then
-      l_is_annotated := 'Y';
-    else
-      l_is_annotated := 'N';
-    end if;
-
-    if v_cache_id is not null then
-      update ut_annotation_cache_info i
-         set i.parse_time = sysdate,
-             i.is_annotated = l_is_annotated
-       where i.cache_id = v_cache_id;
-    else
+    update ut_annotation_cache_info i
+       set i.parse_time = sysdate
+     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 v_cache_id;
+    if sql%rowcount = 0 then
       insert into ut_annotation_cache_info
-             (cache_id, object_owner, object_name, object_type, parse_time, is_annotated)
-      values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, sysdate, l_is_annotated)
+             (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)
         returning cache_id into v_cache_id;
     end if;
 
     delete from ut_annotation_cache c
       where cache_id = v_cache_id;
 
-    if l_is_annotated = 'Y' then
+    if a_object.annotations is not null and a_object.annotations.count > 0 then
 --       begin
       insert into ut_annotation_cache
              (cache_id, annotation_position, annotation_name, annotation_text, subobject_name)
@@ -43,5 +52,51 @@ create or replace package body ut_annotation_cache_manager as
     commit;
   end;
 
-end;
+
+  procedure cleanup_cache(a_objects ut_annotation_cached_objects) is
+    pragma autonomous_transaction;
+  begin
+
+    delete from ut_annotation_cache c
+     where c.cache_id
+        in (select i.cache_id
+              from ut_annotation_cache_info i
+              join table (a_objects) o
+             using (object_name, object_type, object_owner)
+           );
+
+    merge into ut_annotation_cache_info i
+      using (select o.object_name, o.object_type, o.object_owner
+               from table(a_objects) o ) o
+         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 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);
+
+    commit;
+  end;
+
+  function get_annotations_for_objects(a_cached_objects ut_annotation_cached_objects) return sys_refcursor is
+    l_results     sys_refcursor;
+  begin
+    open l_results for
+      select ut_annotated_object(
+               o.object_owner, o.object_name, o.object_type,
+               cast(
+                 collect(
+                   ut_annotation(
+                     c.annotation_position, c.annotation_name, c.annotation_text, c.subobject_name
+                   ) order by c.annotation_position
+                 ) as ut_annotations
+               )
+             )
+        from table(a_cached_objects) o
+        join ut_annotation_cache c on o.cache_id = c.cache_id
+       group by o.object_owner, o.object_name, o.object_type;
+    return l_results;
+  end;
+end ut_annotation_cache_manager;
 /
diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks
@@ -1,6 +1,26 @@
 create or replace package ut_annotation_cache_manager authid definer as
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
 
-  procedure update_cache(a_object ut_annotated_object, a_cache_id integer);
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+
+  procedure update_cache(a_object ut_annotated_object);
+
+  function get_annotations_for_objects(a_cached_objects ut_annotation_cached_objects) return sys_refcursor;
+
+  procedure cleanup_cache(a_objects ut_annotation_cached_objects);
 
 end;
 /
diff --git a/source/core/annotations/ut_annotation_cache_seq.sql b/source/core/annotations/ut_annotation_cache_seq.sql
@@ -1,2 +1,16 @@
-create sequence ut_annotation_cache_seq cache 20
-/
+create sequence ut_annotation_cache_seq
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+cache 20;
+
diff --git a/source/core/annotations/ut_annotation_cached_object.tps b/source/core/annotations/ut_annotation_cached_object.tps
@@ -0,0 +1,24 @@
+create type ut_annotation_cached_object as object(
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+    object_owner   varchar2(250),
+    object_name    varchar2(250),
+    object_type    varchar2(250),
+    needs_refresh  varchar2(1),
+    cache_id       number(20,0)
+  )
+/
diff --git a/source/core/annotations/ut_annotation_cached_objects.tps b/source/core/annotations/ut_annotation_cached_objects.tps
@@ -0,0 +1,19 @@
+create type ut_annotation_cached_objects as
+  /*
+  utPLSQL - Version X.X.X.X
+  Copyright 2016 - 2017 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+table of ut_annotation_cached_object
+/