svn commit: r920413 - /qpid/trunk/qpid/cpp/managementgen/qmfgen/schema.py

[ac...@apache.org]

Author: aconway
Date: Mon Mar  8 17:33:54 2010
New Revision: 920413

URL: http://svn.apache.org/viewvc?rev=920413&view=rev
Log:
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.

Modified:
    qpid/trunk/qpid/cpp/managementgen/qmfgen/schema.py

Modified: qpid/trunk/qpid/cpp/managementgen/qmfgen/schema.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/managementgen/qmfgen/schema.py?rev=920413&r1=920412&r2=920413&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/managementgen/qmfgen/schema.py (original)
+++ qpid/trunk/qpid/cpp/managementgen/qmfgen/schema.py Mon Mar  8 17:33:54 2010
@@ -1086,13 +1086,14 @@
   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(";")
 



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org