Feature/dismantle mmfiles #11354
Merged
Feature/dismantle mmfiles #11354
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joerg84
reviewed
Mar 31, 2020
| @@ -108,9 +94,7 @@ ClusterEngineType ClusterEngine::engineType() const { | |||
| } | |||
| TRI_ASSERT(_actualEngine != nullptr); | |||
There was a problem hiding this comment.
Just curiosity, not related to this PR: ClusterEngine::isMock() const. above doesn't check . _actualEngine but accesses name. Maybe add same assert there
There was a problem hiding this comment.
ClusterEngine::isMock() also returns true when _actualEngine is a nullptr, but ClusterEngine::Mocking is set to true.
Some in ClusterEngine::isMock() we cannot rely on _actualEngine being a non-nullptr.
And both isMock() and isRocksDB() access the name() method of _actualEngine to check which engine is in use, but both only do this if _actualEngine is a non-nullptr. So it should be ok as it is.
| if (isMMFiles()) { | ||
| return ClusterEngineType::MMFilesEngine; | ||
| } else if (isRocksDB()) { | ||
| if (isRocksDB()) { |
There was a problem hiding this comment.
Changed it to
@@ -94,12 +94,8 @@ ClusterEngineType ClusterEngine::engineType() const {
}
TRI_ASSERT(_actualEngine != nullptr);
- if (isRocksDB()) {
- return ClusterEngineType::RocksDBEngine;
- }
-
- TRI_ASSERT(false);
- THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "invalid engine type");
+ TRI_ASSERT(isRocksDB());
+ return ClusterEngineType::RocksDBEngine;
}
gnusi
suggested changes
Apr 1, 2020
gnusi
approved these changes
Apr 1, 2020
…odb into feature/dismantle-mmfiles
ObiWahn
added a commit
that referenced
this pull request
Apr 2, 2020
…ture/validation-web-ui * 'devel' of https://github.com/arangodb/arangodb: Feature/dismantle mmfiles (#11354)
ObiWahn
added a commit
that referenced
this pull request
Apr 6, 2020
…ture/utf-8-validation * 'devel' of https://github.com/arangodb/arangodb: (21 commits) Bug fix/headers cleanup (#11391) Feature/internal issue #672 (#11370) GraphNodes now copy the graph when cloned (#11345) fix lame compile error Feature/aql subquery execution block impl execute implementation harvesting (#11349) remove obsolete recoveryData Feature/dismantle mmfiles (#11354) Fix an agency supervision bug. (#11356) (mostly) restore pre-3.7 API behavior (#11364) validation: AQL functions (#11327) Check MSVC_VERSION instead of CMAKE_GENERATOR (#11351) added sleep time (lousy fix) Feature/aql interleave function (#11352) cheapify IN lookups on unsorted arrays (#11342) Bug fix/fix msvc2019 build (#11052) Allow easier removal of validation rules. (#11346) upgrade RocksDB (#11308) Introduce more type-safe identifiers (#11270) Bug fix/schema validation return code (#11341) Fix explainer output when restricting collections (#11338) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Scope & Purpose
Dismantle MMFiles storage engine in devel.
Enterprise companion PR: https://github.com/arangodb/enterprise/pull/423
Oskar PR: arangodb/oskar#233
Documentation is still to do.
Testing & Verification
This change is already covered by existing tests, such as scripts/unittest all.