From ee5fe39544e71276163afd1b34bc40dd5485084b Mon Sep 17 00:00:00 2001 From: Anthony Tuininga Date: Tue, 11 Jun 2019 19:13:21 -0600 Subject: [PATCH] Rename queues and queue tables to be more clear as to which is which. --- samples/BulkAQ.py | 2 +- samples/ObjectAQ.py | 2 +- samples/RawAQ.py | 2 +- samples/sql/SetupSamplesExec.sql | 14 ++++--- test/AQ.py | 64 +++++++++++++++++--------------- test/sql/SetupTestExec.sql | 7 ++-- 6 files changed, 50 insertions(+), 41 deletions(-) diff --git a/samples/BulkAQ.py b/samples/BulkAQ.py index bb86c79..9b8c8e2 100644 --- a/samples/BulkAQ.py +++ b/samples/BulkAQ.py @@ -21,7 +21,7 @@ from __future__ import print_function import cx_Oracle import SampleEnv -QUEUE_NAME = "DEMORAW" +QUEUE_NAME = "DEMO_RAW_QUEUE" PAYLOAD_DATA = [ "The first message", "The second message", diff --git a/samples/ObjectAQ.py b/samples/ObjectAQ.py index 7721971..e20d8a1 100644 --- a/samples/ObjectAQ.py +++ b/samples/ObjectAQ.py @@ -23,7 +23,7 @@ import SampleEnv import decimal BOOK_TYPE_NAME = "UDT_BOOK" -QUEUE_NAME = "BOOKS" +QUEUE_NAME = "DEMO_BOOK_QUEUE" BOOK_DATA = [ ("The Fellowship of the Ring", "Tolkien, J.R.R.", decimal.Decimal("10.99")), diff --git a/samples/RawAQ.py b/samples/RawAQ.py index e48131d..3e33647 100644 --- a/samples/RawAQ.py +++ b/samples/RawAQ.py @@ -20,7 +20,7 @@ from __future__ import print_function import cx_Oracle import SampleEnv -QUEUE_NAME = "DEMORAW" +QUEUE_NAME = "DEMO_RAW_QUEUE" PAYLOAD_DATA = [ "The first message", "The second message", diff --git a/samples/sql/SetupSamplesExec.sql b/samples/sql/SetupSamplesExec.sql index a9d52c3..3b7b73b 100644 --- a/samples/sql/SetupSamplesExec.sql +++ b/samples/sql/SetupSamplesExec.sql @@ -193,14 +193,16 @@ create table &main_user..PlsqlSessionCallbacks ( -- create queue table and queues for demonstrating advanced queuing begin - dbms_aqadm.create_queue_table('&main_user..BOOK_QUEUE', + dbms_aqadm.create_queue_table('&main_user..BOOK_QUEUE_TAB', '&main_user..UDT_BOOK'); - dbms_aqadm.create_queue('&main_user..BOOKS', '&main_user..BOOK_QUEUE'); - dbms_aqadm.start_queue('&main_user..BOOKS'); + dbms_aqadm.create_queue('&main_user..DEMO_BOOK_QUEUE', + '&main_user..BOOK_QUEUE_TAB'); + dbms_aqadm.start_queue('&main_user..DEMO_BOOK_QUEUE'); - dbms_aqadm.create_queue_table('&main_user..RAW_QUEUE', 'RAW'); - dbms_aqadm.create_queue('&main_user..DEMORAW', '&main_user..RAW_QUEUE'); - dbms_aqadm.start_queue('&main_user..DEMORAW'); + dbms_aqadm.create_queue_table('&main_user..RAW_QUEUE_TAB', 'RAW'); + dbms_aqadm.create_queue('&main_user..DEMO_RAW_QUEUE', + '&main_user..RAW_QUEUE_TAB'); + dbms_aqadm.start_queue('&main_user..DEMO_RAW_QUEUE'); end; / diff --git a/test/AQ.py b/test/AQ.py index 8c6355b..bc1bda5 100644 --- a/test/AQ.py +++ b/test/AQ.py @@ -11,6 +11,7 @@ import decimal import threading class TestCase(TestEnv.BaseTestCase): + bookQueueName = "TEST_BOOK_QUEUE" bookData = [ ("Wings of Fire", "A.P.J. Abdul Kalam", decimal.Decimal("15.75")), @@ -28,7 +29,7 @@ class TestCase(TestEnv.BaseTestCase): options.deliverymode = cx_Oracle.MSG_PERSISTENT_OR_BUFFERED options.visibility = cx_Oracle.ENQ_IMMEDIATE props = self.connection.msgproperties() - while self.connection.deq("BOOKS", options, props, book): + while self.connection.deq(self.bookQueueName, options, props, book): pass def __deqInThread(self, results): @@ -38,7 +39,7 @@ class TestCase(TestEnv.BaseTestCase): options = connection.deqoptions() options.wait = 10 props = connection.msgproperties() - if connection.deq("BOOKS", options, props, book): + if connection.deq(self.bookQueueName, options, props, book): results.append((book.TITLE, book.AUTHORS, book.PRICE)) connection.commit() @@ -54,7 +55,8 @@ class TestCase(TestEnv.BaseTestCase): options = self.connection.deqoptions() options.wait = cx_Oracle.DEQ_NO_WAIT props = self.connection.msgproperties() - messageId = self.connection.deq("BOOKS", options, props, book) + messageId = self.connection.deq(self.bookQueueName, options, props, + book) self.assertTrue(messageId is None) def testDeqEnq(self): @@ -68,12 +70,12 @@ class TestCase(TestEnv.BaseTestCase): book.TITLE = title book.AUTHORS = authors book.PRICE = price - self.connection.enq("BOOKS", options, props, book) + self.connection.enq(self.bookQueueName, options, props, book) options = self.connection.deqoptions() options.navigation = cx_Oracle.DEQ_FIRST_MSG options.wait = cx_Oracle.DEQ_NO_WAIT results = [] - while self.connection.deq("BOOKS", options, props, book): + while self.connection.deq(self.bookQueueName, options, props, book): row = (book.TITLE, book.AUTHORS, book.PRICE) results.append(row) self.connection.commit() @@ -90,13 +92,14 @@ class TestCase(TestEnv.BaseTestCase): book.PRICE = price options = self.connection.enqoptions() props = self.connection.msgproperties() - self.connection.enq("BOOKS", options, props, book) + self.connection.enq(self.bookQueueName, options, props, book) options = self.connection.deqoptions() options.navigation = cx_Oracle.DEQ_FIRST_MSG options.wait = cx_Oracle.DEQ_NO_WAIT options.mode = cx_Oracle.DEQ_REMOVE_NODATA book = booksType.newobject() - messageId = self.connection.deq("BOOKS", options, props, book) + messageId = self.connection.deq(self.bookQueueName, options, props, + book) self.connection.commit() self.assertTrue(messageId is not None) self.assertEqual(book.TITLE, "") @@ -131,7 +134,7 @@ class TestCase(TestEnv.BaseTestCase): book.PRICE = price options = self.connection.enqoptions() props = self.connection.msgproperties() - self.connection.enq("BOOKS", options, props, book) + self.connection.enq(self.bookQueueName, options, props, book) self.connection.commit() thread.join() self.assertEqual(results, [(title, authors, price)]) @@ -147,11 +150,11 @@ class TestCase(TestEnv.BaseTestCase): book = booksType.newobject() options = self.connection.enqoptions() props = self.connection.msgproperties() - self.assertRaises(TypeError, self.connection.deq, "BOOKS", options, - props, book) + self.assertRaises(TypeError, self.connection.deq, self.bookQueueName, + options, props, book) options = self.connection.deqoptions() - self.assertRaises(TypeError, self.connection.enq, "BOOKS", options, - props, book) + self.assertRaises(TypeError, self.connection.enq, self.bookQueueName, + options, props, book) def testMsgProps(self): "test getting/setting message properties attributes" @@ -175,7 +178,7 @@ class TestCase(TestEnv.BaseTestCase): enqOptions = self.connection.enqoptions() enqOptions.visibility = cx_Oracle.ENQ_ON_COMMIT props = self.connection.msgproperties() - self.connection.enq("BOOKS", enqOptions, props, book) + self.connection.enq(self.bookQueueName, enqOptions, props, book) otherConnection = TestEnv.GetConnection() deqOptions = otherConnection.deqoptions() @@ -184,10 +187,12 @@ class TestCase(TestEnv.BaseTestCase): booksType = otherConnection.gettype("UDT_BOOK") book = booksType.newobject() props = otherConnection.msgproperties() - messageId = otherConnection.deq("BOOKS", deqOptions, props, book) + messageId = otherConnection.deq(self.bookQueueName, deqOptions, props, + book) self.assertTrue(messageId is None) self.connection.commit() - messageId = otherConnection.deq("BOOKS", deqOptions, props, book) + messageId = otherConnection.deq(self.bookQueueName, deqOptions, props, + book) self.assertTrue(messageId is not None) def testVisibilityModeImmediate(self): @@ -199,7 +204,7 @@ class TestCase(TestEnv.BaseTestCase): enqOptions = self.connection.enqoptions() enqOptions.visibility = cx_Oracle.ENQ_IMMEDIATE props = self.connection.msgproperties() - self.connection.enq("BOOKS", enqOptions, props, book) + self.connection.enq(self.bookQueueName, enqOptions, props, book) otherConnection = TestEnv.GetConnection() deqOptions = otherConnection.deqoptions() @@ -209,7 +214,7 @@ class TestCase(TestEnv.BaseTestCase): booksType = otherConnection.gettype("UDT_BOOK") book = booksType.newobject() props = otherConnection.msgproperties() - otherConnection.deq("BOOKS", deqOptions, props, book) + otherConnection.deq(self.bookQueueName, deqOptions, props, book) results = (book.TITLE, book.AUTHORS, book.PRICE) otherConnection.commit() self.assertEqual(results, self.bookData[0]) @@ -224,7 +229,7 @@ class TestCase(TestEnv.BaseTestCase): enqOptions.deliverymode = cx_Oracle.MSG_BUFFERED enqOptions.visibility = cx_Oracle.ENQ_IMMEDIATE props = self.connection.msgproperties() - self.connection.enq("BOOKS", enqOptions, props, book) + self.connection.enq(self.bookQueueName, enqOptions, props, book) otherConnection = TestEnv.GetConnection() deqOptions = otherConnection.deqoptions() @@ -235,7 +240,7 @@ class TestCase(TestEnv.BaseTestCase): booksType = otherConnection.gettype("UDT_BOOK") book = booksType.newobject() props = otherConnection.msgproperties() - otherConnection.deq("BOOKS", deqOptions, props, book) + otherConnection.deq(self.bookQueueName, deqOptions, props, book) results = (book.TITLE, book.AUTHORS, book.PRICE) otherConnection.commit() self.assertEqual(results, self.bookData[0]) @@ -250,7 +255,7 @@ class TestCase(TestEnv.BaseTestCase): enqOptions.deliverymode = cx_Oracle.MSG_PERSISTENT enqOptions.visibility = cx_Oracle.ENQ_IMMEDIATE props = self.connection.msgproperties() - self.connection.enq("BOOKS", enqOptions, props, book) + self.connection.enq(self.bookQueueName, enqOptions, props, book) otherConnection = TestEnv.GetConnection() deqOptions = otherConnection.deqoptions() @@ -261,7 +266,7 @@ class TestCase(TestEnv.BaseTestCase): booksType = otherConnection.gettype("UDT_BOOK") book = booksType.newobject() props = otherConnection.msgproperties() - otherConnection.deq("BOOKS", deqOptions, props, book) + otherConnection.deq(self.bookQueueName, deqOptions, props, book) results = (book.TITLE, book.AUTHORS, book.PRICE) otherConnection.commit() self.assertEqual(results, self.bookData[0]) @@ -276,7 +281,7 @@ class TestCase(TestEnv.BaseTestCase): enqOptions.deliverymode = cx_Oracle.MSG_PERSISTENT_OR_BUFFERED enqOptions.visibility = cx_Oracle.ENQ_IMMEDIATE props = self.connection.msgproperties() - self.connection.enq("BOOKS", enqOptions, props, book) + self.connection.enq(self.bookQueueName, enqOptions, props, book) otherConnection = TestEnv.GetConnection() deqOptions = otherConnection.deqoptions() @@ -287,7 +292,7 @@ class TestCase(TestEnv.BaseTestCase): booksType = otherConnection.gettype("UDT_BOOK") book = booksType.newobject() props = otherConnection.msgproperties() - otherConnection.deq("BOOKS", deqOptions, props, book) + otherConnection.deq(self.bookQueueName, deqOptions, props, book) results = (book.TITLE, book.AUTHORS, book.PRICE) otherConnection.commit() self.assertEqual(results, self.bookData[0]) @@ -302,7 +307,7 @@ class TestCase(TestEnv.BaseTestCase): enqOptions.deliverymode = cx_Oracle.MSG_BUFFERED enqOptions.visibility = cx_Oracle.ENQ_IMMEDIATE props = self.connection.msgproperties() - self.connection.enq("BOOKS", enqOptions, props, book) + self.connection.enq(self.bookQueueName, enqOptions, props, book) otherConnection = TestEnv.GetConnection() deqOptions = otherConnection.deqoptions() @@ -313,7 +318,8 @@ class TestCase(TestEnv.BaseTestCase): booksType = otherConnection.gettype("UDT_BOOK") book = booksType.newobject() props = otherConnection.msgproperties() - messageId = otherConnection.deq("BOOKS", deqOptions, props, book) + messageId = otherConnection.deq(self.bookQueueName, deqOptions, props, + book) self.assertTrue(messageId is None) def testDequeueTransformation(self): @@ -325,7 +331,7 @@ class TestCase(TestEnv.BaseTestCase): expectedPrice = book.PRICE + 10 enqOptions = self.connection.enqoptions() props = self.connection.msgproperties() - self.connection.enq("BOOKS", enqOptions, props, book) + self.connection.enq(self.bookQueueName, enqOptions, props, book) self.connection.commit() otherConnection = TestEnv.GetConnection() @@ -337,7 +343,7 @@ class TestCase(TestEnv.BaseTestCase): booksType = otherConnection.gettype("UDT_BOOK") book = booksType.newobject() props = otherConnection.msgproperties() - otherConnection.deq("BOOKS", deqOptions, props, book) + otherConnection.deq(self.bookQueueName, deqOptions, props, book) otherPrice = book.PRICE self.assertEqual(otherPrice, expectedPrice) @@ -351,7 +357,7 @@ class TestCase(TestEnv.BaseTestCase): enqOptions = self.connection.enqoptions() enqOptions.transformation = "%s.transform1" % self.connection.username props = self.connection.msgproperties() - self.connection.enq("BOOKS", enqOptions, props, book) + self.connection.enq(self.bookQueueName, enqOptions, props, book) self.connection.commit() otherConnection = TestEnv.GetConnection() @@ -362,7 +368,7 @@ class TestCase(TestEnv.BaseTestCase): booksType = otherConnection.gettype("UDT_BOOK") book = booksType.newobject() props = otherConnection.msgproperties() - otherConnection.deq("BOOKS", deqOptions, props, book) + otherConnection.deq(self.bookQueueName, deqOptions, props, book) otherPrice = book.PRICE self.assertEqual(otherPrice, expectedPrice) diff --git a/test/sql/SetupTestExec.sql b/test/sql/SetupTestExec.sql index beae101..a21e56b 100644 --- a/test/sql/SetupTestExec.sql +++ b/test/sql/SetupTestExec.sql @@ -255,10 +255,11 @@ create table &main_user..PlsqlSessionCallbacks ( -- create queue table and queues for testing advanced queuing begin - dbms_aqadm.create_queue_table('&main_user..BOOK_QUEUE', + dbms_aqadm.create_queue_table('&main_user..BOOK_QUEUE_TAB', '&main_user..UDT_BOOK'); - dbms_aqadm.create_queue('&main_user..BOOKS', '&main_user..BOOK_QUEUE'); - dbms_aqadm.start_queue('&main_user..BOOKS'); + dbms_aqadm.create_queue('&main_user..TEST_BOOK_QUEUE', + '&main_user..BOOK_QUEUE_TAB'); + dbms_aqadm.start_queue('&main_user..TEST_BOOK_QUEUE'); end; /