Apply automatic mapping rules in case only package+message mapping exists #382
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LoyVanBeek
force-pushed
the
fix/mapping_uuids
branch
from
338c7f8
to
b708678
Compare
This was referenced Oct 25, 2022
Merged
|
Please correct the DCO for your commits. |
|
Please re-target your PR to the |
gbiggs
approved these changes
Oct 31, 2022
|
There is no rolling branch. Latest is ROS distro listed in |
LoyVanBeek
force-pushed
the
fix/mapping_uuids
branch
from
d96be82
to
e1e8daa
Compare
|
Sorry, you're correct. Please target it to master. |
… be applied In determine_field_mapping, there was an early return inside a loop over all mapping rules. IF there we any mapping rules but they don't specify field mappings, the early return made the function return without creating mappings automatically. For a particular message type, ROS 1's uuid_msgs/UniqueID vs ROS 2's unique_identifier_msgs/UUID, the message definition is exacly the same but type name is not. The only mapping fule defined in for unique_identifier_msgs/UUID is that it maps to uuid_msgs/UniqueID, but no field mappings are needed because the definitions are the same. But, then we hit the early return (because the for-loop is ran without any rule applying to the message at hand and thus not `continue`-ing in a code branch handling a rule) and return without applying the normal automatic field mapping generation rules. By removing the early return, the other rules are applied and the mapping rules for handling the exact same message defintions are applied Signed-off-by: Loy van Beek <[email protected]>
The code after the early return mentioned in the previous commit assumed all fields would match by name, which was of course true. But not anymore, so the missing check now only fails when the missing fields are also not already accounted for via a mapping Signed-off-by: Loy van Beek <[email protected]>
Signed-off-by: Loy van Beek <[email protected]>
LoyVanBeek
force-pushed
the
fix/mapping_uuids
branch
from
e1e8daa
to
e00d082
Compare
LoyVanBeek
force-pushed
the
fix/mapping_uuids
branch
2 times, most recently
from
76a6396
to
196ca18
Compare
gbiggs
approved these changes
Nov 3, 2022
|
CI: |
|
Looks like the instability is unrelated to this PR. |
|
Thanks for the contribution! |
|
No thnx, nice to have this merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
determine_field_mapping, there was an early return inside a loop over all mapping rules. If there were any mapping rules but they don't specify field mappings, the early return made the function return without creating field mappings automatically.For a particular message type, ROS 1's uuid_msgs/UniqueID vs ROS 2's unique_identifier_msgs/UUID, the message definition is exactly the same but type name is not. The only mapping rule defined for
unique_identifier_msgs/UUIDis that it maps touuid_msgs/UniqueID, but no field mappings are needed because the definitions are the same: https://github.com/ros2/unique_identifier_msgs/blob/rolling/mapping_rules.yamlBut, then we hit the early return (because the for-loop is ran without any rule applying to the message at hand and thus not
continue-ing in a code branch handling a rule) and return without applying the normal automatic field mapping generation rules.By removing the early return, the other rules are applied and the mapping rules for handling the exact same message definitions are applied.
This fixes the issue found in ros2/unique_identifier_msgs#25 in
ros1_bridgeinstead ofunique_identifier_msgsThis PR applies to
foxybecause I combine it with Noetic and can test only that combo, but the early return causing this issue is still there on the main branch: https://github.com/ros2/ros1_bridge/blob/master/ros1_bridge/__init__.py#L788