Fixed bug in handling redirect data with small SDU sizes.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -17,6 +17,8 @@ oracledb 2.2.1 (TBD)
 Thin Mode Changes
 +++++++++++++++++
 
+#)  Fixed bug in handling redirect data with small SDU sizes.
+
 Thick Mode Changes
 ++++++++++++++++++
 

src/oracledb/base_impl.pxd

@@ -191,8 +191,7 @@ cdef class Buffer:
     cdef object read_interval_ym(self)
     cdef int read_int32(self, int32_t *value, int byte_order=*) except -1
     cdef object read_oracle_number(self, int preferred_num_type)
-    cdef inline const char_type* read_raw_bytes(self,
-                                                ssize_t num_bytes) except NULL
+    cdef const char_type* read_raw_bytes(self, ssize_t num_bytes) except NULL
     cdef int read_raw_bytes_and_length(self, const char_type **ptr,
                                        ssize_t *num_bytes) except -1
     cdef int read_sb1(self, int8_t *value) except -1

src/oracledb/impl/base/buffer.pyx

@@ -638,8 +638,7 @@ cdef class Buffer:
         if ptr != NULL:
             return self.parse_oracle_number(ptr, num_bytes, preferred_num_type)
 
-    cdef inline const char_type* read_raw_bytes(self,
-                                                ssize_t num_bytes) except NULL:
+    cdef const char_type* read_raw_bytes(self, ssize_t num_bytes) except NULL:
         """
         Returns a pointer to a contiguous buffer containing the specified
         number of bytes found in the buffer.

src/oracledb/impl/thin/messages.pyx

@@ -388,7 +388,7 @@ cdef class MessageWithData(Message):
         copied. An array is stored and a pointer to the underlying memory is
         used for performance reasons.
         """
-        cdef const char_type *ptr = buf._get_raw(num_bytes)
+        cdef const char_type *ptr = buf.read_raw_bytes(num_bytes)
         if self.bit_vector_buf is None:
             self.bit_vector_buf = array.array('B')
             array.resize(self.bit_vector_buf, num_bytes)
@@ -1834,7 +1834,7 @@ cdef class ConnectMessage(Message):
                 buf.read_uint16(&self.redirect_data_len)
                 self.read_redirect_data_len = True
             buf.wait_for_packets_sync()
-            redirect_data = buf._get_raw(self.redirect_data_len)
+            redirect_data = buf.read_raw_bytes(self.redirect_data_len)
             if self.redirect_data_len > 0:
                 self.redirect_data = \
                         redirect_data[:self.redirect_data_len].decode()

src/oracledb/impl/thin/packet.pyx

@@ -466,6 +466,14 @@ cdef class ReadBuffer(Buffer):
                     else PY_TYPE_LOB
             return cls._from_impl(lob_impl)
 
+    cdef const char_type* read_raw_bytes(self, ssize_t num_bytes) except NULL:
+        """
+        Read the specified number of bytes from the packet and return them.
+        """
+        self._chunked_bytes_buf.start_chunked_read()
+        self._get_raw(num_bytes, in_chunked_read=True)
+        return self._chunked_bytes_buf.end_chunked_read()
+
     cdef int read_rowid(self, Rowid *rowid) except -1:
         """
         Reads a rowid from the buffer and populates the rowid structure.