QPID-2436: Drop the vhost prefix in QMF V2keys.

- The prefix makes the keys extremely long and unreadable.
- In a standalone broker it adds nothing since its the same for every object.
- In a cluster you need a consistent ID for shadow connections on all brokers.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@920413 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 7 deletions

diff --git a/cpp/managementgen/qmfgen/schema.py b/cpp/managementgen/qmfgen/schema.py
index b3d0f751d2..d80567687e 100755
--- a/cpp/managementgen/qmfgen/schema.py
+++ b/cpp/managementgen/qmfgen/schema.py
@@ -1086,13 +1086,14 @@ class SchemaClass:
   def genPrimaryKey (self, stream, variables):
     first = 1
     for prop in self.properties:
-      if prop.isIndex == 1:
-        if first:
-          first = None
-        else:
-          stream.write(" << \",\";\n")
-        var = prop.type.type.stream.replace("#", prop.getName())
-        stream.write("    key << %s" % var)
+      if prop.getName() != "vhostRef": # Limit how deep the v2Key strings get
+        if prop.isIndex == 1:
+          if first:
+            first = None
+          else:
+            stream.write(" << \",\";\n")
+          var = prop.type.type.stream.replace("#", prop.getName())
+          stream.write("    key << %s" % var)
     if not first:
       stream.write(";")