work in progress

jgebal · jgebal · commit 640806bb3415 · 2016-11-13T15:55:13.000Z
diff --git a/source/core/types/ut_output_dbms_pipe.tpb b/source/core/types/ut_output_dbms_pipe.tpb
@@ -3,7 +3,7 @@ create or replace type body ut_output_dbms_pipe as
   constructor function ut_output_dbms_pipe(self in out nocopy ut_output_dbms_pipe) return self as result is
   begin
     self.output_type := $$plsql_unit;
-    self.output_id := ut_output_dbms_pipe.generate_output_id;
+    self.output_id := self.generate_output_id;
     return;
   end;
 
@@ -21,12 +21,11 @@ create or replace type body ut_output_dbms_pipe as
   end;
 
   overriding member procedure send(self in out nocopy ut_output_dbms_pipe, a_text clob) is
-    --we're assuming bax of 4 bytes per char
-    c_size_limit_chars constant integer := 1000;
-    l_text_part varchar2(4000 byte);
-    l_timeout_occured boolean;
-    i integer := 0;
+    c_size_limit_chars constant integer := ut_output_pipe_helper.gc_size_limit_chars;
+    l_text_part        ut_output_pipe_helper.t_pipe_item;
+    i                  integer := 0;
   begin
+    --split test into pieces of a size valid for pipe and send to pipe
     while i <= length(a_text) loop
       l_text_part := substr( a_text, i + 1, c_size_limit_chars );
       ut_output_pipe_helper.send( self.output_id, l_text_part);
diff --git a/source/core/types/ut_output_dbms_pipe.tps b/source/core/types/ut_output_dbms_pipe.tps
@@ -3,7 +3,6 @@ create or replace type ut_output_dbms_pipe under ut_output (
   overriding member procedure open(self in out nocopy ut_output_dbms_pipe),
   overriding member procedure send(self in out nocopy ut_output_dbms_pipe, a_text clob),
   overriding member procedure close(self in out nocopy ut_output_dbms_pipe),
-  static function generate_output_id return varchar2,
   static function get_lines(a_output_id varchar2, a_timeout_sec integer := 60*60*4) return ut_output_clob_list pipelined,
   member procedure to_screen(self in ut_output_dbms_pipe),
   static procedure to_screen(a_output_id varchar2)
diff --git a/source/core/ut_output_pipe_helper.pkb b/source/core/ut_output_pipe_helper.pkb
@@ -1,52 +1,95 @@
 create or replace package body ut_output_pipe_helper is
 
 
-  type t_pipe_buffer is table of varchar2(4000);
-  type t_outputs_buffer is table of t_pipe_buffer index by varchar2(128);
+  type tt_pipe_buffer is table of varchar2(4000);
 
-  g_outputs_buffer t_outputs_buffer;
+  type t_output_buffer is record(
+    to_close boolean := false,
+    data     tt_pipe_buffer
+  );
 
-  procedure send_from_buffer(a_output_id varchar2) is
-    l_timeout_occured boolean;
+  type tt_outputs_buffer is table of t_output_buffer index by varchar2(128);
+
+  g_outputs_buffer tt_outputs_buffer;
+
+  function send_from_buffer(a_output_id varchar2, a_buffer in out nocopy tt_pipe_buffer) return boolean is
+    l_is_successful boolean := true;
+    l_first_item    integer;
+    l_last_item     integer;
     i integer;
   begin
-    if g_outputs_buffer.exists(a_output_id) then
-      i :=  g_outputs_buffer(a_output_id).first;
+    if a_buffer is not null then
+      l_first_item := a_buffer.first;
+      i := l_first_item;
+      --iterate through buffer and try to sent all data from buffer
+      -- exit loop on timeout
       while i is not null loop
-        dbms_pipe.pack_message( g_outputs_buffer(a_output_id)(i) );
-        l_timeout_occured := dbms_pipe.send_message(a_output_id, 0) != 0;
-        if l_timeout_occured then
-          dbms_pipe.reset_buffer;
-          return;
-        end if;
+        dbms_pipe.pack_message( a_buffer(i) );
+        l_is_successful := dbms_pipe.send_message(a_output_id, 0) = 0;
+        exit when not l_is_successful;
+        l_last_item := i;
+        i := a_buffer.next(i);
       end loop;
+
+      --remove from buffer messages alrady sent
+      if not l_is_successful then
+        a_buffer.delete(l_first_item, i-1);
+      else
+        a_buffer.delete();
+      end if;
+      dbms_pipe.reset_buffer;
+      return l_is_successful;
+    end if;
+    return false;
+  end;
+
+  function send_from_buffer(a_output_id varchar2) return boolean is
+  begin
+    if g_outputs_buffer.exists(a_output_id) then
+      return send_from_buffer(a_output_id, g_outputs_buffer(a_output_id).data);
     end if;
+    return false;
   end;
 
   --sends a message to a named pipe
   --and if sending fails it writes the message to the end of the buffer for pipe
-  procedure send(a_output_id varchar2, a_text varchar2) is
-    l_timeout_occured boolean;
+  procedure send(a_output_id varchar2, a_text t_pipe_item) is
+    l_is_successful boolean;
   begin
-      send_from_buffer(a_output_id);
-      dbms_pipe.pack_message( a_text );
-      l_timeout_occured := dbms_pipe.send_message(a_output_id, 0) != 0;
-      if l_timeout_occured then
-        dbms_pipe.reset_buffer;
-        buffer(a_output_id, a_text);
-      end if;
+      buffer(a_output_id, a_text);
+      l_is_successful := send_from_buffer(a_output_id);
   end;
 
   --writes the message to the end of the buffer for pipe
-  procedure buffer(a_output_id varchar2, a_text varchar2) is
+  procedure buffer(a_output_id varchar2, a_text t_pipe_item) is
   begin
     if not g_outputs_buffer.exists(a_output_id) then
-      g_outputs_buffer(a_output_id) := t_pipe_buffer();
+      g_outputs_buffer(a_output_id).data := tt_pipe_buffer();
     end if;
-    g_outputs_buffer(a_output_id).extend;
-    g_outputs_buffer(a_output_id)(g_outputs_buffer(a_output_id).last) :=  a_text;
+    g_outputs_buffer(a_output_id).data.extend;
+    g_outputs_buffer(a_output_id).data(g_outputs_buffer(a_output_id).data.last) :=  a_text;
+  end;
+
+  procedure cleanup_outputs_to_close is
+    l_output_id           varchar2(128);
+    l_output_id_to_delete varchar2(128);
+  begin
+    l_output_id := g_outputs_buffer.first;
+    while i is not null loop
+      l_output_id_to_delete := null;
+      if g_outputs_buffer(l_output_id).to_close then
+        if send_from_buffer(l_output_id) = true then
+          l_output_id_to_delete := l_output_id;
+        end if;
+      end if;
+      l_output_id := g_outputs_buffer.next(l_output_id);
+      g_outputs_buffer.delete(l_output_id_to_delete);
+    end loop;
   end;
 
+  --procedure cleanup_aged_pipes() - check for pipes that are aged out.
+
+
   --registers a close request and tries to close a pipe
   --by first sending out all messages remaining in the buffers
   --the procedure holds infomrmation about closure requests
@@ -73,7 +116,13 @@ create or replace package body ut_output_pipe_helper is
   -- two buffers used: output_1, output_2
   procedure request_close(a_output_id varchar2, a_text varchar2) is
   begin
-    null;
+    cleanup_outputs_to_close;
+    --if there is any output in a state to_close = false
+    --exit
+    --else loop with a wait time of 20 seconds for each to_close output
+
+    --if unable to send all messages after timeout, then finish?
+
   end;
 
 end;
diff --git a/source/core/ut_output_pipe_helper.pks b/source/core/ut_output_pipe_helper.pks
@@ -1,11 +1,18 @@
 create or replace package ut_output_pipe_helper is
 
-  --sends a message to a named pipe
-  --and if sending fails it writes the message to the end of the buffer for pipe
-  procedure send(a_output_id varchar2, a_text varchar2);
+  --the limit size for pipe message is 4096, we want to make sure we're below that limit
+  subtype t_pipe_item is varchar(4000 byte);
+
+  --we're assuming max of 4 bytes per char
+  gc_size_limit_chars constant integer := 1000;
+
+  --adds message to pipe buffer and tries to sent all messages from the buffer
+  --exists immediately when sending timesout (pipe full)
+  --the messages that were sent are removed from buffer
+  procedure send(a_output_id varchar2, a_text t_pipe_item);
 
   --writes the message to the end of the buffer for pipe
-  procedure buffer(a_output_id varchar2, a_text varchar2);
+  procedure buffer(a_output_id varchar2, a_text t_pipe_item);
 
   --registers a close request and tries to close a pipe
   --by first sending out all messages remaining in the buffers
diff --git a/source/install.sql b/source/install.sql
@@ -23,8 +23,11 @@ whenever oserror exit failure rollback
 @@core/types/ut_executable.tps
 @@core/types/ut_assert_result.tps
 @@core/types/ut_assert_list.tps
+@@core/types/ut_output_clob_list.tps
 @@core/types/ut_output.tps
 @@core/types/ut_output_dbms_output.tps
+@@core/ut_output_pipe_helper.pks
+@@core/types/ut_output_dbms_pipe.tps
 @@core/types/ut_reporter.tps
 @@core/types/ut_reporters_list.tps
 @@core/types/ut_composite_reporter.tps
@@ -48,6 +51,8 @@ whenever oserror exit failure rollback
 @@core/types/ut_assert_result.tpb
 @@core/types/ut_output.tpb
 @@core/types/ut_output_dbms_output.tpb
+@@core/ut_output_pipe_helper.pkb
+@@core/types/ut_output_dbms_pipe.tpb
 @@core/types/ut_reporter.tpb
 @@core/types/ut_object.tpb
 @@core/types/ut_composite_object.tpb
diff --git a/source/uninstall.sql b/source/uninstall.sql
@@ -96,10 +96,16 @@ drop type ut_reporters_list;
 
 drop type ut_reporter force;
 
+drop type ut_output_dbms_pipe;
+
+drop package ut_output_pipe_helper;
+
 drop type ut_output_dbms_output;
 
 drop type ut_output;
 
+drop type ut_output_clob_list;
+
 drop type ut_assert_list;
 
 drop type ut_assert_result;
