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.

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

Plan cache code review fixes (sans unit tests) #26

Merged

Conversation

methylDragon
Copy link
Collaborator

@methylDragon methylDragon commented Nov 20, 2023

Description

This PR addresses code review comments across the following PRs:

It's done as a separate PR so the pending PRs don't need to be constantly rebased (and changes duplicated.)

The git history now looks like:

# [[ THIS PR ]]
d1847ba (HEAD -> ch3/plan-cache-code-review-fixes, origin/ch3/plan-cache-code-review-fixes)
...

# [[ PR 18 ]]
b2cda90 (origin/ch3/cartesian-plan-cache, ch3/cartesian-plan-cache) Fix move bug
...

# [[ PR 16 ]]
ca0f123 (origin/ch3/motion-plan-cache, ch3/motion-plan-cache) Remove internal cache node
...

dcede0e (tag: 0.1.1, origin/main, origin/HEAD) Bump versions to 0.1.1 (#25)

Changes

  • Remove usage of query appending macro
  • Default to warehouse_ros plugin if parameter is not set
  • Return and check cache init result
  • Add explanatory comments
  • Refactor PutPlan and update variable names
  • Split out motion plan cache into its own library

Testing

A unit test will be added in a later PR.

@methylDragon methylDragon marked this pull request as draft November 20, 2023 19:39
@methylDragon methylDragon force-pushed the ch3/plan-cache-code-review-fixes branch from 0e1e9e3 to 6ebd330 Compare November 20, 2023 19:41
@methylDragon methylDragon mentioned this pull request Nov 20, 2023
4 tasks
Signed-off-by: methylDragon <[email protected]>
@methylDragon methylDragon force-pushed the ch3/plan-cache-code-review-fixes branch from 6ebd330 to 6ad592e Compare November 20, 2023 19:47
@methylDragon methylDragon force-pushed the ch3/plan-cache-code-review-fixes branch from 76f5faf to 5563f3c Compare November 20, 2023 19:57
Signed-off-by: methylDragon <[email protected]>
@methylDragon methylDragon force-pushed the ch3/plan-cache-code-review-fixes branch from 4e76d71 to 03afb8e Compare November 20, 2023 19:59
@methylDragon methylDragon changed the base branch from main to ch3/cartesian-plan-cache November 20, 2023 22:56
@methylDragon methylDragon force-pushed the ch3/plan-cache-code-review-fixes branch from f5713a1 to d1847ba Compare November 20, 2023 23:03
@methylDragon methylDragon changed the title (WIP) Plan cache code review fixes Plan cache code review fixes Nov 20, 2023
@methylDragon methylDragon marked this pull request as ready for review November 20, 2023 23:06
@methylDragon methylDragon changed the title Plan cache code review fixes Plan cache code review fixes (sans unit tests) Nov 20, 2023
@methylDragon methylDragon force-pushed the ch3/plan-cache-code-review-fixes branch from f166c89 to 6c29eae Compare November 21, 2023 03:34
@methylDragon methylDragon force-pushed the ch3/plan-cache-code-review-fixes branch from 6c29eae to 636b4d5 Compare November 21, 2023 03:39
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
This was referenced Nov 22, 2023
* Add count methods

Signed-off-by: methylDragon <[email protected]>

* Enable shared from this for cache class

Signed-off-by: methylDragon <[email protected]>

* Add unit test build rules

Signed-off-by: methylDragon <[email protected]>

* Add tests for motion plan cache (but not cartesian)

Signed-off-by: methylDragon <[email protected]>

* Fix bugs in cartesian caching

Signed-off-by: methylDragon <[email protected]>

* Add tests for cartesian plan cache

Signed-off-by: methylDragon <[email protected]>

* Exit if a test fails

Signed-off-by: methylDragon <[email protected]>

* Remove gtest import

Signed-off-by: methylDragon <[email protected]>

* Remove enable_shared_from_this

Signed-off-by: methylDragon <[email protected]>

* Only check for failure

Signed-off-by: methylDragon <[email protected]>

* Test half in-tolerance

Signed-off-by: methylDragon <[email protected]>

* Test different robot cache

Signed-off-by: methylDragon <[email protected]>

* Add force_cache_mode_execute_read_only (#29)

* Add force_cache_mode_execute_read_only

Signed-off-by: methylDragon <[email protected]>

* Add force_cache_mode_execute_read_only input port

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>
@methylDragon methylDragon merged commit 66864b9 into ch3/cartesian-plan-cache Nov 27, 2023
1 of 2 checks passed
Yadunund pushed a commit that referenced this pull request Dec 4, 2023
* Add cartesian plan caching interfaces

Signed-off-by: methylDragon <[email protected]>

* Add construct_get_cartesian_plan_request

Signed-off-by: methylDragon <[email protected]>

* Add goal query and metadata

Signed-off-by: methylDragon <[email protected]>

* Add start query and metadata

Signed-off-by: methylDragon <[email protected]>

* Implement top level cache ops

Signed-off-by: methylDragon <[email protected]>

* Use motion plan cache for cartesian plans

Signed-off-by: methylDragon <[email protected]>

* Allow mismatched plan frames since we coerce anyway

Signed-off-by: methylDragon <[email protected]>

* Fix move bug

Signed-off-by: methylDragon <[email protected]>

* Plan cache code review fixes (sans unit tests) (#26)

* Remove query appending macro

Signed-off-by: methylDragon <[email protected]>

* Default to warehouse_ros plugin if warehouse plugin isn't set

Signed-off-by: methylDragon <[email protected]>

* Return and use init result

Signed-off-by: methylDragon <[email protected]>

* Add todo for catching exceptions

Signed-off-by: methylDragon <[email protected]>

* Implement plan fetching with configurable key

Signed-off-by: methylDragon <[email protected]>

* Add comments for exact match tolerance

Signed-off-by: methylDragon <[email protected]>

* Slightly refactor put plan

Signed-off-by: methylDragon <[email protected]>

* Rename overwrite to delete_worse_plans

Signed-off-by: methylDragon <[email protected]>

* Split out motion plan cache into its own library

Signed-off-by: methylDragon <[email protected]>

* Sort constraints for reduced cardinality

Signed-off-by: methylDragon <[email protected]>

* Rename util function

Signed-off-by: methylDragon <[email protected]>

* Add todo for is_diff

Signed-off-by: methylDragon <[email protected]>

* Add unit tests for motion plan cache (#28)

* Add count methods

Signed-off-by: methylDragon <[email protected]>

* Enable shared from this for cache class

Signed-off-by: methylDragon <[email protected]>

* Add unit test build rules

Signed-off-by: methylDragon <[email protected]>

* Add tests for motion plan cache (but not cartesian)

Signed-off-by: methylDragon <[email protected]>

* Fix bugs in cartesian caching

Signed-off-by: methylDragon <[email protected]>

* Add tests for cartesian plan cache

Signed-off-by: methylDragon <[email protected]>

* Exit if a test fails

Signed-off-by: methylDragon <[email protected]>

* Remove gtest import

Signed-off-by: methylDragon <[email protected]>

* Remove enable_shared_from_this

Signed-off-by: methylDragon <[email protected]>

* Only check for failure

Signed-off-by: methylDragon <[email protected]>

* Test half in-tolerance

Signed-off-by: methylDragon <[email protected]>

* Test different robot cache

Signed-off-by: methylDragon <[email protected]>

* Add force_cache_mode_execute_read_only (#29)

* Add force_cache_mode_execute_read_only

Signed-off-by: methylDragon <[email protected]>

* Add force_cache_mode_execute_read_only input port

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>
Yadunund pushed a commit that referenced this pull request Jan 22, 2024
* Add motion plan cache

Signed-off-by: methylDragon <[email protected]>

* Switch to snake case for function names

Signed-off-by: methylDragon <[email protected]>

* Print cache fetch time and key plans on planned execution time

Signed-off-by: methylDragon <[email protected]>

* Add overwrite_worse_plans param

Signed-off-by: methylDragon <[email protected]>

* Fix plan fetching printout and don't recache fetched plans

Signed-off-by: methylDragon <[email protected]>

* Update only use cached plans parameter name

Signed-off-by: methylDragon <[email protected]>

* Add copyright headers and motion_planner namespace

Signed-off-by: methylDragon <[email protected]>

* Make motion_plan_cache a unique_ptr instead of shared_ptr

Signed-off-by: methylDragon <[email protected]>

* Set numerical precision

Signed-off-by: methylDragon <[email protected]>

* Use enum for planner database mode

Signed-off-by: methylDragon <[email protected]>

* Rename cache methods to prepare for cartesian caching

Signed-off-by: methylDragon <[email protected]>

* Add very important warning to cache class

Signed-off-by: methylDragon <[email protected]>

* Fix access after move bug

Signed-off-by: methylDragon <[email protected]>

* Remove internal cache node

Signed-off-by: methylDragon <[email protected]>

* Implement cartesian plan cache (#18)

* Add cartesian plan caching interfaces

Signed-off-by: methylDragon <[email protected]>

* Add construct_get_cartesian_plan_request

Signed-off-by: methylDragon <[email protected]>

* Add goal query and metadata

Signed-off-by: methylDragon <[email protected]>

* Add start query and metadata

Signed-off-by: methylDragon <[email protected]>

* Implement top level cache ops

Signed-off-by: methylDragon <[email protected]>

* Use motion plan cache for cartesian plans

Signed-off-by: methylDragon <[email protected]>

* Allow mismatched plan frames since we coerce anyway

Signed-off-by: methylDragon <[email protected]>

* Fix move bug

Signed-off-by: methylDragon <[email protected]>

* Plan cache code review fixes (sans unit tests) (#26)

* Remove query appending macro

Signed-off-by: methylDragon <[email protected]>

* Default to warehouse_ros plugin if warehouse plugin isn't set

Signed-off-by: methylDragon <[email protected]>

* Return and use init result

Signed-off-by: methylDragon <[email protected]>

* Add todo for catching exceptions

Signed-off-by: methylDragon <[email protected]>

* Implement plan fetching with configurable key

Signed-off-by: methylDragon <[email protected]>

* Add comments for exact match tolerance

Signed-off-by: methylDragon <[email protected]>

* Slightly refactor put plan

Signed-off-by: methylDragon <[email protected]>

* Rename overwrite to delete_worse_plans

Signed-off-by: methylDragon <[email protected]>

* Split out motion plan cache into its own library

Signed-off-by: methylDragon <[email protected]>

* Sort constraints for reduced cardinality

Signed-off-by: methylDragon <[email protected]>

* Rename util function

Signed-off-by: methylDragon <[email protected]>

* Add todo for is_diff

Signed-off-by: methylDragon <[email protected]>

* Add unit tests for motion plan cache (#28)

* Add count methods

Signed-off-by: methylDragon <[email protected]>

* Enable shared from this for cache class

Signed-off-by: methylDragon <[email protected]>

* Add unit test build rules

Signed-off-by: methylDragon <[email protected]>

* Add tests for motion plan cache (but not cartesian)

Signed-off-by: methylDragon <[email protected]>

* Fix bugs in cartesian caching

Signed-off-by: methylDragon <[email protected]>

* Add tests for cartesian plan cache

Signed-off-by: methylDragon <[email protected]>

* Exit if a test fails

Signed-off-by: methylDragon <[email protected]>

* Remove gtest import

Signed-off-by: methylDragon <[email protected]>

* Remove enable_shared_from_this

Signed-off-by: methylDragon <[email protected]>

* Only check for failure

Signed-off-by: methylDragon <[email protected]>

* Test half in-tolerance

Signed-off-by: methylDragon <[email protected]>

* Test different robot cache

Signed-off-by: methylDragon <[email protected]>

* Add force_cache_mode_execute_read_only (#29)

* Add force_cache_mode_execute_read_only

Signed-off-by: methylDragon <[email protected]>

* Add force_cache_mode_execute_read_only input port

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

* Fix nullptr dereference

Signed-off-by: methylDragon <[email protected]>

* Fix and add motion planner server tests (#30)

* Fix and add motion planner server tests

Signed-off-by: methylDragon <[email protected]>

* Add test deps

Signed-off-by: methylDragon <[email protected]>

* Add motion planner server test to CI

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>

---------

Signed-off-by: methylDragon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants