Merge pull request #816 from utPLSQL/feature/output_buffer_memmory_use

jgebal · web-flow · commit b6b2abe10139 · 2019-01-12T14:16:34.000Z
Added select with row limit to assure we don't overload memory
diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql
@@ -1,4 +1,9 @@
-create table ut_output_buffer_tmp$(
+declare
+  v_table_sql varchar2(32767);
+  e_non_assm exception;
+  pragma exception_init(e_non_assm, -43853);
+begin
+  v_table_sql := 'create table ut_output_buffer_tmp$(
   /*
   utPLSQL - Version 3
   Copyright 2016 - 2018 utPLSQL Project
@@ -25,9 +30,18 @@ create table ut_output_buffer_tmp$(
   constraint ut_output_buffer_tmp_pk primary key(output_id, message_id),
   constraint ut_output_buffer_tmp_ck check(is_finished = 0 and text is not null or is_finished = 1 and text is null),
   constraint ut_output_buffer_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id)
-) organization index overflow nologging initrans 100
-  lob(text) store as securefile ut_output_text(retention none)
-;
+) organization index overflow nologging initrans 100 ';
+  begin
+    execute immediate
+      v_table_sql || 'lob(text) store as securefile ut_output_text(retention none)';
+  exception
+    when e_non_assm then
+      execute immediate
+        v_table_sql || 'lob(text) store as basicfile ut_output_text(pctversion 0)';
+
+  end;
+end;
+/
 
 -- This is needed to be EBR ready as editioning view can only be created by edition enabled user
 declare
diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb
@@ -89,6 +89,7 @@ create or replace type body ut_output_table_buffer is
     lc_long_sleep_time   constant number(1) := 1;     --sleep for 1 s when waiting long
     lc_long_wait_time    constant number(1) := 1;     --waiting more than 1 sec
     l_sleep_time         number(2,1) := lc_short_sleep_time;
+    lc_bulk_limit        constant integer := 100;
 
     procedure remove_read_data(a_message_ids ut_integer_list) is
       pragma autonomous_transaction;
@@ -99,13 +100,26 @@ create or replace type body ut_output_table_buffer is
       commit;
     end;
 
-  begin
-    loop
-      select a.message_id, ut_output_data_row(a.text, a.item_type)
+    procedure remove_buffer_info is
+      pragma autonomous_transaction;
+    begin
+      delete from ut_output_buffer_info_tmp a
+       where a.output_id = self.output_id;
+      commit;
+    end;
+
+    begin
+    while not l_finished loop
+      with ordered_buffer as (
+        select a.message_id, ut_output_data_row(a.text, a.item_type)
+          from ut_output_buffer_tmp a
+         where a.output_id = self.output_id
+         order by a.message_id
+      )
+      select b.*
         bulk collect into l_message_ids, l_buffer_data
-        from ut_output_buffer_tmp a
-       where a.output_id = self.output_id
-       order by a.message_id;
+        from ordered_buffer b
+       where rownum <= lc_bulk_limit;
 
       --nothing fetched from output, wait and try again
       if l_buffer_data.count = 0 then
@@ -130,7 +144,12 @@ create or replace type body ut_output_table_buffer is
         end loop;
       end if;
       remove_read_data(l_message_ids);
-      exit when l_already_waited_for >= l_wait_for or l_finished;
+      if l_finished then
+        remove_buffer_info();
+      end if;
+      if l_already_waited_for >= l_wait_for then
+        l_finished := true;
+      end if;
     end loop;
     return;
   end;
diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh
@@ -13,11 +13,11 @@ cd ..
 time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \
 -source_path=source -owner=ut3 \
 -test_path=test -c \
--f=ut_documentation_reporter  -o=test_results.log -s \
 -f=ut_coverage_sonar_reporter -o=coverage.xml \
 -f=ut_coverage_html_reporter  -o=coverage.html \
 -f=ut_coveralls_reporter      -o=coverage.json \
 -f=ut_sonar_test_reporter     -o=test_results.xml \
 -f=ut_junit_reporter          -o=junit_test_results.xml \
 -f=ut_tfs_junit_reporter      -o=tfs_test_results.xml \
+-f=ut_documentation_reporter  -o=test_results.log -s \
 -scc
