Fixed bug using AQ when attempting to dequeue with an invalid message

id.

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -42,6 +42,8 @@ Thin Mode Changes
     :attr:`DeqOptions.correlation` for buffered delivery mode.
 #)  Fixed bug when fetching multiple consecutive null values into a :ref:`data
     frame <dataframeformat>`.
+#)  Fixed bug using :ref:`Oracle Advanced Queuing <aqusermanual>` when
+    attempting to dequeue using an invalid :attr:`DeqOptions.msgid`.
 
 Thick Mode Changes
 ++++++++++++++++++

src/oracledb/impl/thin/messages/aq_deq.pyx

@@ -67,6 +67,7 @@ cdef class AqDeqMessage(AqBaseMessage):
              bytes consumer_name_bytes
              bytes correlation_bytes
              bytes condition_bytes
+             bytes msgid_bytes
              uint16_t delivery_mode
              int deq_flags
         self._write_function_code(buf)
@@ -135,7 +136,10 @@ cdef class AqDeqMessage(AqBaseMessage):
         if consumer_name_bytes is not None:
             buf.write_bytes_with_length(consumer_name_bytes)
         if self.deq_options_impl.msgid:
-            buf.write_bytes(self.deq_options_impl.msgid)
+            msgid_bytes = self.deq_options_impl.msgid[:16]
+            if len(msgid_bytes) < 16:
+                msgid_bytes += bytes(16 - len(msgid_bytes))
+            buf.write_bytes(msgid_bytes)
         if correlation_bytes is not None:
             buf.write_bytes_with_length(correlation_bytes)
         buf.write_bytes(self.queue_impl.payload_toid)

tests/test_7800_aq_raw.py

@@ -482,6 +482,22 @@ def test_7829(self):
         self.conn.commit()
         self.assertEqual(msg.payload, value)
 
+    def test_7830(self):
+        "7830 - test deq options with msgid > 16 bytes"
+        queue = self.get_and_clear_queue("TEST_RAW_QUEUE")
+        queue.deqoptions.msgid = b"invalid_msgid_123456789"
+        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
+        with self.assertRaisesFullCode("ORA-25263"):
+            queue.deqone()
+
+    def test_7831(self):
+        "7831 - test deq options with msgid < 16 bytes"
+        queue = self.get_and_clear_queue("TEST_RAW_QUEUE")
+        queue.deqoptions.msgid = b"short_msgid"
+        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
+        with self.assertRaisesFullCode("ORA-25263"):
+            queue.deqone()
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()

tests/test_7900_aq_raw_async.py

@@ -421,6 +421,22 @@ async def test_7925(self):
         await self.conn.commit()
         self.assertEqual(msg.payload, value)
 
+    async def test_7926(self):
+        "7926 - test deq options with msgid > 16 bytes"
+        queue = await self.get_and_clear_queue("TEST_RAW_QUEUE")
+        queue.deqoptions.msgid = b"invalid_msgid_123456789"
+        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
+        with self.assertRaisesFullCode("ORA-25263"):
+            await queue.deqone()
+
+    async def test_7927(self):
+        "7927 - test deq options with msgid < 16 bytes"
+        queue = await self.get_and_clear_queue("TEST_RAW_QUEUE")
+        queue.deqoptions.msgid = b"short_msgid"
+        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
+        with self.assertRaisesFullCode("ORA-25263"):
+            await queue.deqone()
+
 
 if __name__ == "__main__":
     test_env.run_test_cases()