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

issue 434.1: remove redundant checks (#6090)

This commit is contained in:
Vasiliy 2018-08-07 15:44:19 +03:00 committed by Jan
parent d80b62f4f9
commit 7518d0267d
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/VocBase/LogicalCollection.cpp
View File

@ -877,8 +877,6 @@ void LogicalCollection::persistPhysicalCollection() {
// Coordinators are not allowed to have local collections!
TRI_ASSERT(!ServerState::instance()->isCoordinator());
// We have not yet persisted this collection!
TRI_ASSERT(getPhysical()->path().empty());
StorageEngine* engine = EngineSelectorFeature::ENGINE;
auto path = engine->createCollection(vocbase(), id(), *this);

38
arangod/VocBase/LogicalView.cpp
View File

@ -257,37 +257,15 @@ arangodb::Result LogicalViewStorageEngine::appendVelocyPack(
) {
TRI_ASSERT(!ServerState::instance()->isCoordinator());
StorageEngine* engine = EngineSelectorFeature::ENGINE;
TRI_ASSERT(engine);
if (!engine) {
return arangodb::Result(
TRI_ERROR_INTERNAL,
std::string("failure to get storage engine during storage engine persistance of view '") + view.name() + "'"
);
}
try {
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
// during recovery entry is being played back from the engine
if (!engine->inRecovery()) {
arangodb::velocypack::Builder builder;
auto res = engine->getViews(view.vocbase(), builder);
TRI_ASSERT(TRI_ERROR_NO_ERROR == res);
auto slice = builder.slice();
TRI_ASSERT(slice.isArray());
auto viewId = std::to_string(view.id());
// We have not yet persisted this view
for (auto entry: arangodb::velocypack::ArrayIterator(slice)) {
auto id = arangodb::basics::VelocyPackHelper::getStringRef(
entry,
StaticStrings::DataSourceId,
arangodb::velocypack::StringRef()
);
if (!id.compare(viewId)) {
return arangodb::Result(
TRI_ERROR_ARANGO_DUPLICATE_IDENTIFIER,
std::string("view id '") + viewId + "already exists in the sotrage engine"
);
}
}
}
#endif
return engine->createView(view.vocbase(), view.id(), view);
} catch (std::exception const& e) {
return arangodb::Result(
@ -380,4 +358,4 @@ arangodb::Result LogicalViewStorageEngine::updateProperties(
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------