wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8110 from sfc-gh-dzhou/api-fix 

ApiVersion: fix TraceFile apiversion check
This commit is contained in:
Jingyu Zhou 2022-09-06 15:09:33 -07:00 committed by GitHub
parent beb00b4b7c d9e7fc1245
commit b361bd8e7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/MultiVersionTransaction.actor.cpp
View File

@ -2579,7 +2579,7 @@ void MultiVersionApi::setupNetwork() {
});
std::string baseTraceFileId;
if (apiVersion >= 630) {
if (apiVersion.hasTraceFileIdentifier()) {
// TRACE_FILE_IDENTIFIER option is supported since 6.3
baseTraceFileId = traceFileIdentifier.empty() ? format("%d", getpid()) : traceFileIdentifier;
}

1
flow/ApiVersion.h.cmake
View File

@ -64,6 +64,7 @@ public: // introduced features
API_VERSION_FEATURE(@FDB_AV_SNAPSHOT_RYW@, SnapshotRYW);
API_VERSION_FEATURE(@FDB_AV_INLINE_UPDATE_DATABASE@, InlineUpdateDatabase);
API_VERSION_FEATURE(@FDB_AV_PERSISTENT_OPTIONS@, PersistentOptions);
API_VERSION_FEATURE(@FDB_AV_TRACE_FILE_IDENTIFIER@, TraceFileIdentifier);
API_VERSION_FEATURE(@FDB_AV_CLUSTER_SHARED_STATE_MAP@, ClusterSharedStateMap);
API_VERSION_FEATURE(@FDB_AV_TENANTS_V1@, TenantsV1);
API_VERSION_FEATURE(@FDB_AV_BLOB_RANGE_API@, BlobRangeApi);

1
flow/ApiVersions.cmake
View File

@ -5,6 +5,7 @@ set(FDB_AV_LATEST_VERSION "720")
set(FDB_AV_SNAPSHOT_RYW "300")
set(FDB_AV_INLINE_UPDATE_DATABASE "610")
set(FDB_AV_PERSISTENT_OPTIONS "610")
set(FDB_AV_TRACE_FILE_IDENTIFIER "630")
set(FDB_AV_CLUSTER_SHARED_STATE_MAP "710")
set(FDB_AV_TENANTS_V1 "720")
set(FDB_AV_BLOB_RANGE_API "720")