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

fix _rev handling when creating collections

This commit is contained in:
Jan Steemann 2016-11-08 10:29:53 +01:00
parent c086eaf3d8
commit 5324a6bbe8
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/StorageEngine/MMFilesCollection.cpp
View File

@ -1086,7 +1086,7 @@ int MMFilesCollection::iterateMarkersOnLoad(arangodb::Transaction* trx) {
<< openState._deletions << " deletion markers for collection '" << _logicalCollection->name() << "'"; << openState._deletions << " deletion markers for collection '" << _logicalCollection->name() << "'";
if (_logicalCollection->version() <= LogicalCollection::VERSION_30 && if (_logicalCollection->version() <= LogicalCollection::VERSION_30 &&
_lastRevision >= static_cast<TRI_voc_rid_t>(2016 - 1970) * 1000 * 60 * 60 * 24 * 365 && _lastRevision >= static_cast<TRI_voc_rid_t>(2016ULL - 1970ULL) * 1000ULL * 60ULL * 60ULL * 24ULL * 365ULL &&
application_features::ApplicationServer::server->getFeature<DatabaseFeature>("Database")->check30Revisions()) { application_features::ApplicationServer::server->getFeature<DatabaseFeature>("Database")->check30Revisions()) {
// a collection from 3.0 or earlier with a _rev value that is higher than we can handle safely // a collection from 3.0 or earlier with a _rev value that is higher than we can handle safely
_logicalCollection->setRevisionError(); _logicalCollection->setRevisionError();

5
arangod/VocBase/LogicalCollection.cpp
View File

@ -398,7 +398,7 @@ LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase,
_lastCompactionStamp(0.0), _lastCompactionStamp(0.0),
_uncollectedLogfileEntries(0), _uncollectedLogfileEntries(0),
_revisionError(false) { _revisionError(false) {
if (!IsAllowedName(info)) { if (!IsAllowedName(info)) {
THROW_ARANGO_EXCEPTION(TRI_ERROR_ARANGO_ILLEGAL_NAME); THROW_ARANGO_EXCEPTION(TRI_ERROR_ARANGO_ILLEGAL_NAME);
} }
@ -410,6 +410,9 @@ LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase,
"with the --database.auto-upgrade option."); "with the --database.auto-upgrade option.");
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_FAILED, errorMsg); THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_FAILED, errorMsg);
} else if (info.hasKey("indexes") && _version == VERSION_30) {
// already a 3.1 collection. upgrade the _version data
setVersion(VERSION_31);
} }
if (_isVolatile && _waitForSync) { if (_isVolatile && _waitForSync) {

2
arangod/VocBase/LogicalCollection.h
View File

@ -134,6 +134,8 @@ class LogicalCollection {
uint32_t version() const { uint32_t version() const {
return _version; return _version;
} }
void setVersion(CollectionVersions version) { _version = version; }
uint32_t internalVersion() const; uint32_t internalVersion() const;

4
arangod/VocBase/vocbase.cpp
View File

@ -308,6 +308,8 @@ arangodb::LogicalCollection* TRI_vocbase_t::createCollectionWorker(
cid = collection->cid(); cid = collection->cid();
collection->setStatus(TRI_VOC_COL_STATUS_LOADED); collection->setStatus(TRI_VOC_COL_STATUS_LOADED);
// set collection version to 3.1, as the collection is just created
collection->setVersion(LogicalCollection::VERSION_31);
if (writeMarker) { if (writeMarker) {
collection->toVelocyPack(builder, false); collection->toVelocyPack(builder, false);
@ -1302,7 +1304,7 @@ void TRI_SanitizeObjectWithEdges(VPackSlice const slice, VPackBuilder& builder)
/// @brief Convert a revision ID to a string /// @brief Convert a revision ID to a string
constexpr static TRI_voc_rid_t tickLimit constexpr static TRI_voc_rid_t tickLimit
= static_cast<TRI_voc_rid_t>(2016 - 1970) * 1000 * 60 * 60 * 24 * 365; = static_cast<TRI_voc_rid_t>(2016ULL - 1970ULL) * 1000ULL * 60ULL * 60ULL * 24ULL * 365ULL;
std::string TRI_RidToString(TRI_voc_rid_t rid) { std::string TRI_RidToString(TRI_voc_rid_t rid) {
if (rid <= tickLimit) { if (rid <= tickLimit) {