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

Addressed review comments.

This commit is contained in:
Balachandar Namasivayam 2019-02-27 12:42:45 -08:00
parent 81e7c4ea4e
commit 7d7db54515
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fdbclient/NativeAPI.actor.cpp
View File

@ -2677,26 +2677,8 @@ void Transaction::setOption( FDBTransactionOptions::Option option, Optional<Stri
break; break;
case FDBTransactionOptions::TRANSACTION_LOGGING_ENABLE: case FDBTransactionOptions::TRANSACTION_LOGGING_ENABLE:
validateOptionValue(value, true); setOption(FDBTransactionOptions::DEBUG_TRANSACTION_IDENTIFIER, value);
setOption(FDBTransactionOptions::LOG_TRANSACTION);
if(value.get().size() > 100) {
throw invalid_option_value();
}
if(trLogInfo) {
if (trLogInfo->identifier.empty()) {
trLogInfo->identifier = printable(value.get());
}
else if (trLogInfo->identifier != printable(value.get())) {
TraceEvent(SevWarn, "CannotChangeDebugTransactionIdentifier").detail("PreviousIdentifier", trLogInfo->identifier).detail("NewIdentifier", printable(value.get()));
throw client_invalid_operation();
}
trLogInfo->logTo(TransactionLogInfo::TRACE_LOG);
}
else {
trLogInfo = Reference<TransactionLogInfo>(new TransactionLogInfo(printable(value.get()), TransactionLogInfo::TRACE_LOG));
}
break; break;
case FDBTransactionOptions::DEBUG_TRANSACTION_IDENTIFIER: case FDBTransactionOptions::DEBUG_TRANSACTION_IDENTIFIER:
@ -2718,10 +2700,10 @@ void Transaction::setOption( FDBTransactionOptions::Option option, Optional<Stri
else { else {
trLogInfo = Reference<TransactionLogInfo>(new TransactionLogInfo(printable(value.get()), TransactionLogInfo::DONT_LOG)); trLogInfo = Reference<TransactionLogInfo>(new TransactionLogInfo(printable(value.get()), TransactionLogInfo::DONT_LOG));
} }
break; break;
case FDBTransactionOptions::LOG_TRANSACTION: case FDBTransactionOptions::LOG_TRANSACTION:
validateOptionValue(value, false);
if (trLogInfo) { if (trLogInfo) {
trLogInfo->logTo(TransactionLogInfo::TRACE_LOG); trLogInfo->logTo(TransactionLogInfo::TRACE_LOG);
} }
@ -2729,7 +2711,6 @@ void Transaction::setOption( FDBTransactionOptions::Option option, Optional<Stri
TraceEvent(SevWarn, "DebugTransactionIdentifierNotSet").detail("Error", "Debug Transaction Identifier option must be set before logging the transaction"); TraceEvent(SevWarn, "DebugTransactionIdentifierNotSet").detail("Error", "Debug Transaction Identifier option must be set before logging the transaction");
throw client_invalid_operation(); throw client_invalid_operation();
} }
break; break;
case FDBTransactionOptions::MAX_RETRY_DELAY: case FDBTransactionOptions::MAX_RETRY_DELAY: