Skip to content

(Re-open #22) Refactored Warehouse ROS for pluginlib#32

Merged
mikeferguson merged 4 commits intomoveit:jade-develfrom
130s:jade/mongo_22
Jun 17, 2016
Merged

(Re-open #22) Refactored Warehouse ROS for pluginlib#32
mikeferguson merged 4 commits intomoveit:jade-develfrom
130s:jade/mongo_22

Conversation

@130s
Copy link
Copy Markdown
Contributor

@130s 130s commented Jun 16, 2016 •
edited
Loading

Re-opening #22 because it:

  • is conflicted
  • contains some undesired removal (changelog, .travis.yml)
  • and yes, travis wasn't triggered properly.

@130s 130s mentioned this pull request Jun 16, 2016
Closed
davetcoleman
davetcoleman reviewed Jun 16, 2016
View reviewed changes
include/warehouse_ros/database_loader.h Outdated
bool connect() {return false;}
bool isConnected() {return false;}
void dropDatabase(const std::string& db_name) {throw warehouse_ros::DbConnectException("Database is stub");}
std::string messageType(const std::string& db_name, const std::string& collection_name) {throw warehouse_ros::DbConnectException("Database is stub");}
Copy link
Copy Markdown
Member

@davetcoleman davetcoleman Jun 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

roscpp style guideline: "Braces, both open and close, go on their own lines (no "cuddled braces")."

@davetcoleman
Copy link
Copy Markdown
Member

davetcoleman commented Jun 16, 2016

+1 I scanned all the code, though it was a lot to review thoroughly

@v4hn v4hn mentioned this pull request Jun 16, 2016
Closed
@130s
Copy link
Copy Markdown
Contributor Author

130s commented Jun 16, 2016

Just a note for the future; even this PR seems to fail with Kinetic on Xenial, as the test on Travis failed and I'm seeing the same error locally on my Xenial.

[warehouse_ros:make] /usr/bin/c++   -DROSCONSOLE_BACKEND_LOG4CXX -DROS_PACKAGE_NAME=\"warehouse_ros\" -Dwarehouse_ros_EXPORTS -I/root/ros/ws_ci_src/src/ci_src/include -I/opt/ros/kinetic/include  -fPIC   -o CMakeFiles/warehouse_ros.dir/src/transform_collection.cpp.o -c /root/ros/ws_ci_src/src/ci_src/src/transform_collection.cpp
[warehouse_ros:make] In file included from /root/ros/ws_ci_src/src/ci_src/src/database_loader.cpp:37:0:
[warehouse_ros:make] /root/ros/ws_ci_src/src/ci_src/include/warehouse_ros/database_loader.h:78:10: error: 'scoped_ptr' in namespace 'boost' does not name a template type
[warehouse_ros:make]    boost::scoped_ptr<pluginlib::ClassLoader<warehouse_ros::DatabaseConnection> > db_plugin_loader_;
[warehouse_ros:make]           ^
[warehouse_ros:make] /root/ros/ws_ci_src/src/ci_src/src/database_loader.cpp: In member function 'void warehouse_ros::DatabaseLoader::initialize()':
[warehouse_ros:make] /root/ros/ws_ci_src/src/ci_src/src/database_loader.cpp:59:5: error: 'db_plugin_loader_' was not declared in this scope
[warehouse_ros:make]      db_plugin_loader_.reset(new pluginlib::ClassLoader<DatabaseConnection>("warehouse_ros", "warehouse_ros::DatabaseConnection"));
[warehouse_ros:make]      ^
[warehouse_ros:make] /root/ros/ws_ci_src/src/ci_src/src/database_loader.cpp: In member function 'warehouse_ros::DatabaseConnection::Ptr warehouse_ros::DatabaseLoader::loadDatabase()':
[warehouse_ros:make] /root/ros/ws_ci_src/src/ci_src/src/database_loader.cpp:69:8: error: 'db_plugin_loader_' was not declared in this scope
[warehouse_ros:make]    if (!db_plugin_loader_)
[warehouse_ros:make]         ^
[warehouse_ros:make] /root/ros/ws_ci_src/src/ci_src/src/database_loader.cpp:89:14: error: 'db_plugin_loader_' was not declared in this scope
[warehouse_ros:make]      db.reset(db_plugin_loader_->createUnmanagedInstance(db_plugin));
[warehouse_ros:make]               ^
[warehouse_ros:make] CMakeFiles/warehouse_ros.dir/build.make:62: recipe for target 'CMakeFiles/warehouse_ros.dir/src/database_loader.cpp.o' failed
[warehouse_ros:make] make[2]: *** [CMakeFiles/warehouse_ros.dir/src/database_loader.cpp.o] Error 1
[warehouse_ros:make] make[2]: *** Waiting for unfinished jobs....
[warehouse_ros:make] make[2]: Leaving directory '/root/ros/ws_ci_src/build/warehouse_ros'
[warehouse_ros:make] CMakeFiles/Makefile2:488: recipe for target 'CMakeFiles/warehouse_ros.dir/all' failed
[warehouse_ros:make] make[1]: Leaving directory '/root/ros/ws_ci_src/build/warehouse_ros'
[warehouse_ros:make] make[1]: *** [CMakeFiles/warehouse_ros.dir/all] Error 2
[warehouse_ros:make] Makefile:138: recipe for target 'all' failed
[warehouse_ros:make] make: *** [all] Error 2
Failed <<< warehouse_ros                        [ 9.1 seconds ]

@mikeferguson
Copy link
Copy Markdown
Contributor

mikeferguson commented Jun 16, 2016

@130s -- is it just a missing header include? I don't see any boost includes in that header -- and I know some of the lower level stuff might have moved towards using C++11 instead of boost possibly dropping the previously included header

@130s
Copy link
Copy Markdown
Contributor Author

130s commented Jun 16, 2016

@davetcoleman Code style should be now adjusted for all files in include and src, although I just used Eclipse code formatter http://wiki.ros.org/IDEs#Auto_Formatting and don't know how reliable that is.

@130s 130s mentioned this pull request Jun 16, 2016
Closed
@130s
Copy link
Copy Markdown
Contributor Author

130s commented Jun 17, 2016

@mikeferguson thanks for the catch for the headers. I added a simple change and it builds on my Xenial host. Now waiting for Travis result to see if it builds for both Jade and Kinetic.

@130s
Copy link
Copy Markdown
Contributor Author

130s commented Jun 17, 2016

Now Travis is happy for Jade and Kinetic.
I leave merge decision to others since this is related to a long-lasting #20

(So at the moment we can technically release warehouse_ros into J and K from jade-devel branch along with the changes in this PR?)

@130s 130s mentioned this pull request Jun 17, 2016
Closed
@davetcoleman
Copy link
Copy Markdown
Member

davetcoleman commented Jun 17, 2016

@mikeferguson can you do the honors?

@mikeferguson mikeferguson merged commit 49b8be9 into moveit:jade-devel Jun 17, 2016
@mikeferguson
Copy link
Copy Markdown
Contributor

mikeferguson commented Jun 17, 2016

I'll push a release later tonight

@130s 130s deleted the jade/mongo_22 branch June 17, 2016 19:40
@130s
Copy link
Copy Markdown
Contributor Author

130s commented Jun 17, 2016

@mikeferguson if it's just a bloom without anything special then I can do that early afternoon. Let me know.

@130s 130s mentioned this pull request Jun 18, 2016
Closed
@130s 130s mentioned this pull request Jun 29, 2016
Merged
@v4hn v4hn mentioned this pull request Feb 6, 2017
Closed
@534o 534o mentioned this pull request Sep 11, 2017
Closed
@rhaschke rhaschke mentioned this pull request Jan 2, 2019
Closed
@rhaschke rhaschke mentioned this pull request Aug 20, 2019
Closed
@gavanderhoorn gavanderhoorn mentioned this pull request Aug 27, 2019
Merged
gavanderhoorn added a commit to gavanderhoorn/fanuc that referenced this pull request Aug 27, 2019
@gavanderhoorn
moveit_cfgs: disable db tests for now.
4df603c 
The Python infrastructure in warehouse_ros was removed in moveit/warehouse_ros#32 and will not come back. This essentially breaks the DB functionality of all MoveIt configuration packages, including the ones in ros-industrial/fanuc.

For now the roslaunch tests that attempt to enable the DB will be disabled, as this is not an issue with those packages, but with warehouse_ros/MoveIt.

If/when that is resolved, the tests can be enabled again.
gavanderhoorn added a commit to gavanderhoorn/fanuc that referenced this pull request Aug 27, 2019
@gavanderhoorn
moveit_cfgs: disable db tests for now.
a9e5390 
The Python infrastructure in warehouse_ros was removed in moveit/warehouse_ros#32 and will not come back. This essentially breaks the DB functionality of all MoveIt configuration packages, including the ones in ros-industrial/fanuc.

For now the roslaunch tests that attempt to enable the DB will be disabled, as this is not an issue with those packages, but with warehouse_ros/MoveIt.

If/when that is resolved, the tests can be enabled again.
gavanderhoorn added a commit to ros-industrial/fanuc that referenced this pull request Sep 17, 2019
@gavanderhoorn
moveit_cfgs: disable db tests for now.
72f30d1 
The Python infrastructure in warehouse_ros was removed in moveit/warehouse_ros#32 and will not come back. This essentially breaks the DB functionality of all MoveIt configuration packages, including the ones in ros-industrial/fanuc.

For now the roslaunch tests that attempt to enable the DB will be disabled, as this is not an issue with those packages, but with warehouse_ros/MoveIt.

If/when that is resolved, the tests can be enabled again.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@130s @davetcoleman @mikeferguson @TheBrewCrew