Skip to content

Commit dc9025d

Browse files
committed
fixup! DO NOT MERGE: Remove AMQP 0.8
1 parent 4a70bca commit dc9025d

File tree

2 files changed

+1
-50
lines changed

2 files changed

+1
-50
lines changed

deps/rabbit_common/include/rabbit_framing.hrl

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
-define(NOT_ALLOWED, 530).
3333
-define(NOT_IMPLEMENTED, 540).
3434
-define(INTERNAL_ERROR, 541).
35-
-define(FRAME_OOB_METHOD, 4).
36-
-define(FRAME_OOB_HEADER, 5).
37-
-define(FRAME_OOB_BODY, 6).
38-
-define(FRAME_TRACE, 7).
39-
-define(NOT_DELIVERED, 310).
4035
%% Method field records.
4136
-record('basic.qos', {prefetch_size = 0, prefetch_count = 0, global = false}).
4237
-record('basic.qos_ok', {}).
@@ -73,14 +68,12 @@
7368
-record('connection.unblocked', {}).
7469
-record('connection.update_secret', {new_secret, reason}).
7570
-record('connection.update_secret_ok', {}).
76-
-record('connection.redirect', {host, known_hosts = <<"">>}).
7771
-record('channel.open', {out_of_band = <<"">>}).
7872
-record('channel.open_ok', {channel_id = <<"">>}).
7973
-record('channel.flow', {active}).
8074
-record('channel.flow_ok', {active}).
8175
-record('channel.close', {reply_code, reply_text = <<"">>, class_id, method_id}).
8276
-record('channel.close_ok', {}).
83-
-record('channel.alert', {reply_code, reply_text = <<"">>, details = []}).
8477
-record('access.request', {realm = <<"/data">>, exclusive = false, passive = true, active = true, write = true, read = true}).
8578
-record('access.request_ok', {ticket = 1}).
8679
-record('exchange.declare', {ticket = 0, exchange, type = <<"direct">>, passive = false, durable = false, auto_delete = false, internal = false, nowait = false, arguments = []}).
@@ -109,42 +102,6 @@
109102
-record('tx.rollback_ok', {}).
110103
-record('confirm.select', {nowait = false}).
111104
-record('confirm.select_ok', {}).
112-
-record('file.qos', {prefetch_size = 0, prefetch_count = 0, global = false}).
113-
-record('file.qos_ok', {}).
114-
-record('file.consume', {ticket = 1, queue = <<"">>, consumer_tag = <<"">>, no_local = false, no_ack = false, exclusive = false, nowait = false}).
115-
-record('file.consume_ok', {consumer_tag}).
116-
-record('file.cancel', {consumer_tag, nowait = false}).
117-
-record('file.cancel_ok', {consumer_tag}).
118-
-record('file.open', {identifier, content_size}).
119-
-record('file.open_ok', {staged_size}).
120-
-record('file.stage', {}).
121-
-record('file.publish', {ticket = 1, exchange = <<"">>, routing_key = <<"">>, mandatory = false, immediate = false, identifier}).
122-
-record('file.return', {reply_code = 200, reply_text = <<"">>, exchange, routing_key}).
123-
-record('file.deliver', {consumer_tag, delivery_tag, redelivered = false, exchange, routing_key, identifier}).
124-
-record('file.ack', {delivery_tag = 0, multiple = false}).
125-
-record('file.reject', {delivery_tag, requeue = true}).
126-
-record('stream.qos', {prefetch_size = 0, prefetch_count = 0, consume_rate = 0, global = false}).
127-
-record('stream.qos_ok', {}).
128-
-record('stream.consume', {ticket = 1, queue = <<"">>, consumer_tag = <<"">>, no_local = false, exclusive = false, nowait = false}).
129-
-record('stream.consume_ok', {consumer_tag}).
130-
-record('stream.cancel', {consumer_tag, nowait = false}).
131-
-record('stream.cancel_ok', {consumer_tag}).
132-
-record('stream.publish', {ticket = 1, exchange = <<"">>, routing_key = <<"">>, mandatory = false, immediate = false}).
133-
-record('stream.return', {reply_code = 200, reply_text = <<"">>, exchange, routing_key}).
134-
-record('stream.deliver', {consumer_tag, delivery_tag, exchange, queue}).
135-
-record('dtx.select', {}).
136-
-record('dtx.select_ok', {}).
137-
-record('dtx.start', {dtx_identifier}).
138-
-record('dtx.start_ok', {}).
139-
-record('tunnel.request', {meta_data}).
140-
-record('test.integer', {integer_1, integer_2, integer_3, integer_4, operation}).
141-
-record('test.integer_ok', {result}).
142-
-record('test.string', {string_1, string_2, operation}).
143-
-record('test.string_ok', {result}).
144-
-record('test.table', {table, integer_op, string_op}).
145-
-record('test.table_ok', {integer_result, string_result}).
146-
-record('test.content', {}).
147-
-record('test.content_ok', {content_checksum}).
148105
%% Class property records.
149106
-record('P_basic', {content_type, content_encoding, headers, delivery_mode, priority, correlation_id, reply_to, expiration, message_id, timestamp, type, user_id, app_id, cluster_id}).
150107
-record('P_connection', {}).
@@ -154,8 +111,3 @@
154111
-record('P_queue', {}).
155112
-record('P_tx', {}).
156113
-record('P_confirm', {}).
157-
-record('P_file', {content_type, content_encoding, headers, priority, reply_to, message_id, filename, timestamp, cluster_id}).
158-
-record('P_stream', {content_type, content_encoding, headers, priority, timestamp}).
159-
-record('P_dtx', {}).
160-
-record('P_tunnel', {headers, proxy_name, data_name, durable, broadcast}).
161-
-record('P_test', {}).

deps/rabbit_common/src/rabbit_command_assembler.erl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
-export_type([frame/0]).
1919

2020
-type frame_type() :: ?FRAME_METHOD | ?FRAME_HEADER | ?FRAME_BODY |
21-
?FRAME_OOB_METHOD | ?FRAME_OOB_HEADER | ?FRAME_OOB_BODY |
22-
?FRAME_TRACE | ?FRAME_HEARTBEAT.
21+
?FRAME_HEARTBEAT.
2322
-type protocol() :: rabbit_framing:protocol().
2423
-type method() :: rabbit_framing:amqp_method_record().
2524
-type class_id() :: rabbit_framing:amqp_class_id().

0 commit comments

Comments
 (0)