From a41fc5ad04a77929eb202a09d1592cf2fdda0bc1 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 3 Jul 2008 13:45:32 +0100 Subject: [PATCH 1/6] Migrate branch bug17070 --- deps/rabbitmq_codegen/amqp-0.8.json | 46 +++++++++++++-------------- deps/rabbitmq_codegen/amqp_codegen.py | 5 +++ 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/deps/rabbitmq_codegen/amqp-0.8.json b/deps/rabbitmq_codegen/amqp-0.8.json index ae955dea93..fef636f685 100644 --- a/deps/rabbitmq_codegen/amqp-0.8.json +++ b/deps/rabbitmq_codegen/amqp-0.8.json @@ -192,11 +192,11 @@ "id": 30, "methods": [{"id": 10, "arguments": [{"type": "shortstr", "name": "realm"}, - {"type": "bit", "name": "exclusive"}, - {"type": "bit", "name": "passive"}, - {"type": "bit", "name": "active"}, - {"type": "bit", "name": "write"}, - {"type": "bit", "name": "read"}], + {"type": "bit", "name": "exclusive", "default-value": "false"}, + {"type": "bit", "name": "passive", "default-value": "true"}, + {"type": "bit", "name": "active", "default-value": "true"}, + {"type": "bit", "name": "write", "default-value": "true"}, + {"type": "bit", "name": "read", "default-value": "true"}], "name": "request"}, {"id": 11, "arguments": [{"type": "short", "name": "ticket"}], @@ -209,11 +209,11 @@ "arguments": [{"type": "short", "name": "ticket"}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "type"}, - {"type": "bit", "name": "passive"}, - {"type": "bit", "name": "durable"}, - {"type": "bit", "name": "auto-delete"}, - {"type": "bit", "name": "internal"}, - {"type": "bit", "name": "nowait"}, + {"type": "bit", "name": "passive", "default-value": "false"}, + {"type": "bit", "name": "durable", "default-value": "false"}, + {"type": "bit", "name": "auto-delete", "default-value": "false"}, + {"type": "bit", "name": "internal", "default-value": "false"}, + {"type": "bit", "name": "nowait", "default-value": "false"}, {"type": "table", "name": "arguments"}], "name": "declare"}, {"id": 11, @@ -234,12 +234,12 @@ "id": 50, "methods": [{"id": 10, "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue"}, - {"type": "bit", "name": "passive"}, - {"type": "bit", "name": "durable"}, - {"type": "bit", "name": "exclusive"}, - {"type": "bit", "name": "auto-delete"}, - {"type": "bit", "name": "nowait"}, + {"type": "shortstr", "name": "queue", "default-value": "\"\""}, + {"type": "bit", "name": "passive", "default-value": "false"}, + {"type": "bit", "name": "durable", "default-value": "false"}, + {"type": "bit", "name": "exclusive", "default-value": "false"}, + {"type": "bit", "name": "auto-delete", "default-value": "true"}, + {"type": "bit", "name": "nowait", "default-value": "false"}, {"type": "table", "name": "arguments"}], "name": "declare"}, {"id": 11, @@ -269,9 +269,9 @@ {"id": 40, "arguments": [{"type": "short", "name": "ticket"}, {"type": "shortstr", "name": "queue"}, - {"type": "bit", "name": "if-unused"}, - {"type": "bit", "name": "if-empty"}, - {"type": "bit", "name": "nowait"}], + {"type": "bit", "name": "if-unused", "default-value": "true"}, + {"type": "bit", "name": "if-empty", "default-value": "true"}, + {"type": "bit", "name": "nowait", "default-value": "false"}], "name": "delete"}, {"id": 41, "arguments": [{"type": "long", "name": "message-count"}], @@ -292,10 +292,10 @@ "arguments": [{"domain": "access-ticket", "name": "ticket"}, {"domain": "queue-name", "name": "queue"}, {"type": "shortstr", "name": "consumer-tag"}, - {"type": "bit", "name": "no-local"}, - {"type": "bit", "name": "no-ack"}, - {"type": "bit", "name": "exclusive"}, - {"type": "bit", "name": "nowait"}], + {"type": "bit", "name": "no-local", "default-value": "false"}, + {"type": "bit", "name": "no-ack", "default-value": "false"}, + {"type": "bit", "name": "exclusive", "default-value": "false"}, + {"type": "bit", "name": "nowait", "default-value": "false"}], "name": "consume"}, {"id": 21, "arguments": [{"type": "shortstr", "name": "consumer-tag"}], diff --git a/deps/rabbitmq_codegen/amqp_codegen.py b/deps/rabbitmq_codegen/amqp_codegen.py index 71c08014c6..0bbb0bc792 100644 --- a/deps/rabbitmq_codegen/amqp_codegen.py +++ b/deps/rabbitmq_codegen/amqp_codegen.py @@ -133,6 +133,11 @@ class AmqpField(AmqpEntity): self.domain = self.element['type'] else: self.domain = self.element['domain'] + + if self.element.has_key('default-value'): + self.defaultvalue = self.element['default-value'] + else: + self.defaultvalue = None def __repr__(self): return 'AmqpField("' + self.name + '")' From 17f516262e2963006e8cc25f6d7f4ba55a64301a Mon Sep 17 00:00:00 2001 From: Karol Skocik Date: Fri, 8 Aug 2008 15:35:11 +0100 Subject: [PATCH 2/6] unquote default values, so they became Python objects after JSON parsing --- deps/rabbitmq_codegen/amqp-0.8.json | 46 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/deps/rabbitmq_codegen/amqp-0.8.json b/deps/rabbitmq_codegen/amqp-0.8.json index fef636f685..0ad09e0ef0 100644 --- a/deps/rabbitmq_codegen/amqp-0.8.json +++ b/deps/rabbitmq_codegen/amqp-0.8.json @@ -192,11 +192,11 @@ "id": 30, "methods": [{"id": 10, "arguments": [{"type": "shortstr", "name": "realm"}, - {"type": "bit", "name": "exclusive", "default-value": "false"}, - {"type": "bit", "name": "passive", "default-value": "true"}, - {"type": "bit", "name": "active", "default-value": "true"}, - {"type": "bit", "name": "write", "default-value": "true"}, - {"type": "bit", "name": "read", "default-value": "true"}], + {"type": "bit", "name": "exclusive", "default-value": false}, + {"type": "bit", "name": "passive", "default-value": true}, + {"type": "bit", "name": "active", "default-value": true}, + {"type": "bit", "name": "write", "default-value": true}, + {"type": "bit", "name": "read", "default-value": true}], "name": "request"}, {"id": 11, "arguments": [{"type": "short", "name": "ticket"}], @@ -209,11 +209,11 @@ "arguments": [{"type": "short", "name": "ticket"}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "type"}, - {"type": "bit", "name": "passive", "default-value": "false"}, - {"type": "bit", "name": "durable", "default-value": "false"}, - {"type": "bit", "name": "auto-delete", "default-value": "false"}, - {"type": "bit", "name": "internal", "default-value": "false"}, - {"type": "bit", "name": "nowait", "default-value": "false"}, + {"type": "bit", "name": "passive", "default-value": false}, + {"type": "bit", "name": "durable", "default-value": false}, + {"type": "bit", "name": "auto-delete", "default-value": false}, + {"type": "bit", "name": "internal", "default-value": false}, + {"type": "bit", "name": "nowait", "default-value": false}, {"type": "table", "name": "arguments"}], "name": "declare"}, {"id": 11, @@ -234,12 +234,12 @@ "id": 50, "methods": [{"id": 10, "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue", "default-value": "\"\""}, - {"type": "bit", "name": "passive", "default-value": "false"}, - {"type": "bit", "name": "durable", "default-value": "false"}, - {"type": "bit", "name": "exclusive", "default-value": "false"}, - {"type": "bit", "name": "auto-delete", "default-value": "true"}, - {"type": "bit", "name": "nowait", "default-value": "false"}, + {"type": "shortstr", "name": "queue"}, + {"type": "bit", "name": "passive", "default-value": false}, + {"type": "bit", "name": "durable", "default-value": false}, + {"type": "bit", "name": "exclusive", "default-value": false}, + {"type": "bit", "name": "auto-delete", "default-value": true}, + {"type": "bit", "name": "nowait", "default-value": false}, {"type": "table", "name": "arguments"}], "name": "declare"}, {"id": 11, @@ -269,9 +269,9 @@ {"id": 40, "arguments": [{"type": "short", "name": "ticket"}, {"type": "shortstr", "name": "queue"}, - {"type": "bit", "name": "if-unused", "default-value": "true"}, - {"type": "bit", "name": "if-empty", "default-value": "true"}, - {"type": "bit", "name": "nowait", "default-value": "false"}], + {"type": "bit", "name": "if-unused", "default-value": true}, + {"type": "bit", "name": "if-empty", "default-value": true}, + {"type": "bit", "name": "nowait", "default-value": false}], "name": "delete"}, {"id": 41, "arguments": [{"type": "long", "name": "message-count"}], @@ -292,10 +292,10 @@ "arguments": [{"domain": "access-ticket", "name": "ticket"}, {"domain": "queue-name", "name": "queue"}, {"type": "shortstr", "name": "consumer-tag"}, - {"type": "bit", "name": "no-local", "default-value": "false"}, - {"type": "bit", "name": "no-ack", "default-value": "false"}, - {"type": "bit", "name": "exclusive", "default-value": "false"}, - {"type": "bit", "name": "nowait", "default-value": "false"}], + {"type": "bit", "name": "no-local", "default-value": false}, + {"type": "bit", "name": "no-ack", "default-value": false}, + {"type": "bit", "name": "exclusive", "default-value": false}, + {"type": "bit", "name": "nowait", "default-value": false}], "name": "consume"}, {"id": 21, "arguments": [{"type": "shortstr", "name": "consumer-tag"}], From 196ae050114c99842285702273af6f4e3c69144f Mon Sep 17 00:00:00 2001 From: Karol Skocik Date: Tue, 26 Aug 2008 15:11:18 +0100 Subject: [PATCH 3/6] added more default values --- deps/rabbitmq_codegen/amqp-0.8.json | 154 ++++++++++++++-------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/deps/rabbitmq_codegen/amqp-0.8.json b/deps/rabbitmq_codegen/amqp-0.8.json index 0ad09e0ef0..006eb8597c 100644 --- a/deps/rabbitmq_codegen/amqp-0.8.json +++ b/deps/rabbitmq_codegen/amqp-0.8.json @@ -106,17 +106,17 @@ { "id": 10, "methods": [{"id": 10, - "arguments": [{"type": "octet", "name": "version-major"}, - {"type": "octet", "name": "version-minor"}, + "arguments": [{"type": "octet", "name": "version-major", "default-value": 0}, + {"type": "octet", "name": "version-minor", "default-value": 8}, {"domain": "peer-properties", "name": "server properties"}, - {"type": "longstr", "name": "mechanisms"}, - {"type": "longstr", "name": "locales"}], + {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"}, + {"type": "longstr", "name": "locales", "default-value": "en_US"}], "name": "start"}, {"id": 11, "arguments": [{"domain": "peer-properties", "name": "client-properties"}, {"type": "shortstr", "name": "mechanism"}, {"type": "longstr", "name": "response"}, - {"type": "shortstr", "name": "locale"}], + {"type": "shortstr", "name": "locale", "default-value": "en_US"}], "name": "start-ok"}, {"id": 20, "arguments": [{"type": "longstr", "name": "challenge"}], @@ -125,9 +125,9 @@ "arguments": [{"type": "longstr", "name": "response"}], "name": "secure-ok"}, {"id": 30, - "arguments": [{"type": "short", "name": "channel-max"}, - {"type": "long", "name": "frame-max"}, - {"type": "short", "name": "heartbeat"}], + "arguments": [{"type": "short", "name": "channel-max", "default-value": 0}, + {"type": "long", "name": "frame-max", "default-value": 0}, + {"type": "short", "name": "heartbeat", "default-value": 0}], "name": "tune"}, {"id": 31, "arguments": [{"type": "short", "name": "channel-max"}, @@ -136,8 +136,8 @@ "name": "tune-ok"}, {"id": 40, "arguments": [{"type": "shortstr", "name": "virtual-host"}, - {"type": "shortstr", "name": "capabilities"}, - {"type": "bit", "name": "insist"}], + {"type": "shortstr", "name": "capabilities", "default-value": ""}, + {"type": "bit", "name": "insist", "default-value": 0}], "name": "open"}, {"id": 41, "arguments": [{"type": "shortstr", "name": "known-hosts"}], @@ -148,7 +148,7 @@ "name": "redirect"}, {"id": 60, "arguments": [{"type": "short", "name": "reply-code"}, - {"type": "shortstr", "name": "reply-text"}, + {"type": "shortstr", "name": "reply-text", "default-value": ""}, {"type": "short", "name": "class-id"}, {"type": "short", "name": "method-id"}], "name": "close"}, @@ -179,7 +179,7 @@ "name": "alert"}, {"id": 40, "arguments": [{"type": "short", "name": "reply-code"}, - {"type": "shortstr", "name": "reply-text"}, + {"type": "shortstr", "name": "reply-text", "default-value": ""}, {"type": "short", "name": "class-id"}, {"type": "short", "name": "method-id"}], "name": "close"}, @@ -191,7 +191,7 @@ { "id": 30, "methods": [{"id": 10, - "arguments": [{"type": "shortstr", "name": "realm"}, + "arguments": [{"type": "shortstr", "name": "realm", "default-value": "/data"}, {"type": "bit", "name": "exclusive", "default-value": false}, {"type": "bit", "name": "passive", "default-value": true}, {"type": "bit", "name": "active", "default-value": true}, @@ -199,16 +199,16 @@ {"type": "bit", "name": "read", "default-value": true}], "name": "request"}, {"id": 11, - "arguments": [{"type": "short", "name": "ticket"}], + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}], "name": "request-ok"}], "name": "access" }, { "id": 40, "methods": [{"id": 10, - "arguments": [{"type": "short", "name": "ticket"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, {"type": "shortstr", "name": "exchange"}, - {"type": "shortstr", "name": "type"}, + {"type": "shortstr", "name": "type", "default-value": "fanout"}, {"type": "bit", "name": "passive", "default-value": false}, {"type": "bit", "name": "durable", "default-value": false}, {"type": "bit", "name": "auto-delete", "default-value": false}, @@ -220,10 +220,10 @@ "arguments": [], "name": "declare-ok"}, {"id": 20, - "arguments": [{"type": "short", "name": "ticket"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, {"type": "shortstr", "name": "exchange"}, - {"type": "bit", "name": "if-unused"}, - {"type": "bit", "name": "nowait"}], + {"type": "bit", "name": "if-unused", "default-value": false}, + {"type": "bit", "name": "nowait", "default-value": false}], "name": "delete"}, {"id": 21, "arguments": [], @@ -233,8 +233,8 @@ { "id": 50, "methods": [{"id": 10, - "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, + {"type": "shortstr", "name": "queue", "default-value": ""}, {"type": "bit", "name": "passive", "default-value": false}, {"type": "bit", "name": "durable", "default-value": false}, {"type": "bit", "name": "exclusive", "default-value": false}, @@ -243,32 +243,32 @@ {"type": "table", "name": "arguments"}], "name": "declare"}, {"id": 11, - "arguments": [{"type": "shortstr", "name": "queue"}, + "arguments": [{"type": "shortstr", "name": "queue", "default-value": ""}, {"type": "long", "name": "message-count"}, {"type": "long", "name": "consumer-count"}], "name": "declare-ok"}, {"id": 20, - "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, + {"type": "shortstr", "name": "queue", "default-value": ""}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}, - {"type": "bit", "name": "nowait"}, + {"type": "bit", "name": "nowait", "default-value": false}, {"type": "table", "name": "arguments"}], "name": "bind"}, {"id": 21, "arguments": [], "name": "bind-ok"}, {"id": 30, - "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue"}, - {"type": "bit", "name": "nowait"}], + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, + {"type": "shortstr", "name": "queue", "default-value": ""}, + {"type": "bit", "name": "nowait", "default-value": false}], "name": "purge"}, {"id": 31, "arguments": [{"type": "long", "name": "message-count"}], "name": "purge-ok"}, {"id": 40, - "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, + {"type": "shortstr", "name": "queue", "default-value": ""}, {"type": "bit", "name": "if-unused", "default-value": true}, {"type": "bit", "name": "if-empty", "default-value": true}, {"type": "bit", "name": "nowait", "default-value": false}], @@ -281,16 +281,16 @@ { "id": 60, "methods": [{"id": 10, - "arguments": [{"type": "long", "name": "prefetch-size"}, + "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0}, {"type": "short", "name": "prefetch-count"}, - {"type": "bit", "name": "global"}], + {"type": "bit", "name": "global", "default-value": 0}], "name": "qos"}, {"id": 11, "arguments": [], "name": "qos-ok"}, {"id": 20, "arguments": [{"domain": "access-ticket", "name": "ticket"}, - {"domain": "queue-name", "name": "queue"}, + {"domain": "queue-name", "name": "queue", "default-value": ""}, {"type": "shortstr", "name": "consumer-tag"}, {"type": "bit", "name": "no-local", "default-value": false}, {"type": "bit", "name": "no-ack", "default-value": false}, @@ -302,23 +302,23 @@ "name": "consume-ok"}, {"id": 30, "arguments": [{"type": "shortstr", "name": "consumer-tag"}, - {"type": "bit", "name": "nowait"}], + {"type": "bit", "name": "nowait", "default-value": false}], "name": "cancel"}, {"id": 31, "arguments": [{"type": "shortstr", "name": "consumer-tag"}], "name": "cancel-ok"}, {"content": true, "id": 40, - "arguments": [{"type": "short", "name": "ticket"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}, - {"type": "bit", "name": "mandatory"}, - {"type": "bit", "name": "immediate"}], + {"type": "bit", "name": "mandatory", "default-value": false}, + {"type": "bit", "name": "immediate", "default-value": false}], "name": "publish"}, {"content": true, "id": 50, - "arguments": [{"type": "short", "name": "reply-code"}, - {"type": "shortstr", "name": "reply-text"}, + "arguments": [{"type": "short", "name": "reply-code", "default-value": 200}, + {"type": "shortstr", "name": "reply-text", "default-value": ""}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}], "name": "return"}, @@ -331,9 +331,9 @@ {"type": "shortstr", "name": "routing-key"}], "name": "deliver"}, {"id": 70, - "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue"}, - {"type": "bit", "name": "no-ack"}], + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, + {"type": "shortstr", "name": "queue", "default-value": ""}, + {"type": "bit", "name": "no-ack", "default-value": false}], "name": "get"}, {"content": true, "id": 71, @@ -348,14 +348,14 @@ "name": "get-empty"}, {"id": 80, "arguments": [{"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "multiple"}], + {"type": "bit", "name": "multiple", "default-value": false}], "name": "ack"}, {"id": 90, "arguments": [{"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "requeue"}], + {"type": "bit", "name": "requeue", "default-value": false}], "name": "reject"}, {"id": 100, - "arguments": [{"type": "bit", "name": "requeue"}], + "arguments": [{"type": "bit", "name": "requeue", "default-value": false}], "name": "recover"}], "name": "basic", "properties": [{"type": "shortstr", "name": "content-type"}, @@ -376,28 +376,28 @@ { "id": 70, "methods": [{"id": 10, - "arguments": [{"type": "long", "name": "prefetch-size"}, + "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0}, {"type": "short", "name": "prefetch-count"}, - {"type": "bit", "name": "global"}], + {"type": "bit", "name": "global", "default-value": 0}], "name": "qos"}, {"id": 11, "arguments": [], "name": "qos-ok"}, {"id": 20, - "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, + {"type": "shortstr", "name": "queue", "default-value": ""}, {"type": "shortstr", "name": "consumer-tag"}, - {"type": "bit", "name": "no-local"}, - {"type": "bit", "name": "no-ack"}, - {"type": "bit", "name": "exclusive"}, - {"type": "bit", "name": "nowait"}], + {"type": "bit", "name": "no-local", "default-value": false}, + {"type": "bit", "name": "no-ack", "default-value": false}, + {"type": "bit", "name": "exclusive", "default-value": false}, + {"type": "bit", "name": "nowait", "default-value": false}], "name": "consume"}, {"id": 21, "arguments": [{"type": "shortstr", "name": "consumer-tag"}], "name": "consume-ok"}, {"id": 30, "arguments": [{"type": "shortstr", "name": "consumer-tag"}, - {"type": "bit", "name": "nowait"}], + {"type": "bit", "name": "nowait", "default-value": false}], "name": "cancel"}, {"id": 31, "arguments": [{"type": "shortstr", "name": "consumer-tag"}], @@ -414,17 +414,17 @@ "arguments": [], "name": "stage"}, {"id": 60, - "arguments": [{"type": "short", "name": "ticket"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}, - {"type": "bit", "name": "mandatory"}, - {"type": "bit", "name": "immediate"}, + {"type": "bit", "name": "mandatory", "default-value": true}, + {"type": "bit", "name": "immediate", "default-value": true}, {"type": "shortstr", "name": "identifier"}], "name": "publish"}, {"content": true, "id": 70, - "arguments": [{"type": "short", "name": "reply-code"}, - {"type": "shortstr", "name": "reply-text"}, + "arguments": [{"type": "short", "name": "reply-code", "default-value": 200}, + {"type": "shortstr", "name": "reply-text", "default-value": ""}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}], "name": "return"}, @@ -438,11 +438,11 @@ "name": "deliver"}, {"id": 90, "arguments": [{"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "multiple"}], + {"type": "bit", "name": "multiple", "default-value": false}], "name": "ack"}, {"id": 100, "arguments": [{"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "requeue"}], + {"type": "bit", "name": "requeue", "default-value": false}], "name": "reject"}], "name": "file", "properties": [{"type": "shortstr", "name": "content-type"}, @@ -458,44 +458,44 @@ { "id": 80, "methods": [{"id": 10, - "arguments": [{"type": "long", "name": "prefetch-size"}, + "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0}, {"type": "short", "name": "prefetch-count"}, - {"type": "long", "name": "consume-rate"}, - {"type": "bit", "name": "global"}], + {"type": "long", "name": "consume-rate", "default-value": 0}, + {"type": "bit", "name": "global", "default-value": 0}], "name": "qos"}, {"id": 11, "arguments": [], "name": "qos-ok"}, {"id": 20, - "arguments": [{"type": "short", "name": "ticket"}, - {"type": "shortstr", "name": "queue"}, - {"type": "shortstr", "name": "consumer-tag"}, - {"type": "bit", "name": "no-local"}, - {"type": "bit", "name": "exclusive"}, - {"type": "bit", "name": "nowait"}], + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, + {"type": "shortstr", "name": "queue", "default-value": ""}, + {"type": "shortstr", "name": "consumer-tag", "default-value": ""}, + {"type": "bit", "name": "no-local", "default-value": false}, + {"type": "bit", "name": "exclusive", "default-value": false}, + {"type": "bit", "name": "nowait", "default-value": false}], "name": "consume"}, {"id": 21, "arguments": [{"type": "shortstr", "name": "consumer-tag"}], "name": "consume-ok"}, {"id": 30, "arguments": [{"type": "shortstr", "name": "consumer-tag"}, - {"type": "bit", "name": "nowait"}], + {"type": "bit", "name": "nowait", "default-value": false}], "name": "cancel"}, {"id": 31, "arguments": [{"type": "shortstr", "name": "consumer-tag"}], "name": "cancel-ok"}, {"content": true, "id": 40, - "arguments": [{"type": "short", "name": "ticket"}, + "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}, - {"type": "bit", "name": "mandatory"}, - {"type": "bit", "name": "immediate"}], + {"type": "bit", "name": "mandatory", "default-value": true}, + {"type": "bit", "name": "immediate", "default-value": true}], "name": "publish"}, {"content": true, "id": 50, - "arguments": [{"type": "short", "name": "reply-code"}, - {"type": "shortstr", "name": "reply-text"}, + "arguments": [{"type": "short", "name": "reply-code", "default-value": 200}, + {"type": "shortstr", "name": "reply-text", "default-value": ""}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}], "name": "return"}, @@ -504,7 +504,7 @@ "arguments": [{"type": "shortstr", "name": "consumer-tag"}, {"type": "longlong", "name": "delivery-tag"}, {"type": "shortstr", "name": "exchange"}, - {"type": "shortstr", "name": "queue"}], + {"type": "shortstr", "name": "queue", "default-value": ""}], "name": "deliver"}], "name": "stream", "properties": [{"type": "shortstr", "name": "content-type"}, From 952435a1ff78c1200a2f22d181ef843237896f39 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 26 Aug 2008 19:26:08 +0100 Subject: [PATCH 4/6] more default values also changed a few defaults to more sensible settings --- deps/rabbitmq_codegen/amqp-0.8.json | 82 ++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/deps/rabbitmq_codegen/amqp-0.8.json b/deps/rabbitmq_codegen/amqp-0.8.json index 006eb8597c..667adbb215 100644 --- a/deps/rabbitmq_codegen/amqp-0.8.json +++ b/deps/rabbitmq_codegen/amqp-0.8.json @@ -106,7 +106,7 @@ { "id": 10, "methods": [{"id": 10, - "arguments": [{"type": "octet", "name": "version-major", "default-value": 0}, + "arguments": [{"type": "octet", "name": "version-major", "default-value": 0}, {"type": "octet", "name": "version-minor", "default-value": 8}, {"domain": "peer-properties", "name": "server properties"}, {"type": "longstr", "name": "mechanisms", "default-value": "PLAIN"}, @@ -114,7 +114,7 @@ "name": "start"}, {"id": 11, "arguments": [{"domain": "peer-properties", "name": "client-properties"}, - {"type": "shortstr", "name": "mechanism"}, + {"type": "shortstr", "name": "mechanism", "default-value": "PLAIN"}, {"type": "longstr", "name": "response"}, {"type": "shortstr", "name": "locale", "default-value": "en_US"}], "name": "start-ok"}, @@ -130,21 +130,21 @@ {"type": "short", "name": "heartbeat", "default-value": 0}], "name": "tune"}, {"id": 31, - "arguments": [{"type": "short", "name": "channel-max"}, - {"type": "long", "name": "frame-max"}, - {"type": "short", "name": "heartbeat"}], + "arguments": [{"type": "short", "name": "channel-max", "default-value": 0}, + {"type": "long", "name": "frame-max", "default-value": 0}, + {"type": "short", "name": "heartbeat", "default-value": 0}], "name": "tune-ok"}, {"id": 40, - "arguments": [{"type": "shortstr", "name": "virtual-host"}, + "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"}, {"type": "shortstr", "name": "capabilities", "default-value": ""}, {"type": "bit", "name": "insist", "default-value": 0}], "name": "open"}, {"id": 41, - "arguments": [{"type": "shortstr", "name": "known-hosts"}], + "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}], "name": "open-ok"}, {"id": 50, "arguments": [{"type": "shortstr", "name": "host"}, - {"type": "shortstr", "name": "known-hosts"}], + {"type": "shortstr", "name": "known-hosts", "default-value": ""}], "name": "redirect"}, {"id": 60, "arguments": [{"type": "short", "name": "reply-code"}, @@ -161,7 +161,7 @@ { "id": 20, "methods": [{"id": 10, - "arguments": [{"type": "shortstr", "name": "out-of-band"}], + "arguments": [{"type": "shortstr", "name": "out-of-band", "default-value": ""}], "name": "open"}, {"id": 11, "arguments": [], @@ -174,7 +174,7 @@ "name": "flow-ok"}, {"id": 30, "arguments": [{"type": "short", "name": "reply-code"}, - {"type": "shortstr", "name": "reply-text"}, + {"type": "shortstr", "name": "reply-text", "default-value": ""}, {"type": "table", "name": "details"}], "name": "alert"}, {"id": 40, @@ -208,7 +208,7 @@ "methods": [{"id": 10, "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, {"type": "shortstr", "name": "exchange"}, - {"type": "shortstr", "name": "type", "default-value": "fanout"}, + {"type": "shortstr", "name": "type", "default-value": "direct"}, {"type": "bit", "name": "passive", "default-value": false}, {"type": "bit", "name": "durable", "default-value": false}, {"type": "bit", "name": "auto-delete", "default-value": false}, @@ -238,7 +238,7 @@ {"type": "bit", "name": "passive", "default-value": false}, {"type": "bit", "name": "durable", "default-value": false}, {"type": "bit", "name": "exclusive", "default-value": false}, - {"type": "bit", "name": "auto-delete", "default-value": true}, + {"type": "bit", "name": "auto-delete", "default-value": false}, {"type": "bit", "name": "nowait", "default-value": false}, {"type": "table", "name": "arguments"}], "name": "declare"}, @@ -250,8 +250,8 @@ {"id": 20, "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, {"type": "shortstr", "name": "queue", "default-value": ""}, - {"type": "shortstr", "name": "exchange"}, - {"type": "shortstr", "name": "routing-key"}, + {"type": "shortstr", "name": "exchange", "default-value": ""}, + {"type": "shortstr", "name": "routing-key", "default-value": ""}, {"type": "bit", "name": "nowait", "default-value": false}, {"type": "table", "name": "arguments"}], "name": "bind"}, @@ -269,8 +269,8 @@ {"id": 40, "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, {"type": "shortstr", "name": "queue", "default-value": ""}, - {"type": "bit", "name": "if-unused", "default-value": true}, - {"type": "bit", "name": "if-empty", "default-value": true}, + {"type": "bit", "name": "if-unused", "default-value": false}, + {"type": "bit", "name": "if-empty", "default-value": false}, {"type": "bit", "name": "nowait", "default-value": false}], "name": "delete"}, {"id": 41, @@ -282,15 +282,15 @@ "id": 60, "methods": [{"id": 10, "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0}, - {"type": "short", "name": "prefetch-count"}, - {"type": "bit", "name": "global", "default-value": 0}], + {"type": "short", "name": "prefetch-count", "default-value": 0}, + {"type": "bit", "name": "global", "default-value": false}], "name": "qos"}, {"id": 11, "arguments": [], "name": "qos-ok"}, {"id": 20, "arguments": [{"domain": "access-ticket", "name": "ticket"}, - {"domain": "queue-name", "name": "queue", "default-value": ""}, + {"domain": "queue-name", "name": "queue", "default-value": ""}, {"type": "shortstr", "name": "consumer-tag"}, {"type": "bit", "name": "no-local", "default-value": false}, {"type": "bit", "name": "no-ack", "default-value": false}, @@ -310,8 +310,8 @@ {"content": true, "id": 40, "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, - {"type": "shortstr", "name": "exchange"}, - {"type": "shortstr", "name": "routing-key"}, + {"type": "shortstr", "name": "exchange", "default-value": ""}, + {"type": "shortstr", "name": "routing-key", "default-value": ""}, {"type": "bit", "name": "mandatory", "default-value": false}, {"type": "bit", "name": "immediate", "default-value": false}], "name": "publish"}, @@ -326,7 +326,7 @@ "id": 60, "arguments": [{"type": "shortstr", "name": "consumer-tag"}, {"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "redelivered"}, + {"type": "bit", "name": "redelivered", "default-value": false}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}], "name": "deliver"}, @@ -338,17 +338,17 @@ {"content": true, "id": 71, "arguments": [{"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "redelivered"}, + {"type": "bit", "name": "redelivered", "default-value": false}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}, {"type": "long", "name": "message-count"}], "name": "get-ok"}, {"id": 72, - "arguments": [{"type": "shortstr", "name": "cluster-id"}], + "arguments": [{"type": "shortstr", "name": "cluster-id", "default-value": ""}], "name": "get-empty"}, {"id": 80, - "arguments": [{"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "multiple", "default-value": false}], + "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0}, + {"type": "bit", "name": "multiple", "default-value": true}], "name": "ack"}, {"id": 90, "arguments": [{"type": "longlong", "name": "delivery-tag"}, @@ -377,8 +377,8 @@ "id": 70, "methods": [{"id": 10, "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0}, - {"type": "short", "name": "prefetch-count"}, - {"type": "bit", "name": "global", "default-value": 0}], + {"type": "short", "name": "prefetch-count", "default-value": 0}, + {"type": "bit", "name": "global", "default-value": false}], "name": "qos"}, {"id": 11, "arguments": [], @@ -415,10 +415,10 @@ "name": "stage"}, {"id": 60, "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, - {"type": "shortstr", "name": "exchange"}, - {"type": "shortstr", "name": "routing-key"}, - {"type": "bit", "name": "mandatory", "default-value": true}, - {"type": "bit", "name": "immediate", "default-value": true}, + {"type": "shortstr", "name": "exchange", "default-value": ""}, + {"type": "shortstr", "name": "routing-key", "default-value": ""}, + {"type": "bit", "name": "mandatory", "default-value": false}, + {"type": "bit", "name": "immediate", "default-value": false}, {"type": "shortstr", "name": "identifier"}], "name": "publish"}, {"content": true, @@ -431,14 +431,14 @@ {"id": 80, "arguments": [{"type": "shortstr", "name": "consumer-tag"}, {"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "redelivered"}, + {"type": "bit", "name": "redelivered", "default-value": false}, {"type": "shortstr", "name": "exchange"}, {"type": "shortstr", "name": "routing-key"}, {"type": "shortstr", "name": "identifier"}], "name": "deliver"}, {"id": 90, - "arguments": [{"type": "longlong", "name": "delivery-tag"}, - {"type": "bit", "name": "multiple", "default-value": false}], + "arguments": [{"type": "longlong", "name": "delivery-tag", "default-value": 0}, + {"type": "bit", "name": "multiple", "default-value": true}], "name": "ack"}, {"id": 100, "arguments": [{"type": "longlong", "name": "delivery-tag"}, @@ -459,9 +459,9 @@ "id": 80, "methods": [{"id": 10, "arguments": [{"type": "long", "name": "prefetch-size", "default-value": 0}, - {"type": "short", "name": "prefetch-count"}, + {"type": "short", "name": "prefetch-count", "default-value": 0}, {"type": "long", "name": "consume-rate", "default-value": 0}, - {"type": "bit", "name": "global", "default-value": 0}], + {"type": "bit", "name": "global", "default-value": false}], "name": "qos"}, {"id": 11, "arguments": [], @@ -487,10 +487,10 @@ {"content": true, "id": 40, "arguments": [{"type": "short", "name": "ticket", "default-value": 1}, - {"type": "shortstr", "name": "exchange"}, - {"type": "shortstr", "name": "routing-key"}, - {"type": "bit", "name": "mandatory", "default-value": true}, - {"type": "bit", "name": "immediate", "default-value": true}], + {"type": "shortstr", "name": "exchange", "default-value": ""}, + {"type": "shortstr", "name": "routing-key", "default-value": ""}, + {"type": "bit", "name": "mandatory", "default-value": false}, + {"type": "bit", "name": "immediate", "default-value": false}], "name": "publish"}, {"content": true, "id": 50, From 876bff2356ce80baea10b4d05757723e0891827a Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 26 Aug 2008 20:29:54 +0100 Subject: [PATCH 5/6] add a few empty-table defaults --- deps/rabbitmq_codegen/amqp-0.8.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/rabbitmq_codegen/amqp-0.8.json b/deps/rabbitmq_codegen/amqp-0.8.json index 667adbb215..2dc2150615 100644 --- a/deps/rabbitmq_codegen/amqp-0.8.json +++ b/deps/rabbitmq_codegen/amqp-0.8.json @@ -175,7 +175,7 @@ {"id": 30, "arguments": [{"type": "short", "name": "reply-code"}, {"type": "shortstr", "name": "reply-text", "default-value": ""}, - {"type": "table", "name": "details"}], + {"type": "table", "name": "details", "default-value": {}}], "name": "alert"}, {"id": 40, "arguments": [{"type": "short", "name": "reply-code"}, @@ -214,7 +214,7 @@ {"type": "bit", "name": "auto-delete", "default-value": false}, {"type": "bit", "name": "internal", "default-value": false}, {"type": "bit", "name": "nowait", "default-value": false}, - {"type": "table", "name": "arguments"}], + {"type": "table", "name": "arguments", "default-value": {}}], "name": "declare"}, {"id": 11, "arguments": [], @@ -240,7 +240,7 @@ {"type": "bit", "name": "exclusive", "default-value": false}, {"type": "bit", "name": "auto-delete", "default-value": false}, {"type": "bit", "name": "nowait", "default-value": false}, - {"type": "table", "name": "arguments"}], + {"type": "table", "name": "arguments", "default-value": {}}], "name": "declare"}, {"id": 11, "arguments": [{"type": "shortstr", "name": "queue", "default-value": ""}, @@ -253,7 +253,7 @@ {"type": "shortstr", "name": "exchange", "default-value": ""}, {"type": "shortstr", "name": "routing-key", "default-value": ""}, {"type": "bit", "name": "nowait", "default-value": false}, - {"type": "table", "name": "arguments"}], + {"type": "table", "name": "arguments", "default-value": {}}], "name": "bind"}, {"id": 21, "arguments": [], From 4648f344e5fb7a4934190294609508a57f122dcf Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 26 Aug 2008 20:47:54 +0100 Subject: [PATCH 6/6] squash tiny bug --- deps/rabbitmq_codegen/amqp-0.8.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbitmq_codegen/amqp-0.8.json b/deps/rabbitmq_codegen/amqp-0.8.json index 2dc2150615..da67bfdf98 100644 --- a/deps/rabbitmq_codegen/amqp-0.8.json +++ b/deps/rabbitmq_codegen/amqp-0.8.json @@ -137,7 +137,7 @@ {"id": 40, "arguments": [{"type": "shortstr", "name": "virtual-host", "default-value": "/"}, {"type": "shortstr", "name": "capabilities", "default-value": ""}, - {"type": "bit", "name": "insist", "default-value": 0}], + {"type": "bit", "name": "insist", "default-value": false}], "name": "open"}, {"id": 41, "arguments": [{"type": "shortstr", "name": "known-hosts", "default-value": ""}],