Tightened up code looking for the end of a database request.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -16,6 +16,7 @@ Thin Mode Changes
 #)  Fixed bug when calling :meth:`~Connection.gettype()` with an object type
     name containing ``%ROWTYPE``
     (`issue 304 <https://github.com/oracle/python-oracledb/issues/304>`__).
+#)  Tightened up code looking for the end of a database request.
 #)  Restored error message raised when attempting to connect to Oracle Database
     11g.
 

src/oracledb/impl/thin/capabilities.pyx

@@ -79,15 +79,6 @@ cdef class Capabilities:
             errors._raise_err(errors.ERR_NCHAR_CS_NOT_SUPPORTED,
                               charset_id=self.ncharset_id)
 
-    cdef void _check_supports_end_of_request(self):
-        """
-        Checks whether the end of request flag is sent and sets a boolean to
-        avoid calculating it each time.
-        """
-        if self.ttc_field_version >= TNS_CCAP_FIELD_VERSION_19_1 \
-                and self.compile_caps[TNS_CCAP_TTC4] & TNS_CCAP_END_OF_REQUEST:
-            self.supports_end_of_request = True
-
     @cython.boundscheck(False)
     cdef void _init_compile_caps(self):
         self.ttc_field_version = TNS_CCAP_FIELD_VERSION_MAX

src/oracledb/impl/thin/constants.pxi

@@ -47,6 +47,7 @@ cdef enum:
 
 # data flags
 cdef enum:
+    TNS_DATA_FLAGS_END_OF_REQUEST = 0x2000
     TNS_DATA_FLAGS_EOF = 0x0040
 
 # marker types
@@ -740,6 +741,7 @@ cdef enum:
 # accept flags
 cdef enum:
     TNS_ACCEPT_FLAG_FAST_AUTH = 0x10000000
+    TNS_ACCEPT_FLAG_HAS_END_OF_REQUEST = 0x02000000
 
 # other constants
 cdef enum:

src/oracledb/impl/thin/messages.pyx

@@ -1847,6 +1847,8 @@ cdef class ConnectMessage(Message):
                 buf.read_uint32(&flags)
                 if flags & TNS_ACCEPT_FLAG_FAST_AUTH:
                     buf._caps.supports_fast_auth = True
+                if flags & TNS_ACCEPT_FLAG_HAS_END_OF_REQUEST:
+                    buf._caps.supports_end_of_request = True
             buf._caps._adjust_for_protocol(protocol_version, protocol_options)
             buf._transport._full_packet_size = True
         elif buf._current_packet.packet_type == TNS_PACKET_TYPE_REFUSE:
@@ -1923,7 +1925,6 @@ cdef class DataTypesMessage(Message):
             buf.read_uint16(&conv_data_type)
             if conv_data_type != 0:
                 buf.skip_raw_bytes(4)
-        buf._caps._check_supports_end_of_request()
 
     cdef int _write_message(self, WriteBuffer buf) except -1:
         cdef:

src/oracledb/impl/thin/packet.pyx

@@ -60,8 +60,13 @@ cdef class Packet:
         Returns a boolean indicating if the end of request byte is found at the
         end of the packet.
         """
-        cdef char *ptr = cpython.PyBytes_AS_STRING(self.buf)
-        return ptr[self.packet_size - 1] == TNS_MSG_TYPE_END_OF_REQUEST
+        cdef:
+            uint16_t flags
+            char *ptr
+        ptr = cpython.PyBytes_AS_STRING(self.buf)
+        flags = unpack_uint16(<const char_type*> &ptr[PACKET_HEADER_SIZE],
+                              BYTE_ORDER_MSB)
+        return flags & TNS_DATA_FLAGS_END_OF_REQUEST
 
 
 @cython.final