Skip to content

Commit f4bede0

Browse files
jgebaljgebal
committed
Reworked coverage sources query
1 parent a8c0c82 commit f4bede0

2 files changed

Lines changed: 67 additions & 70 deletions

File tree

‎source/core/coverage/ut_coverage.pkb‎

Lines changed: 66 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -35,66 +35,59 @@ create or replace package body ut_coverage is
3535
return g_develop_mode;
3636
end;
3737

38-
function get_cov_sources_sql(a_coverage_options ut_coverage_options) return varchar2 is
38+
function get_cov_sources_sql(a_coverage_options ut_coverage_options, a_skip_objects ut_object_names) return varchar2 is
3939
l_result varchar2(32767);
4040
l_full_name varchar2(32767);
4141
l_join_mappings varchar2(32767);
4242
l_filters varchar2(32767);
4343
l_mappings_cardinality integer := 0;
4444
begin
4545
l_result := q'[
46-
with sources as (
47-
select /*+ cardinality(f {mappings_cardinality}) */
48-
{l_full_name} as full_name, s.owner, s.name, s.line, s.text
49-
from {sources_view} s {join_file_mappings}
50-
where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION')
51-
{filters}
52-
),
53-
trigger_sources as (
54-
select /*+ cardinality(f {mappings_cardinality}) */
55-
{l_full_name} as full_name,
56-
s.owner,
57-
s.name,
58-
s.line
59-
- (select min(t.line) - 1
60-
from {sources_view} t
61-
where t.owner = s.owner and t.type = s.type and t.name = s.name
62-
and regexp_like( t.text, '[A-Za-z0-9$#_]*(begin|declare|compound).*', 'i' )
63-
) as line,
64-
s.text
65-
from {sources_view} s {join_file_mappings}
66-
where s.type = 'TRIGGER'
67-
{filters}
68-
),
69-
coverage_sources as (
70-
select full_name, owner, name, line, text,
71-
case
72-
when
73-
-- to avoid execution of regexp_like on every line
74-
-- first do a rough check for existence of search pattern keyword
75-
(lower(s.text) like '%procedure%'
76-
or lower(s.text) like '%function%'
77-
or lower(s.text) like '%begin%'
78-
or lower(s.text) like '%end%'
79-
or lower(s.text) like '%package%'
80-
) and
81-
regexp_like(
82-
s.text,
83-
'^([\t ]*(((not)?\s*(overriding|final|instantiable)[\t ]*)*(static|constructor|member)?[\t ]*(procedure|function)|package([\t ]+body)|begin|end([\t ]+\S+)*[ \t]*;))', 'i'
84-
)
85-
then 'Y'
86-
end as to_be_skipped
87-
from (
88-
select * from sources
89-
union all
90-
select * from trigger_sources
91-
) s
92-
)
93-
select full_name, owner, name, line, to_be_skipped, text
94-
from coverage_sources s
95-
--Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter
96-
where (s.owner, s.name) not in ( select el.owner, el.name from table(:l_skipped_objects) el )
97-
and line > 0
46+
with
47+
trigger_source_offsets as (
48+
select min(s.line) - 1 offset, s.owner, s.name, s.type
49+
from {sources_view} s
50+
where s.type = 'TRIGGER'
51+
{filters}
52+
and (lower(s.text) like '%begin%' or lower(s.text) like '%declare%' or lower(s.text) like '%compound%')
53+
group by s.owner, s.name, s.type
54+
),
55+
sources as (
56+
select /*+ cardinality(f {mappings_cardinality}) */
57+
{l_full_name} as full_name, s.owner, s.name,
58+
s.line - case when s.type = 'TRIGGER' then o.offset else 0 end as line,
59+
s.text
60+
from {sources_view} s {join_file_mappings}
61+
left join trigger_source_offsets o
62+
on (s.owner = o.owner and s.name = o.name and s.type = o.type)
63+
where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION', 'TRIGGER')
64+
{filters}
65+
),
66+
coverage_sources as (
67+
select full_name, owner, name, line, text,
68+
case
69+
when
70+
-- to avoid execution of regexp_like on every line
71+
-- first do a rough check for existence of search pattern keyword
72+
(lower(s.text) like '%procedure%'
73+
or lower(s.text) like '%function%'
74+
or lower(s.text) like '%begin%'
75+
or lower(s.text) like '%end%'
76+
or lower(s.text) like '%package%'
77+
) and
78+
regexp_like(
79+
s.text,
80+
'^([\t ]*(((not)?\s*(overriding|final|instantiable)[\t ]*)*(static|constructor|member)?[\t ]*(procedure|function)|package([\t ]+body)|begin|end([\t ]+\S+)*[ \t]*;))', 'i'
81+
)
82+
then 'Y'
83+
end as to_be_skipped
84+
from sources s
85+
)
86+
select full_name, owner, name, line, to_be_skipped, text
87+
from coverage_sources s
88+
-- Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter
89+
where (s.owner, s.name) not in ( select /*+ cardinality(el {skipped_objects_cardinality})*/el.owner, el.name from table(:l_skipped_objects) el )
90+
and line > 0
9891
]';
9992

10093
if a_coverage_options.file_mappings is not empty then
@@ -109,9 +102,16 @@ create or replace package body ut_coverage is
109102
l_full_name := q'[lower(s.owner||'.'||s.name)]';
110103
l_filters := case
111104
when a_coverage_options.include_objects is not empty then '
112-
and (s.owner, s.name) in (select il.owner, il.name from table(:include_objects) il)'
105+
and (s.owner, s.name) in (
106+
select /*+ cardinality(il '||ut_utils.scale_cardinality(cardinality(a_coverage_options.include_objects))||') */
107+
il.owner, il.name
108+
from table(:include_objects) il
109+
)'
113110
else '
114-
and s.owner in (select upper(t.column_value) from table(:l_schema_names) t)'
111+
and s.owner in (
112+
select /*+ cardinality(t '||ut_utils.scale_cardinality(cardinality(a_coverage_options.schema_names))||') */
113+
upper(t.column_value)
114+
from table(:l_schema_names) t)'
115115
end;
116116
end if;
117117

@@ -120,29 +120,28 @@ create or replace package body ut_coverage is
120120
l_result := replace(l_result, '{join_file_mappings}', l_join_mappings);
121121
l_result := replace(l_result, '{filters}', l_filters);
122122
l_result := replace(l_result, '{mappings_cardinality}', l_mappings_cardinality);
123+
l_result := replace(l_result, '{skipped_objects_cardinality}', ut_utils.scale_cardinality(cardinality(a_skip_objects)));
123124

124125
return l_result;
125126

126127
end;
127128

128-
function get_cov_sources_cursor(a_coverage_options in ut_coverage_options,a_sql in varchar2) return sys_refcursor is
129+
function get_cov_sources_cursor(a_coverage_options in ut_coverage_options) return sys_refcursor is
129130
l_cursor sys_refcursor;
130131
l_skip_objects ut_object_names;
131132
l_sql varchar2(32767);
132-
l_valid_pattern varchar2(250) := '^\s*select.+$';
133133
begin
134134
if not is_develop_mode() then
135135
--skip all the utplsql framework objects and all the unit test packages that could potentially be reported by coverage.
136136
l_skip_objects := ut_utils.get_utplsql_objects_list() multiset union all coalesce(a_coverage_options.exclude_objects, ut_object_names());
137137
end if;
138-
if regexp_like(a_sql, l_valid_pattern, 'mi') then
139-
-- pseudo assert for PL/SQL Cop
140-
l_sql := sys.dbms_assert.noop(a_sql);
141-
else
142-
raise_application_error(-20542, 'Possible SQL injection detected. a_sql parameter does not match valid pattern "' || l_valid_pattern || '".');
143-
end if;
138+
139+
l_sql := get_cov_sources_sql(a_coverage_options, l_skip_objects);
140+
141+
ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) );
142+
144143
if a_coverage_options.file_mappings is not empty then
145-
open l_cursor for l_sql using a_coverage_options.file_mappings, a_coverage_options.file_mappings, l_skip_objects;
144+
open l_cursor for l_sql using a_coverage_options.file_mappings, l_skip_objects;
146145
elsif a_coverage_options.include_objects is not empty then
147146
open l_cursor for l_sql using a_coverage_options.include_objects, a_coverage_options.include_objects, l_skip_objects;
148147
else
@@ -151,16 +150,15 @@ create or replace package body ut_coverage is
151150
return l_cursor;
152151
end;
153152

154-
procedure populate_tmp_table(a_coverage_options ut_coverage_options, a_sql in varchar2) is
153+
procedure populate_tmp_table(a_coverage_options ut_coverage_options) is
155154
pragma autonomous_transaction;
156155
l_cov_sources_crsr sys_refcursor;
157156
l_cov_sources_data ut_coverage_helper.t_coverage_sources_tmp_rows;
158157
begin
159158

160159
if not ut_coverage_helper.is_tmp_table_populated() or is_develop_mode() then
161160
ut_coverage_helper.cleanup_tmp_table();
162-
ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('a_sql',a_sql) );
163-
l_cov_sources_crsr := get_cov_sources_cursor(a_coverage_options, a_sql);
161+
l_cov_sources_crsr := get_cov_sources_cursor(a_coverage_options);
164162

165163
loop
166164
fetch l_cov_sources_crsr bulk collect into l_cov_sources_data limit 10000;
@@ -234,7 +232,7 @@ create or replace package body ut_coverage is
234232
begin
235233
--prepare global temp table with sources
236234
ut_event_manager.trigger_event('about to populate coverage temp table');
237-
populate_tmp_table(a_coverage_options, get_cov_sources_sql(a_coverage_options));
235+
populate_tmp_table(a_coverage_options);
238236
ut_event_manager.trigger_event('coverage temp table populated');
239237

240238
-- Get raw data for both reporters, order is important as tmp table will skip headers and dont populate

‎source/core/coverage/ut_coverage.pks‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ create or replace package ut_coverage authid current_user is
1818

1919
gc_proftab_coverage constant varchar2(32) := 'proftab';
2020
gc_block_coverage constant varchar2(32) := 'block';
21-
gc_extended_coverage constant varchar2(32) := 'extended';
2221

2322
type tt_coverage_id_arr is table of integer index by varchar2(30);
2423

@@ -75,7 +74,7 @@ create or replace package ut_coverage authid current_user is
7574
* Allows overwriting of private global variable g_coverage_id
7675
* Used internally, only for unit testing of the framework only
7776
*/
78-
procedure mock_coverage_id(a_coverage_id integer,a_coverage_type in varchar2);
77+
procedure mock_coverage_id(a_coverage_id integer, a_coverage_type in varchar2);
7978

8079
procedure mock_coverage_id(a_coverage_id tt_coverage_id_arr);
8180

0 commit comments

Comments
 (0)