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 --- .../server/store/berkeleydb/upgrade/UpgradeFrom5To6.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'qpid/java/bdbstore/src/main') 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)); -- cgit v1.2.1