diff options
| author | Geert Bosch <geert@mongodb.com> | 2016-06-08 19:52:33 -0400 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2016-06-15 15:01:11 -0400 |
| commit | 23f0bf30a707dabff02e63d854843b102bd1904d (patch) | |
| tree | f85c2e1b1e2b063ff5b53debae6489af3da63cfe /src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | |
| parent | f23455dfa501cfc7cbac5cb6b15456029fe4b9b2 (diff) | |
| download | mongo-23f0bf30a707dabff02e63d854843b102bd1904d.tar.gz | |
SERVER-24481 Fix KeyString version selection on WT
Diffstat (limited to 'src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp')
| -rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp index 6f4bcf0d025..91c9d06e218 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp @@ -189,10 +189,10 @@ StatusWith<BSONObj> WiredTigerUtil::getApplicationMetadata(OperationContext* opC return StatusWith<BSONObj>(bob.obj()); } -Status WiredTigerUtil::checkApplicationMetadataFormatVersion(OperationContext* opCtx, - StringData uri, - int64_t minimumVersion, - int64_t maximumVersion) { +StatusWith<int64_t> WiredTigerUtil::checkApplicationMetadataFormatVersion(OperationContext* opCtx, + StringData uri, + int64_t minimumVersion, + int64_t maximumVersion) { StatusWith<std::string> result = getMetadata(opCtx, uri); if (result.getStatus().code() == ErrorCodes::NoSuchKey) { return result.getStatus(); @@ -241,7 +241,7 @@ Status WiredTigerUtil::checkApplicationMetadataFormatVersion(OperationContext* o << " uri: " << uri << " ok range " << minimumVersion << " -> " << maximumVersion << " current: " << version; - return Status::OK(); + return version; } // static |