Merge pull request #437 from ajbeamon/fix-commit-readonly-transactions

fix: Read-only transactions that get committed would fail if the...
This commit is contained in:
Evan Tschannen 2018-06-05 13:13:11 -07:00 committed by GitHub
commit 6fbb046320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2456,11 +2456,6 @@ ACTOR static Future<Void> tryCommit( Database cx, Reference<TransactionLogInfo>
}
Future<Void> Transaction::commitMutations() {
cx->transactionsCommitStarted++;
if(options.readOnly)
return transaction_read_only();
try {
//if this is a read-only transaction return immediately
if( !tr.transaction.write_conflict_ranges.size() && !tr.transaction.mutations.size() ) {
@ -2471,6 +2466,11 @@ Future<Void> Transaction::commitMutations() {
return Void();
}
cx->transactionsCommitStarted++;
if(options.readOnly)
return transaction_read_only();
cx->mutationsPerCommit.addSample(tr.transaction.mutations.size());
cx->bytesPerCommit.addSample(tr.transaction.mutations.expectedSize());