Skip to content

Commit 6f0a939

Browse files
jgebaljgebal
committed
- removed grants to ut_suite_cache
- changed `dbmspcc_...` tables to be global temporary - added cleanup of session level global temp tables after run
1 parent 41c007c commit 6f0a939

19 files changed

Lines changed: 528 additions & 576 deletions

‎source/api/ut_runner.pkb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ create or replace package body ut_runner is
4444

4545
procedure finish_run(a_run ut_run, a_force_manual_rollback boolean) is
4646
begin
47-
ut_utils.cleanup_temp_tables;
4847
ut_event_manager.trigger_event(ut_event_manager.gc_finalize, a_run);
4948
ut_metadata.reset_source_definition_cache;
5049
ut_utils.read_cache_to_dbms_output();
5150
ut_coverage_helper.cleanup_tmp_table();
5251
ut_compound_data_helper.cleanup_diff();
5352
if not a_force_manual_rollback then
5453
rollback;
54+
ut_utils.cleanup_session_temp_tables;
5555
end if;
5656
end;
5757

@@ -196,7 +196,7 @@ create or replace package body ut_runner is
196196
function get_suites_info(a_owner varchar2 := null, a_package_name varchar2 := null) return ut_suite_items_info pipelined is
197197
l_cursor sys_refcursor;
198198
l_results ut_suite_items_info;
199-
c_bulk_limit constant integer := 10;
199+
c_bulk_limit constant integer := 100;
200200
begin
201201
l_cursor := ut_suite_manager.get_suites_info( nvl(a_owner,sys_context('userenv', 'current_schema')), a_package_name );
202202
loop

‎source/api/ut_suite_item_info.tps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ create or replace type ut_suite_item_info as object (
1818
object_owner varchar2( 250 ), -- the owner of test suite packages
1919
object_name varchar2( 250 ), -- the name of test suite package
2020
item_name varchar2( 250 ), -- the name of suite/test
21-
item_description varchar2( 250 ), -- the description of suite/suite item
21+
item_description varchar2( 4000 ), -- the description of suite/suite item
2222
item_type varchar2( 250 ), -- the type of item (UT_SUITE/UT_SUITE_CONTEXT/UT_TEST)
2323
item_line_no integer, -- line_number where annotation identifying the item exists
2424
path varchar2( 4000 ),-- suitepath of the item

‎source/core/annotations/ut_annotation_manager.pkb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ create or replace package body ut_annotation_manager as
1616
limitations under the License.
1717
*/
1818

19-
gc_max_objects_limit integer := 1000000;
2019
------------------------------
2120
--private definitions
2221

@@ -46,7 +45,7 @@ create or replace package body ut_annotation_manager as
4645
and o.object_type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'['
4746
)]';
4847
open l_rows for l_cursor_text using l_data;
49-
fetch l_rows bulk collect into l_result limit gc_max_objects_limit;
48+
fetch l_rows bulk collect into l_result limit ut_utils.gc_max_objects_fetch_limit;
5049
close l_rows;
5150
return l_result;
5251
end;
@@ -96,7 +95,7 @@ create or replace package body ut_annotation_manager as
9695
else 'o.last_ddl_time >= cast(:a_parse_date as date)'
9796
end;
9897
open l_rows for l_cursor_text using l_data, a_parse_date;
99-
fetch l_rows bulk collect into l_result limit gc_max_objects_limit;
98+
fetch l_rows bulk collect into l_result limit ut_utils.gc_max_objects_fetch_limit;
10099
close l_rows;
101100
end if;
102101
ut_event_manager.trigger_event('get_annotation_objs_info - end (count='||l_result.count||')');
@@ -172,7 +171,6 @@ create or replace package body ut_annotation_manager as
172171
l_object_lines.delete;
173172
end if;
174173
close a_sources_cursor;
175-
commit;
176174
end;
177175

178176

‎source/core/coverage/dbms_plssqlcode.sql‎

Lines changed: 24 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -7,69 +7,21 @@ begin
77
select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_BLOCKS' and owner = sys_context('USERENV','CURRENT_SCHEMA'));
88
if l_tab_exist = 0 then
99
execute immediate q'[
10-
create table dbmspcc_blocks (
10+
create global temporary table dbmspcc_blocks (
1111
run_id number(38, 0),
1212
object_id number(38, 0),
1313
block number(38, 0),
14-
line number(38, 0),
15-
col number(38, 0),
16-
covered number(1, 0),
17-
not_feasible number(1, 0)
18-
)]';
19-
execute immediate q'[
20-
create unique index dbmspcc_blocks_pk on
21-
dbmspcc_blocks (
22-
run_id,
23-
object_id,
24-
block
25-
)]';
26-
execute immediate q'[
27-
alter table dbmspcc_blocks modify (
28-
line
29-
constraint dbmspcc_blocks_line_nn not null enable
30-
)]';
31-
execute immediate q'[
32-
alter table dbmspcc_blocks modify (
33-
col
34-
constraint dbmspcc_blocks_col_nn not null enable
35-
)]';
36-
execute immediate q'[
37-
alter table dbmspcc_blocks modify (
38-
covered
39-
constraint dbmspcc_blocks_covered_nn not null enable
40-
)]';
41-
execute immediate q'[
42-
alter table dbmspcc_blocks modify (
43-
not_feasible
44-
constraint dbmspcc_blocks_not_feasible_nn not null enable
45-
)]';
46-
execute immediate q'[
47-
alter table dbmspcc_blocks
48-
add constraint dbmspcc_blocks_block_ck check ( block >= 0 ) enable]';
49-
execute immediate q'[
50-
alter table dbmspcc_blocks
51-
add constraint dbmspcc_blocks_line_ck check ( line >= 0 ) enable]';
52-
execute immediate q'[
53-
alter table dbmspcc_blocks
54-
add constraint dbmspcc_blocks_col_ck check ( col >= 0 ) enable]';
55-
execute immediate q'[
56-
alter table dbmspcc_blocks
57-
add constraint dbmspcc_blocks_covered_ck check ( covered in (
58-
0,
59-
1
60-
) ) enable]';
61-
execute immediate q'[
62-
alter table dbmspcc_blocks
63-
add constraint dbmspcc_blocks_not_feasible_ck check ( not_feasible in (
64-
0,
65-
1
66-
) ) enable]';
67-
execute immediate q'[
68-
alter table dbmspcc_blocks
69-
add constraint dbmspcc_blocks_pk primary key ( run_id,
70-
object_id,
71-
block )
72-
using index enable]';
14+
line number(38, 0) constraint dbmspcc_blocks_line_nn not null enable,
15+
col number(38, 0) constraint dbmspcc_blocks_col_nn not null enable,
16+
covered number(1, 0) constraint dbmspcc_blocks_covered_nn not null enable,
17+
not_feasible number(1, 0) constraint dbmspcc_blocks_not_feasible_nn not null enable,
18+
constraint dbmspcc_blocks_block_ck check ( block >= 0 ) enable,
19+
constraint dbmspcc_blocks_line_ck check ( line >= 0 ) enable,
20+
constraint dbmspcc_blocks_col_ck check ( col >= 0 ) enable,
21+
constraint dbmspcc_blocks_covered_ck check ( covered in ( 0, 1 ) ) enable,
22+
constraint dbmspcc_blocks_not_feasible_ck check ( not_feasible in ( 0, 1 ) ) enable,
23+
constraint dbmspcc_blocks_pk primary key ( run_id, object_id, block ) using index
24+
) on commit preserve rows]';
7325
end if;
7426
end;
7527
/
@@ -82,31 +34,13 @@ begin
8234
select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_RUNS' and owner = sys_context('USERENV','CURRENT_SCHEMA'));
8335
if l_tab_exist = 0 then
8436
execute immediate q'[
85-
create table dbmspcc_runs (
37+
create global temporary table dbmspcc_runs (
8638
run_id number(38, 0),
8739
run_comment varchar2(4000 byte),
88-
run_owner varchar2(128 byte),
89-
run_timestamp date
90-
)]';
91-
execute immediate q'[
92-
create unique index dbmspcc_runs_pk on
93-
dbmspcc_runs (
94-
run_id
95-
)]';
96-
execute immediate q'[
97-
alter table dbmspcc_runs modify (
98-
run_owner
99-
constraint dbmspcc_runs_run_owner_nn not null enable
100-
)]';
101-
execute immediate q'[
102-
alter table dbmspcc_runs modify (
103-
run_timestamp
104-
constraint dbmspcc_runs_run_timestamp_nn not null enable
105-
)]';
106-
execute immediate q'[
107-
alter table dbmspcc_runs
108-
add constraint dbmspcc_runs_pk primary key ( run_id )
109-
using index enable]';
40+
run_owner varchar2(128 byte) constraint dbmspcc_runs_run_owner_nn not null enable,
41+
run_timestamp date constraint dbmspcc_runs_run_timestamp_nn not null enable,
42+
constraint dbmspcc_runs_pk primary key ( run_id ) using index enable
43+
) on commit preserve rows]';
11044
end if;
11145
end;
11246
/
@@ -119,45 +53,15 @@ begin
11953
select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_UNITS' and owner = sys_context('USERENV','CURRENT_SCHEMA'));
12054
if l_tab_exist = 0 then
12155
execute immediate q'[
122-
create table dbmspcc_units (
56+
create global temporary table dbmspcc_units (
12357
run_id number(38, 0),
12458
object_id number(38, 0),
125-
owner varchar2(128 byte),
126-
name varchar2(128 byte),
127-
type varchar2(12 byte),
128-
last_ddl_time date
129-
)]';
130-
execute immediate q'[
131-
create unique index dbmspcc_units_pk on
132-
dbmspcc_units (
133-
run_id,
134-
object_id
135-
)]';
136-
execute immediate q'[
137-
alter table dbmspcc_units modify (
138-
owner
139-
constraint dbmspcc_units_owner_nn not null enable
140-
)]';
141-
execute immediate q'[
142-
alter table dbmspcc_units modify (
143-
name
144-
constraint dbmspcc_units_name_nn not null enable
145-
)]';
146-
execute immediate q'[
147-
alter table dbmspcc_units modify (
148-
type
149-
constraint dbmspcc_units_type_nn not null enable
150-
)]';
151-
execute immediate q'[
152-
alter table dbmspcc_units modify (
153-
last_ddl_time
154-
constraint dbmspcc_units_last_ddl_time_nn not null enable
155-
)]';
156-
execute immediate q'[
157-
alter table dbmspcc_units
158-
add constraint dbmspcc_units_pk primary key ( run_id,
159-
object_id )
160-
using index enable]';
59+
owner varchar2(128 byte) constraint dbmspcc_units_owner_nn not null enable,
60+
name varchar2(128 byte) constraint dbmspcc_units_name_nn not null enable,
61+
type varchar2(12 byte) constraint dbmspcc_units_type_nn not null enable,
62+
last_ddl_time date constraint dbmspcc_units_last_ddl_time_nn not null enable,
63+
constraint dbmspcc_units_pk primary key ( run_id, object_id ) using index enable
64+
) on commit preserve rows]';
16165
end if;
16266
end;
16367
/

‎source/core/coverage/ut_coverage.pkb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,7 @@ create or replace package body ut_coverage is
161161
l_run_comment varchar2(200) := 'utPLSQL Code coverage run '||ut_utils.to_string(systimestamp);
162162
begin
163163
if not is_develop_mode() and not g_is_started then
164-
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
165164
ut_coverage_helper_block.coverage_start( l_run_comment, g_coverage_id(gc_block_coverage) );
166-
$end
167165
ut_coverage_helper_profiler.coverage_start( l_run_comment, g_coverage_id(gc_proftab_coverage) );
168166
coverage_pause();
169167
g_is_started := true;
@@ -200,9 +198,7 @@ create or replace package body ut_coverage is
200198
begin
201199
if not is_develop_mode() then
202200
g_is_started := false;
203-
$if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then
204201
ut_coverage_helper_block.coverage_stop();
205-
$end
206202
ut_coverage_helper_profiler.coverage_stop();
207203
g_is_started := false;
208204
end if;

‎source/core/coverage/ut_coverage_helper.pkb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ create or replace package body ut_coverage_helper is
4444
pragma autonomous_transaction;
4545
begin
4646
execute immediate 'truncate table ut_coverage_sources_tmp';
47-
commit;
4847
end;
4948

5049
function is_tmp_table_populated return boolean is

‎source/core/coverage/ut_coverage_helper_block.pkb‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,24 @@ create or replace package body ut_coverage_helper_block is
4949
end;
5050

5151
function block_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return t_block_rows is
52-
l_raw_coverage sys_refcursor;
5352
l_coverage_rows t_block_rows;
54-
l_ut3_owner varchar2(128) := ut_utils.ut_owner();
5553
begin
5654

57-
open l_raw_coverage for 'select ccb.line
58-
,count(ccb.block) totalblocks
59-
,sum(ccb.covered)
55+
select ccb.line as line,
56+
count(ccb.block) as blocks,
57+
sum(ccb.covered) as covered_blocks
58+
bulk collect into l_coverage_rows
6059
from dbmspcc_units ccu
6160
left outer join dbmspcc_blocks ccb
6261
on ccu.run_id = ccb.run_id
6362
and ccu.object_id = ccb.object_id
64-
where ccu.run_id = :a_coverage_id
65-
and ccu.owner = :a_object_owner
66-
and ccu.name = :a_object_name
63+
where ccu.run_id = a_coverage_id
64+
and ccu.owner = a_object_owner
65+
and ccu.name = a_object_name
6766
group by ccb.line
68-
order by 1' using a_coverage_id,a_object_owner,a_object_name;
67+
order by 1;
6968

70-
fetch l_raw_coverage bulk collect into l_coverage_rows;
71-
close l_raw_coverage;
72-
73-
return l_coverage_rows;
69+
return l_coverage_rows;
7470
end;
7571

7672
function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return ut_coverage_helper.t_unit_line_calls is

‎source/core/types/ut_suite_cache_row.tps‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
create type ut_suite_cache_row as object (
2+
/*
3+
utPLSQL - Version 3
4+
Copyright 2016 - 2019 utPLSQL Project
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"):
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
id number(22,0),
19+
self_type varchar2(250 byte),
20+
path varchar2(1000 byte),
21+
object_owner varchar2(250 byte),
22+
object_name varchar2(250 byte),
23+
name varchar2(250 byte),
24+
line_no number,
25+
parse_time timestamp (6),
26+
description varchar2(4000 byte),
27+
rollback_type number,
28+
disabled_flag number,
29+
warnings ut_varchar2_rows,
30+
before_all_list ut_executables,
31+
after_all_list ut_executables,
32+
before_each_list ut_executables,
33+
before_test_list ut_executables,
34+
after_each_list ut_executables,
35+
after_test_list ut_executables,
36+
expected_error_codes ut_integer_list,
37+
tags ut_varchar2_rows,
38+
item ut_executable_test
39+
)
40+
/

‎source/core/types/ut_suite_cache_rows.tps‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
create type ut_suite_cache_rows as
2+
/*
3+
utPLSQL - Version 3
4+
Copyright 2016 - 2019 utPLSQL Project
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"):
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
table of ut_suite_cache_row
19+
/

0 commit comments

Comments
 (0)