Phase 2 : switch to varchar_rows()

lwasylow · lwasylow · commit ddf3a7f60803 · 2019-04-26T06:42:37.000+01:00
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -99,6 +99,7 @@ create or replace package body ut_runner is
     l_include_object_names    ut_object_names;
     l_paths                   ut_varchar2_list := ut_varchar2_list();
     l_random_test_order_seed  positive;
+    l_tags                    ut_varchar2_rows := ut_varchar2_rows();
   begin
     ut_event_manager.initialize();
     if a_reporters is not empty then
@@ -139,7 +140,12 @@ create or replace package body ut_runner is
       if a_exclude_objects is not empty then
         l_exclude_object_names := to_ut_object_list(a_exclude_objects, l_coverage_schema_names);
       end if;
-
+       
+      if a_tags is not null then
+        l_tags := l_tags multiset union distinct ut_utils.convert_collection( 
+          ut_utils.filter_list(ut_utils.string_to_table(a_tags,','),'^(\w|\S)+$')
+        );
+      end if;
       l_exclude_object_names := l_exclude_object_names multiset union all ut_suite_manager.get_schema_ut_packages(l_coverage_schema_names);
 
       l_include_object_names := to_ut_object_list(a_include_objects, l_coverage_schema_names);
@@ -154,10 +160,10 @@ create or replace package body ut_runner is
         set(a_test_file_mappings),
         a_client_character_set,
         l_random_test_order_seed,
-        a_tags
+        l_tags
       );
 
-      ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, a_tags);
+      ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, l_tags);
       if a_force_manual_rollback then
         l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true );
       end if;
diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps
@@ -22,6 +22,7 @@ create or replace type ut_suite_item_info as object (
   item_type        varchar2( 250 ), -- the type of item (UT_SUITE/UT_SUITE_CONTEXT/UT_TEST)
   item_line_no     integer,         -- line_number where annotation identifying the item exists
   path             varchar2( 4000 ),-- suitepath of the item
-  disabled_flag    integer          -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation
+  disabled_flag    integer,          -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation
+  tags             varchar2(4000)
 )
 /
diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb
@@ -27,7 +27,7 @@ create or replace type body ut_run as
     a_test_file_mappings     ut_file_mappings := null,
     a_client_character_set   varchar2 := null,
     a_random_test_order_seed positive := null,
-    a_run_tags               varchar2 := null
+    a_run_tags               ut_varchar2_rows := null
   ) return self as result is
   begin
     self.run_paths := a_run_paths;
diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps
@@ -21,7 +21,7 @@ create or replace type ut_run under ut_suite_item (
   project_name                   varchar2(4000),
   items                          ut_suite_items,
   run_paths                      ut_varchar2_list,
-  run_tags                       varchar2(4000),
+  run_tags                       ut_varchar2_rows,
   coverage_options               ut_coverage_options,
   test_file_mappings             ut_file_mappings,
   client_character_set           varchar2(100),
@@ -37,7 +37,7 @@ create or replace type ut_run under ut_suite_item (
     a_test_file_mappings     ut_file_mappings := null,
     a_client_character_set   varchar2 := null,
     a_random_test_order_seed positive := null,
-    a_run_tags               varchar2 := null
+    a_run_tags               ut_varchar2_rows := null
   ) return self as result,
   overriding member procedure mark_as_skipped(self in out nocopy ut_run),
   overriding member function  do_execute(self in out nocopy ut_run) return boolean,
diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb
@@ -18,15 +18,15 @@ create or replace type body ut_suite  as
 
   constructor function ut_suite (
     self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer,
-    a_tags varchar2 := null
+    a_tags ut_varchar2_rows := null
   ) return self as result is
   begin
     self.self_type := $$plsql_unit;
     self.init(a_object_owner, a_object_name, a_object_name, a_line_no);
     self.items := ut_suite_items();
     before_all_list := ut_executables();
     after_all_list  := ut_executables();
-    self.tags       := a_tags;
+    self.tags       := coalesce(a_tags,ut_varchar2_rows());
     return;
   end;
 
diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps
@@ -28,7 +28,7 @@ create or replace type ut_suite  under ut_logical_suite (
   after_all_list ut_executables,
   constructor function ut_suite (
     self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer,
-    a_tags varchar2 := null
+    a_tags ut_varchar2_rows := null
   ) return self as result,
   overriding member function do_execute(self in out nocopy ut_suite) return boolean,
   overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list,
diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps
@@ -63,7 +63,7 @@ create or replace type ut_suite_item force under ut_event_item (
     /**
   * Hold list of tags assign to test
   */
-  tags varchar2(4000),
+  tags ut_varchar2_rows,
   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),
diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb
@@ -18,7 +18,7 @@ create or replace type body ut_test as
 
   constructor function ut_test(
     self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2,
-    a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null
+    a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags ut_varchar2_rows := null
   ) return self as result is
   begin
     self.self_type := $$plsql_unit;
@@ -31,7 +31,7 @@ create or replace type body ut_test as
     self.all_expectations     := ut_expectation_results();
     self.failed_expectations  := ut_expectation_results();
     self.expected_error_codes := a_expected_error_codes;
-    self.tags                 := a_tags;
+    self.tags                 := coalesce(a_tags,ut_varchar2_rows());
     return;
   end;
 
diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps
@@ -57,7 +57,7 @@ create or replace type ut_test force under ut_suite_item (
   expected_error_codes  ut_integer_list,
   constructor function ut_test(
     self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2,
-    a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null
+    a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags ut_varchar2_rows := null
   ) return self as result,
   overriding member procedure mark_as_skipped(self in out nocopy ut_test),
   overriding member function do_execute(self in out nocopy ut_test) return boolean,
diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb
@@ -309,7 +309,7 @@ create or replace package body ut_suite_builder is
 
   procedure add_tags_to_test(
     a_suite           in out nocopy ut_suite,
-    a_list            in out nocopy varchar2,
+    a_list            in out nocopy ut_varchar2_rows,
     a_procedure_name  t_object_name,
     a_tags_ann_text tt_annotation_texts
   ) is
@@ -328,10 +328,8 @@ create or replace package body ut_suite_builder is
           ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',')
           );
       end if;
-      --remove empty strings from table list e.g. tag1,,tag2
-      a_list := ut_utils.table_to_clob(
-        ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'),
-        ',');
+      --remove empty strings from table list e.g. tag1,,tag2 and conver to rows        
+      a_list := ut_utils.convert_collection( ut_utils.filter_list(l_tag_list,'^(\w|\S)+$') ); 
       l_annotation_pos := a_tags_ann_text.next(l_annotation_pos);
     end loop;
     
@@ -643,9 +641,7 @@ create or replace package body ut_suite_builder is
       l_annotation_pos := a_tags_ann_text.next(l_annotation_pos);
     end loop;
     --remove empty strings from table list e.g. tag1,,tag2
-    a_suite.tags := ut_utils.table_to_clob(
-      ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'),
-      ',');    
+    a_suite.tags := ut_utils.convert_collection(ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'));    
   end;
   
   procedure add_suite_tests(
diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql
@@ -47,6 +47,7 @@ create table ut_suite_cache (
   nested table before_test_list store as ut_suite_cache_before_test
   nested table after_test_list store as ut_suite_cache_after_test
   nested table expected_error_codes store as ut_suite_cache_throws
+  nested table tags store as ut_suite_cache_tags return as locator
   as
     select
            cast(null as number(22)) id,
diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
@@ -134,19 +134,6 @@ create or replace package body ut_suite_cache_manager is
                s.t.item as item
           from tests s;
                 
-        --TODO : Optimize to use only inserted
-        merge into ut_suite_cache_tag tgt
-        using ( select /*+cardinality (tt 100) */ t.id,tt.column_value tag
-                from ut_suite_cache t, 
-                table(ut_utils.convert_collection((ut_utils.string_to_table(t.tags,',')))) tt
-                where tt.column_value is not null  ) src
-        on ( tgt.suiteid = src.id and tgt.tagname = src.tag)
-        when not matched then
-        insert 
-        (suiteid, tagname )
-        values
-        (src.id, src.tag);
-
       end if;
     end if;
     commit;
diff --git a/source/core/ut_suite_cache_tag.sql b/source/core/ut_suite_cache_tag.sql
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -299,7 +299,6 @@ create or replace package body ut_suite_manager is
   begin
     loop
       fetch a_suite_data_cursor bulk collect into l_rows limit c_bulk_limit;
-
       l_idx := l_rows.first;
       while l_idx is not null loop
         l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1;
@@ -364,13 +363,14 @@ create or replace package body ut_suite_manager is
     a_procedure_name   varchar2 := null,
     a_skip_all_objects boolean  := false,
     a_random_seed      positive,
-    a_tags             varchar2 := null
+    a_tags             ut_varchar2_rows := null
   ) return t_cached_suites_cursor is
     l_path     varchar2( 4000 );
     l_result   sys_refcursor;
     l_ut_owner varchar2(250) := ut_utils.ut_owner;
     l_sql      varchar2(32767);
     l_suite_item_name varchar2(20);
+    l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows());
   begin
     if a_path is null and a_object_name is not null then    
       execute immediate 'select min(path)
@@ -382,7 +382,7 @@ create or replace package body ut_suite_manager is
     else
       l_path := lower( a_path );
     end if;
-    l_suite_item_name := case when a_tags is not null then 'suite_items_tags' else 'suite_items' end;
+    l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end;
     
     l_sql :=
     q'[with
@@ -413,14 +413,13 @@ create or replace package body ut_suite_manager is
                         )
                    )
       ),]'
-      ||case when a_tags is not null then
-      q'[ filter_tags as (
-       select s.* from suite_items s
-       where exists 
-         ( select 1 
-           from ]'||l_ut_owner||q'[.ut_suite_cache_tag ct 
-           where ct.suiteid = s.id and regexp_like(:a_tag_list,'(^|,){1}'||ct.tagname||'(,|$){1}') )
-       ),
+      ||case when l_tags.count > 0 then
+      q'[ 
+      filter_tags as (
+        select c.*
+        from suite_items c
+        where c.tags multiset intersect :a_tag_list is not empty
+      ),
        suite_items_tags as (
        select c.* from suite_items c
        where exists (select 1 from filter_tags t where 
@@ -497,7 +496,7 @@ create or replace package body ut_suite_manager is
                 c.path, :a_random_seed
               ) desc nulls last'
           end;   
-    open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), a_tags, a_random_seed;
+    open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed;
     return l_result;
   end;
 
@@ -585,7 +584,7 @@ create or replace package body ut_suite_manager is
     a_procedure_name varchar2 := null,
     a_suites         in out nocopy ut_suite_items,
     a_random_seed    positive,
-    a_tags           varchar2 := null
+    a_tags           ut_varchar2_rows := null
   ) is
   begin
     refresh_cache(a_owner_name);
@@ -693,9 +692,10 @@ create or replace package body ut_suite_manager is
     a_suite_path in varchar2,
     a_procedure_name in varchar2,
     a_object_name in varchar2,
-    a_tags in varchar2    
+    a_tags in ut_varchar2_rows    
     ) return varchar2 is
     l_error_msg varchar2(500);
+    l_tags clob:= ut_utils.table_to_clob(coalesce(a_tags,ut_varchar2_rows()),',');
   begin
     if a_suite_path is not null then 
       l_error_msg := 'No suite packages found for path '||a_schema_name||':'||a_suite_path;
@@ -706,9 +706,9 @@ create or replace package body ut_suite_manager is
     end if;
     
     if l_error_msg is null and a_tags is not null then
-      l_error_msg := 'No tests found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg);
+      l_error_msg := 'No tests found for tags: '||ut_utils.to_string(l_tags,a_max_output_len => gc_tag_errmsg);
     elsif l_error_msg is not null and a_tags is not null then
-      l_error_msg := l_error_msg||' with tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg);
+      l_error_msg := l_error_msg||' with tags: '||ut_utils.to_string(l_tags,a_max_output_len => gc_tag_errmsg);
     end if;
     
     l_error_msg := l_error_msg ||'.';
@@ -720,7 +720,7 @@ create or replace package body ut_suite_manager is
     a_paths in ut_varchar2_list,
     a_suites out nocopy ut_suite_items,
     a_random_seed in positive := null,
-    a_tags varchar2 := null
+    a_tags ut_varchar2_rows := null
   ) is
     l_paths              ut_varchar2_list := a_paths;
     l_path_items         t_path_items;
@@ -768,6 +768,7 @@ create or replace package body ut_suite_manager is
 
   end configure_execution_by_path;
 
+  --TODO : add tags
   function get_suites_info(
     a_owner_name     varchar2, 
     a_package_name   varchar2 := null
diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks
@@ -50,7 +50,7 @@ create or replace package ut_suite_manager authid current_user is
     a_paths       in ut_varchar2_list,
     a_suites      out nocopy ut_suite_items,
     a_random_seed in positive := null,
-    a_tags        varchar2 := null
+    a_tags        ut_varchar2_rows := null
   );
 
   /**
diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql
@@ -93,7 +93,6 @@ grant select on &&ut3_owner..ut_annotation_cache to public;
 grant execute on &&ut3_owner..ut_executables to public;
 grant execute on &&ut3_owner..ut_executable_test to public;
 grant select on &&ut3_owner..ut_suite_cache to public;
-grant select on &&ut3_owner..ut_suite_cache_tag to public;
 grant select on &&ut3_owner..ut_suite_cache_package to public;
 grant select on &&ut3_owner..ut_suite_cache_schema to public;
 grant execute on &&ut3_owner..ut_annotation_cache_manager to public;
diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql
@@ -114,7 +114,6 @@ grant select on &&ut3_owner..ut_annotation_cache to &ut3_user;
 grant execute on &&ut3_owner..ut_executables to &ut3_user;
 grant execute on &&ut3_owner..ut_executable_test to &ut3_user;
 grant select on &&ut3_owner..ut_suite_cache to &ut3_user;
-grant select on &&ut3_owner..ut_suite_cache_tag to &ut3_user;
 grant select on &&ut3_owner..ut_suite_cache_package to public;
 grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user;
 grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user;
diff --git a/source/install.sql b/source/install.sql
@@ -130,7 +130,6 @@ alter session set current_schema = &&ut3_owner;
 @@install_component.sql 'core/ut_suite_cache_package.sql'
 @@install_component.sql 'core/ut_suite_cache_seq.sql'
 @@install_component.sql 'core/ut_suite_cache.sql'
-@@install_component.sql 'core/ut_suite_cache_tag.sql'
 @@install_component.sql 'core/ut_suite_cache_manager.pks'
 @@install_component.sql 'core/ut_suite_cache_manager.pkb'
 @@install_component.sql 'core/ut_suite_builder.pks'
diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql
@@ -63,8 +63,6 @@ drop package ut_suite_manager;
 
 drop package ut_suite_builder;
 
-drop table ut_suite_cache_tag;
-
 drop table ut_suite_cache;
 
 drop sequence ut_suite_cache_seq;
diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ create or replace type ut_suite_item_info as object (`
`22`	`22`	`item_type varchar2( 250 ), -- the type of item (UT_SUITE/UT_SUITE_CONTEXT/UT_TEST)`
`23`	`23`	`item_line_no integer, -- line_number where annotation identifying the item exists`
`24`	`24`	`path varchar2( 4000 ),-- suitepath of the item`
`25`		`- disabled_flag integer -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation`
	`25`	`+ disabled_flag integer, -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation`
	`26`	`+ tags varchar2(4000)`
`26`	`27`	`)`
`27`	`28`	`/`