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

Jump to bottom

Handle merge conflicts of two logs #12726

Closed
AntonPiccardoSelg opened this issue Jun 3, 2015 · 2 comments
Closed

Handle merge conflicts of two logs #12726

AntonPiccardoSelg opened this issue Jun 3, 2015 · 2 comments
Assignees
@AntonPiccardoSelg
Labels
Framework Issues and pull requests related to components in the Framework High Priority An issue or pull request that if not addressed is severe enough to postponse a release.
Milestone
Release 3.5

Comments

@AntonPiccardoSelg
Copy link
Contributor

When we add two time series properties we append the values. This means we can end up with two entries which have the same time stamp, e.g. when adding a workspace to itself.

Here we want to detect the collision and introduce a time shift of 1ns to resolve it

Keywords: Adding logs
@AntonPiccardoSelg
Copy link
Contributor Author

This issue was originally trac ticket 11888

@AntonPiccardoSelg AntonPiccardoSelg added High Priority An issue or pull request that if not addressed is severe enough to postponse a release. Framework Issues and pull requests related to components in the Framework labels Jun 3, 2015
@AntonPiccardoSelg AntonPiccardoSelg self-assigned this Jun 3, 2015
@AntonPiccardoSelg AntonPiccardoSelg added this to the Release 3.5 milestone Jun 3, 2015
@AntonPiccardoSelg AntonPiccardoSelg mentioned this issue Jun 3, 2015
Closed
@rosswhitfield rosswhitfield reopened this Jun 3, 2015
AntonPiccardoSelg added a commit that referenced this issue Jun 5, 2015
@AntonPiccardoSelg
Refs #12726 Provide collision handling for the time series properties
7f0e7a3
AntonPiccardoSelg added a commit that referenced this issue Jun 5, 2015
@AntonPiccardoSelg
Refs #12726 Fix functionality and add unit test
536ab12
@AntonPiccardoSelg AntonPiccardoSelg mentioned this issue Jun 5, 2015
Closed
AntonPiccardoSelg added a commit that referenced this issue Jun 5, 2015
@AntonPiccardoSelg
Refs #12726 Fix unit test for multi merge
d2d83aa
AntonPiccardoSelg added a commit that referenced this issue Jun 5, 2015
@AntonPiccardoSelg
Refs #12726 Fix compiler warning
ed9a54c
@AntonPiccardoSelg
Copy link
Contributor Author

This has been resolved. We respect both entries and do not perform a time shift

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@AntonPiccardoSelg AntonPiccardoSelg

Labels
Framework Issues and pull requests related to components in the Framework High Priority An issue or pull request that if not addressed is severe enough to postponse a release.
Projects
None yet
Milestone
Release 3.5
2 participants
@rosswhitfield @AntonPiccardoSelg