Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inconsistent duplicated timestamp in Publication #580

Merged
merged 7 commits into from
Nov 7, 2023
Merged

Inconsistent duplicated timestamp in Publication #580

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3263715
Support for time interval filtering in query for PublicationCache
juanjole Jul 28, 2023
cf2b695
Merge branch 'master' of https://github.com/eclipse-zenoh/zenoh
juanjole Jul 28, 2023
fab7f2d
Support for time interval filtering in query for PublicationCache
juanjole Jul 28, 2023
8e12ead
Panicking unwrap() fixed
juanjole Jul 31, 2023
f7f7926
Merge branch 'eclipse-zenoh:master' into master
juanjole Aug 28, 2023
24a3c2d
Merge branch 'eclipse-zenoh:master' into master
juanjole Nov 6, 2023
141feff
Fix duplicated and inconsistent timestamp if local and remote publica…
juanjole Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions zenoh/src/publication.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ impl SyncResolve for Publication<'_> {
.as_ref()
.unwrap()
.clone();
let timestamp = publisher.session.runtime.new_timestamp();

if publisher.destination != Locality::SessionLocal {
primitives.send_push(Push {
Expand All @@ -439,7 +440,7 @@ impl SyncResolve for Publication<'_> {
ext_tstamp: None,
ext_nodeid: ext::NodeIdType::default(),
payload: PushBody::Put(Put {
timestamp: publisher.session.runtime.new_timestamp(),
timestamp,
encoding: value.encoding.clone(),
ext_sinfo: None,
#[cfg(feature = "shared-memory")]
Expand All @@ -453,7 +454,7 @@ impl SyncResolve for Publication<'_> {
let data_info = DataInfo {
kind,
encoding: Some(value.encoding),
timestamp: publisher.session.runtime.new_timestamp(),
timestamp,
..Default::default()
};
publisher.session.handle_data(
Expand Down
Loading