Check source usage before removal #9129
Conversation
src/mbgl/style/style.cpp
Outdated
| @@ -158,7 +158,30 @@ void Style::addSource(std::unique_ptr<Source> source) { | |||
| sources.emplace_back(std::move(source)); | |||
| } | |||
|
|
|||
| struct SourceIdUsageEvaluator { | |||
| std::string sourceId; | |||
There was a problem hiding this comment.
This can be const, or even a const ref
src/mbgl/style/style.cpp
Outdated
| }); | ||
|
|
||
| if (layerIt != layers.end()) { | ||
| Log::Warning(Event::General, "Source %s is in use, cannot remove", id.c_str()); |
There was a problem hiding this comment.
Could we please add quotes around the name?
ivovandongen
force-pushed
the
9121-check-before-remove-source
branch
2 times, most recently
from
2dea1db
to
7a67bd1
Compare
Agreed, but we also force the SDKs to deal with it. Not sure if it's that helpful. We now have a mix of exception / log and ignore. We should align that at some point I had to add a default case to |
include/mbgl/style/layer.hpp
Outdated
| @@ -88,6 +89,8 @@ class Layer : public mbgl::util::noncopyable { | |||
| return std::forward<V>(visitor)(*as<CustomLayer>()); | |||
| case LayerType::FillExtrusion: | |||
| return std::forward<V>(visitor)(*as<FillExtrusionLayer>()); | |||
| default: | |||
There was a problem hiding this comment.
Adding default means that clang won't issue an "enumeration value not handled in switch" error if you add a new layer type enum but forget to add it here. Use this convention instead.
There was a problem hiding this comment.
Makes sense. Although returning a nullptr is not an option here. I couldn't find a good way to return in all instantiations (eg. for void, stack based values and pointers), so I kept the runtime_error to appease gcc.
|
|
||
| if (layerIt != layers.end()) { | ||
| Log::Warning(Event::General, "Source '%s' is in use, cannot remove", id.c_str()); | ||
| return nullptr; |
There was a problem hiding this comment.
Are SDKs prepared for removeSource returning a null pointer?
There was a problem hiding this comment.
@jfirebaugh Yes, a nullptr was already returned in case the source doesn't exist here. I've added tests for the Android and iOS/macos SDKs to ensure this.
ivovandongen
force-pushed
the
9121-check-before-remove-source
branch
from
7a67bd1
to
9f7aad7
Compare
boundsj
moved this from TBD
to Needed for Android SDK v5.1.0
in release-ios-v3.6.0-android-v5.1.0
tobrun
moved this from Needed for Android SDK v5.1.0
to Cherry-picked
in release-ios-v3.6.0-android-v5.1.0
Closes #9121
I opted to log a warning instead of throwing an exception. I can see it going both ways though.