From 56bf10cb7a1ac41f84c26e938d8b9f8fb019fc2a Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 1 Jul 2012 20:00:59 +0000 Subject: QPID-3923: update ID generation to be consistent across all queues/exchanges/bindings as opposed to deterministic for some and not for others git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1355994 13f79535-47bb-0310-9956-ffa450edef68 --- .../store/berkeleydb/upgrade/UpgradeFrom5To6.java | 16 +++--- .../berkeleydb/upgrade/UpgradeFrom5To6Test.java | 58 +++++++++++++++------- 2 files changed, 47 insertions(+), 27 deletions(-) (limited to 'qpid/java/bdbstore/src') diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java index 97a3d61df1..2b7c782ad1 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java @@ -383,7 +383,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade for (int i = 0; i < newDequeues.length; i++) { OldRecordImpl dequeue = oldDequeues[i]; - UUID id = UUIDGenerator.generateUUID(dequeue.getQueueName(), virtualHostName); + UUID id = UUIDGenerator.generateQueueUUID(dequeue.getQueueName(), virtualHostName); newDequeues[i] = new NewRecordImpl(id, dequeue.getMessageNumber()); } } @@ -393,7 +393,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade for (int i = 0; i < newEnqueues.length; i++) { OldRecordImpl enqueue = oldEnqueues[i]; - UUID id = UUIDGenerator.generateUUID(enqueue.getQueueName(), virtualHostName); + UUID id = UUIDGenerator.generateQueueUUID(enqueue.getQueueName(), virtualHostName); newEnqueues[i] = new NewRecordImpl(id, enqueue.getMessageNumber()); } } @@ -423,7 +423,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade Transaction transaction, DatabaseEntry key, DatabaseEntry value) { OldQueueEntryKey oldEntryRecord = oldBinding.entryToObject(key); - UUID queueId = UUIDGenerator.generateUUID(oldEntryRecord.getQueueName().asString(), virtualHostName); + UUID queueId = UUIDGenerator.generateQueueUUID(oldEntryRecord.getQueueName().asString(), virtualHostName); NewQueueEntryKey newEntryRecord = new NewQueueEntryKey(queueId, oldEntryRecord.getMessageId()); DatabaseEntry newKey = new DatabaseEntry(); @@ -458,7 +458,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade String routingKey = bindingRecord.getRoutingKey().asString(); FieldTable arguments = bindingRecord.getArguments(); - UUID bindingId = UUIDGenerator.generateUUID(); + UUID bindingId = UUIDGenerator.generateBindingUUID(exchangeName, queueName, routingKey, virtualHostName); UpgradeConfiguredObjectRecord configuredObject = createBindingConfiguredObjectRecord(exchangeName, queueName, routingKey, arguments, virtualHostName); storeConfiguredObjectEntry(configuredObjectsDatabase, bindingId, configuredObject, transaction); @@ -492,7 +492,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade String exchangeType = exchangeRecord.getType().asString(); boolean autoDelete = exchangeRecord.isAutoDelete(); - UUID exchangeId = UUIDGenerator.generateUUID(exchangeName, virtualHostName); + UUID exchangeId = UUIDGenerator.generateExchangeUUID(exchangeName, virtualHostName); UpgradeConfiguredObjectRecord configuredObject = createExchangeConfiguredObjectRecord(exchangeName, exchangeType, autoDelete); @@ -529,7 +529,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade boolean exclusive = queueRecord.isExclusive(); FieldTable arguments = queueRecord.getArguments(); - UUID queueId = UUIDGenerator.generateUUID(queueName, virtualHostName); + UUID queueId = UUIDGenerator.generateQueueUUID(queueName, virtualHostName); UpgradeConfiguredObjectRecord configuredObject = createQueueConfiguredObjectRecord(queueName, owner, exclusive, arguments); storeConfiguredObjectEntry(configuredObjectsDatabase, queueId, configuredObject, transaction); @@ -620,8 +620,8 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade { Map attributesMap = new HashMap(); attributesMap.put(Binding.NAME, routingKey); - attributesMap.put(Binding.EXCHANGE, UUIDGenerator.generateUUID(exchangeName, virtualHostName)); - attributesMap.put(Binding.QUEUE, UUIDGenerator.generateUUID(queueName, virtualHostName)); + attributesMap.put(Binding.EXCHANGE, UUIDGenerator.generateExchangeUUID(exchangeName, virtualHostName)); + attributesMap.put(Binding.QUEUE, UUIDGenerator.generateQueueUUID(queueName, virtualHostName)); if (arguments != null) { attributesMap.put(Binding.ARGUMENTS, FieldTable.convertToMap(arguments)); diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java index 0031447140..2d2a6b20a2 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java @@ -29,9 +29,11 @@ import static org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.OL import static org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.OLD_XID_DB_NAME; import java.io.File; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -165,11 +167,11 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase NewRecordImpl[] newDequeues = newTransaction.getDequeues(); assertEquals("Unxpected new enqueus number", 1, newEnqueues.length); NewRecordImpl enqueue = newEnqueues[0]; - assertEquals("Unxpected queue id", UUIDGenerator.generateUUID("TEST1", getVirtualHostName()), enqueue.getId()); + assertEquals("Unxpected queue id", UUIDGenerator.generateQueueUUID("TEST1", getVirtualHostName()), enqueue.getId()); assertEquals("Unxpected message id", 1, enqueue.getMessageNumber()); assertEquals("Unxpected new dequeues number", 1, newDequeues.length); NewRecordImpl dequeue = newDequeues[0]; - assertEquals("Unxpected queue id", UUIDGenerator.generateUUID("TEST2", getVirtualHostName()), dequeue.getId()); + assertEquals("Unxpected queue id", UUIDGenerator.generateQueueUUID("TEST2", getVirtualHostName()), dequeue.getId()); assertEquals("Unxpected message id", 2, dequeue.getMessageNumber()); } @@ -275,22 +277,24 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase assertEquals("Unexpected number of configured objects", 12, configuredObjects.size()); Set> expected = new HashSet>(12); + List expectedBindingIDs = new ArrayList(); + expected.add(createExpectedQueueMap("myUpgradeQueue", Boolean.FALSE, null, null)); expected.add(createExpectedQueueMap("clientid:mySelectorDurSubName", Boolean.TRUE, "clientid", null)); expected.add(createExpectedQueueMap("clientid:myDurSubName", Boolean.TRUE, "clientid", null)); expected.add(createExpectedQueueMap("nonexclusive-with-erroneous-owner", Boolean.FALSE, null, Collections.singletonMap(AMQQueueFactory.X_QPID_DESCRIPTION, "misused-owner-as-description"))); - expected.add(createExpectedQueueBindingMap("myUpgradeQueue","myUpgradeQueue", "<>", null)); - expected.add(createExpectedQueueBindingMap("myUpgradeQueue", "myUpgradeQueue", "amq.direct", null)); - expected.add(createExpectedQueueBindingMap("clientid:myDurSubName", "myUpgradeTopic", "amq.topic", - Collections.singletonMap("x-filter-jms-selector", ""))); - expected.add(createExpectedQueueBindingMap("clientid:mySelectorDurSubName", "mySelectorUpgradeTopic", "amq.topic", - Collections.singletonMap("x-filter-jms-selector", "testprop='true'"))); - expected.add(createExpectedQueueBindingMap("clientid:myDurSubName", "clientid:myDurSubName", "<>", null)); - expected.add(createExpectedQueueBindingMap("clientid:mySelectorDurSubName", "clientid:mySelectorDurSubName", "<>", null)); - expected.add(createExpectedQueueBindingMap("nonexclusive-with-erroneous-owner", "nonexclusive-with-erroneous-owner", "amq.direct", null)); - expected.add(createExpectedQueueBindingMap("nonexclusive-with-erroneous-owner","nonexclusive-with-erroneous-owner", "<>", null)); + expected.add(createExpectedQueueBindingMapAndID("myUpgradeQueue","myUpgradeQueue", "<>", null, expectedBindingIDs)); + expected.add(createExpectedQueueBindingMapAndID("myUpgradeQueue", "myUpgradeQueue", "amq.direct", null, expectedBindingIDs)); + expected.add(createExpectedQueueBindingMapAndID("clientid:myDurSubName", "myUpgradeTopic", "amq.topic", + Collections.singletonMap("x-filter-jms-selector", ""), expectedBindingIDs)); + expected.add(createExpectedQueueBindingMapAndID("clientid:mySelectorDurSubName", "mySelectorUpgradeTopic", "amq.topic", + Collections.singletonMap("x-filter-jms-selector", "testprop='true'"), expectedBindingIDs)); + expected.add(createExpectedQueueBindingMapAndID("clientid:myDurSubName", "clientid:myDurSubName", "<>", null, expectedBindingIDs)); + expected.add(createExpectedQueueBindingMapAndID("clientid:mySelectorDurSubName", "clientid:mySelectorDurSubName", "<>", null, expectedBindingIDs)); + expected.add(createExpectedQueueBindingMapAndID("nonexclusive-with-erroneous-owner", "nonexclusive-with-erroneous-owner", "amq.direct", null, expectedBindingIDs)); + expected.add(createExpectedQueueBindingMapAndID("nonexclusive-with-erroneous-owner","nonexclusive-with-erroneous-owner", "<>", null, expectedBindingIDs)); Set expectedTypes = new HashSet(); expectedTypes.add(Queue.class.getName()); @@ -305,28 +309,44 @@ public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase String type = object.getType(); assertTrue("Unexpected type:" + type, expectedTypes.contains(type)); UUID key = entry.getKey(); - if (type.equals(Exchange.class.getName()) || type.equals(Queue.class.getName())) + + assertNotNull("Key cannot be null", key); + + if (type.equals(Exchange.class.getName())) + { + String exchangeName = (String) deserialized.get(Exchange.NAME); + assertNotNull(exchangeName); + assertEquals("Unexpected key", key, UUIDGenerator.generateExchangeUUID(exchangeName, getVirtualHostName())); + } + else if (type.equals(Queue.class.getName())) { - assertEquals("Unexpected key", key, UUIDGenerator.generateUUID(((String) deserialized.get("name")), getVirtualHostName())); + String queueName = (String) deserialized.get(Queue.NAME); + assertNotNull(queueName); + assertEquals("Unexpected key", key, UUIDGenerator.generateQueueUUID(queueName, getVirtualHostName())); } - else + else if (type.equals(Binding.class.getName())) { - assertNotNull("Key cannot be null", key); + assertTrue("unexpected binding id", expectedBindingIDs.remove(key)); } } + assertTrue("Not all expected configured objects found:" + expected, expected.isEmpty()); + assertTrue("Not all expected bindings found:" + expectedBindingIDs, expectedBindingIDs.isEmpty()); } - private Map createExpectedQueueBindingMap(String queue, String bindingName, String exchangeName, Map argumentMap) + private Map createExpectedQueueBindingMapAndID(String queue, String bindingName, String exchangeName, Map argumentMap, List expectedBindingIDs) { Map expectedQueueBinding = new HashMap(); - expectedQueueBinding.put(Binding.QUEUE, UUIDGenerator.generateUUID(queue, getVirtualHostName()).toString()); + expectedQueueBinding.put(Binding.QUEUE, UUIDGenerator.generateQueueUUID(queue, getVirtualHostName()).toString()); expectedQueueBinding.put(Binding.NAME, bindingName); - expectedQueueBinding.put(Binding.EXCHANGE, UUIDGenerator.generateUUID(exchangeName, getVirtualHostName()).toString()); + expectedQueueBinding.put(Binding.EXCHANGE, UUIDGenerator.generateExchangeUUID(exchangeName, getVirtualHostName()).toString()); if (argumentMap != null) { expectedQueueBinding.put(Binding.ARGUMENTS, argumentMap); } + + expectedBindingIDs.add(UUIDGenerator.generateBindingUUID(exchangeName, queue, bindingName, getVirtualHostName())); + return expectedQueueBinding; } -- cgit v1.2.1