Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

prevent assertion failures when creating smart graphs with invalid options (#8502)

This commit is contained in:
Jan 2019-03-21 18:51:47 +01:00 committed by GitHub
parent 45d460f934
commit f9fe1de82f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/Graph/Graph.cpp
View File

@ -87,7 +87,6 @@ Graph::Graph(velocypack::Slice const& slice)
_rev(basics::VelocyPackHelper::getStringValue(slice, StaticStrings::RevString, _rev(basics::VelocyPackHelper::getStringValue(slice, StaticStrings::RevString,
"")) { "")) {
// If this happens we have a document without an _key Attribute. // If this happens we have a document without an _key Attribute.
TRI_ASSERT(!_graphName.empty());
if (_graphName.empty()) { if (_graphName.empty()) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
"Persisted graph is invalid. It does not " "Persisted graph is invalid. It does not "
@ -95,13 +94,15 @@ Graph::Graph(velocypack::Slice const& slice)
} }
// If this happens we have a document without an _rev Attribute. // If this happens we have a document without an _rev Attribute.
TRI_ASSERT(!_rev.empty());
if (_rev.empty()) { if (_rev.empty()) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
"Persisted graph is invalid. It does not " "Persisted graph is invalid. It does not "
"have a _rev set. Please contact support."); "have a _rev set. Please contact support.");
} }
TRI_ASSERT(!_graphName.empty());
TRI_ASSERT(!_rev.empty());
if (slice.hasKey(StaticStrings::GraphEdgeDefinitions)) { if (slice.hasKey(StaticStrings::GraphEdgeDefinitions)) {
parseEdgeDefinitions(slice.get(StaticStrings::GraphEdgeDefinitions)); parseEdgeDefinitions(slice.get(StaticStrings::GraphEdgeDefinitions));
} }
@ -138,7 +139,6 @@ Graph::Graph(std::string&& graphName, VPackSlice const& info, VPackSlice const&
} }
void Graph::parseEdgeDefinitions(VPackSlice edgeDefs) { void Graph::parseEdgeDefinitions(VPackSlice edgeDefs) {
TRI_ASSERT(edgeDefs.isArray());
if (!edgeDefs.isArray()) { if (!edgeDefs.isArray()) {
THROW_ARANGO_EXCEPTION_MESSAGE( THROW_ARANGO_EXCEPTION_MESSAGE(
TRI_ERROR_GRAPH_INVALID_GRAPH, TRI_ERROR_GRAPH_INVALID_GRAPH,
@ -154,7 +154,11 @@ void Graph::parseEdgeDefinitions(VPackSlice edgeDefs) {
} }
void Graph::insertOrphanCollections(VPackSlice const arr) { void Graph::insertOrphanCollections(VPackSlice const arr) {
TRI_ASSERT(arr.isArray()); if (!arr.isArray()) {
THROW_ARANGO_EXCEPTION_MESSAGE(
TRI_ERROR_GRAPH_INVALID_GRAPH,
"'orphanCollections' are not an array in the graph definition");
}
for (auto const& c : VPackArrayIterator(arr)) { for (auto const& c : VPackArrayIterator(arr)) {
TRI_ASSERT(c.isString()); TRI_ASSERT(c.isString());
validateOrphanCollection(c); validateOrphanCollection(c);