WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit aa8dd4b

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #15088 from rabbitmq/loic-rm-amqp_0_8
Remove code for AMQP 0.8
2 parents 4753046 + 453f1c3 commit aa8dd4b

File tree

9 files changed

+8
-1731
lines changed

9 files changed

+8
-1731
lines changed

‎deps/rabbit/test/unit_amqp091_content_framing_SUITE.erl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ content_transcoding(_Config) ->
171171
sequence_with_content([ClearEncoded, Op]),
172172
sequence_with_content([ClearDecoded, Op])
173173
end || Op <- [ClearDecoded, ClearEncoded, EnsureDecoded,
174-
EnsureEncoded(rabbit_framing_amqp_0_9_1),
175-
EnsureEncoded(rabbit_framing_amqp_0_8)]],
174+
EnsureEncoded(rabbit_framing_amqp_0_9_1)]],
176175
passed.
177176

178177
sequence_with_content(Sequence) ->

‎deps/rabbit_common/codegen.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,6 @@ def genAmqpException(c,v,cls):
307307
module = "rabbit_framing_amqp_%d_%d" % (spec.major, spec.minor)
308308
if spec.revision != 0:
309309
module = "%s_%d" % (module, spec.revision)
310-
if module == "rabbit_framing_amqp_8_0":
311-
module = "rabbit_framing_amqp_0_8"
312310
print("-module(%s)." % module)
313311
print("""-include("rabbit_framing.hrl").
314312
-include_lib("kernel/include/logger.hrl").

‎deps/rabbit_common/development.post.mk‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,19 @@ CODEGEN = $(CURDIR)/codegen.py
77
CODEGEN_DIR ?= $(DEPS_DIR)/rabbitmq_codegen
88
CODEGEN_AMQP = $(CODEGEN_DIR)/amqp_codegen.py
99

10-
AMQP_SPEC_JSON_FILES_0_8 = $(CODEGEN_DIR)/amqp-rabbitmq-0.8.json
1110
AMQP_SPEC_JSON_FILES_0_9_1 = $(CODEGEN_DIR)/amqp-rabbitmq-0.9.1.json \
1211
$(CODEGEN_DIR)/credit_extension.json
1312

14-
include/rabbit_framing.hrl:: $(CODEGEN) $(CODEGEN_AMQP) \
15-
$(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8)
13+
include/rabbit_framing.hrl:: $(CODEGEN) $(CODEGEN_AMQP) $(AMQP_SPEC_JSON_FILES_0_9_1)
1614
$(gen_verbose) env PYTHONPATH=$(CODEGEN_DIR) \
1715
$(PYTHON) $(CODEGEN) --ignore-conflicts header \
18-
$(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8) $@
16+
$(AMQP_SPEC_JSON_FILES_0_9_1) $@
1917

2018
src/rabbit_framing_amqp_0_9_1.erl:: $(CODEGEN) $(CODEGEN_AMQP) \
2119
$(AMQP_SPEC_JSON_FILES_0_9_1)
2220
$(gen_verbose) env PYTHONPATH=$(CODEGEN_DIR) \
2321
$(PYTHON) $(CODEGEN) body $(AMQP_SPEC_JSON_FILES_0_9_1) $@
2422

25-
src/rabbit_framing_amqp_0_8.erl:: $(CODEGEN) $(CODEGEN_AMQP) \
26-
$(AMQP_SPEC_JSON_FILES_0_8)
27-
$(gen_verbose) env PYTHONPATH=$(CODEGEN_DIR) \
28-
$(PYTHON) $(CODEGEN) body $(AMQP_SPEC_JSON_FILES_0_8) $@
29-
3023
clean:: clean-extra-sources
3124

3225
clean-extra-sources:

‎deps/rabbit_common/development.pre.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
BUILD_DEPS = rabbitmq_codegen
77
TEST_DEPS = proper
88

9-
EXTRA_SOURCES += include/rabbit_framing.hrl \
10-
src/rabbit_framing_amqp_0_8.erl \
9+
EXTRA_SOURCES += include/rabbit_framing.hrl \
1110
src/rabbit_framing_amqp_0_9_1.erl
1211

1312
.DEFAULT_GOAL = all

‎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().

‎deps/rabbit_common/src/rabbit_framing.erl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
amqp_method_field_name/0, amqp_property_record/0,
1717
amqp_exception/0, amqp_exception_code/0, amqp_class_id/0]).
1818

19-
-type protocol() :: 'rabbit_framing_amqp_0_8' | 'rabbit_framing_amqp_0_9_1'.
19+
-type protocol() :: 'rabbit_framing_amqp_0_9_1'.
2020

21-
-define(protocol_type(T), type(T :: rabbit_framing_amqp_0_8:T |
22-
rabbit_framing_amqp_0_9_1:T)).
21+
-define(protocol_type(T), type(T :: rabbit_framing_amqp_0_9_1:T)).
2322

2423
-?protocol_type(amqp_field_type()).
2524
-?protocol_type(amqp_property_type()).

0 commit comments

Comments
 (0)