summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Cogoluègnes <acogoluegnes@gmail.com>2020-11-27 14:47:36 +0100
committerMichael Klishin <michael@clojurewerkz.org>2020-11-30 13:29:19 +0300
commita5397c749fcc9d14b4658a27fb84e26d94143b6b (patch)
treed81be728e61ba220e9f3b93bdbb4f309717053c2
parent25d8d4097eea2dd8b51b9e87660c67bd9fb4fb47 (diff)
downloadrabbitmq-server-git-a5397c749fcc9d14b4658a27fb84e26d94143b6b.tar.gz
Convert AMQP 091 timestamp to millisecond
For start offset in stream queue.
-rw-r--r--deps/rabbit/src/rabbit_stream_queue.erl2
-rw-r--r--deps/rabbit/test/rabbit_stream_queue_SUITE.erl4
2 files changed, 3 insertions, 3 deletions
diff --git a/deps/rabbit/src/rabbit_stream_queue.erl b/deps/rabbit/src/rabbit_stream_queue.erl
index f1673a21ff..223e19c713 100644
--- a/deps/rabbit/src/rabbit_stream_queue.erl
+++ b/deps/rabbit/src/rabbit_stream_queue.erl
@@ -183,7 +183,7 @@ consume(Q, Spec, QState0) when ?amqqueue_is_stream(Q) ->
{_, <<"next">>} ->
next;
{timestamp, V} ->
- {timestamp, V};
+ {timestamp, V * 1000};
{_, V} ->
V
end,
diff --git a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
index a1055458db..25f3c05c66 100644
--- a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
+++ b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
@@ -619,7 +619,7 @@ consume_timestamp_offset(Config) ->
Ch1 = rabbit_ct_client_helpers:open_channel(Config, Server),
qos(Ch1, 10, false),
- Offset = erlang:system_time(millisecond) - 600000,
+ Offset = erlang:system_time(second) - 60,
amqp_channel:subscribe(
Ch1,
#'basic.consume'{queue = Q,
@@ -653,7 +653,7 @@ consume_timestamp_last_offset(Config) ->
qos(Ch1, 10, false),
%% Subscribe from now/future
- Offset = erlang:system_time(millisecond) + 60000,
+ Offset = erlang:system_time(second) + 60,
amqp_channel:subscribe(
Ch1,
#'basic.consume'{queue = Q,