HBASE-19912 Remove useless 'writeToWAL' flag of Region#checkAndRowMutate
Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
parent
57911d02c6
commit
38c8144a06
|
@ -3919,16 +3919,14 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
|
|||
throws IOException{
|
||||
checkMutationType(mutation, row);
|
||||
return doCheckAndRowMutate(row, family, qualifier, op, comparator, null,
|
||||
mutation, writeToWAL);
|
||||
mutation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkAndRowMutate(byte [] row, byte [] family, byte [] qualifier,
|
||||
CompareOperator op, ByteArrayComparable comparator, RowMutations rm,
|
||||
boolean writeToWAL)
|
||||
CompareOperator op, ByteArrayComparable comparator, RowMutations rm)
|
||||
throws IOException {
|
||||
return doCheckAndRowMutate(row, family, qualifier, op, comparator, rm, null,
|
||||
writeToWAL);
|
||||
return doCheckAndRowMutate(row, family, qualifier, op, comparator, rm, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -3937,7 +3935,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
|
|||
*/
|
||||
private boolean doCheckAndRowMutate(byte [] row, byte [] family, byte [] qualifier,
|
||||
CompareOperator op, ByteArrayComparable comparator, RowMutations rowMutations,
|
||||
Mutation mutation, boolean writeToWAL)
|
||||
Mutation mutation)
|
||||
throws IOException {
|
||||
// Could do the below checks but seems wacky with two callers only. Just comment out for now.
|
||||
// One caller passes a Mutation, the other passes RowMutation. Presume all good so we don't
|
||||
|
|
|
@ -619,7 +619,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
|
|||
resultOrExceptionOrBuilder.build());
|
||||
}
|
||||
return region.checkAndRowMutate(row, family, qualifier, op,
|
||||
comparator, rm, Boolean.TRUE);
|
||||
comparator, rm);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -309,12 +309,11 @@ public interface Region extends ConfigurationObserver {
|
|||
* @param op the comparison operator
|
||||
* @param comparator
|
||||
* @param mutations
|
||||
* @param writeToWAL
|
||||
* @return true if mutations were applied, false otherwise
|
||||
* @throws IOException
|
||||
*/
|
||||
boolean checkAndRowMutate(byte [] row, byte [] family, byte [] qualifier, CompareOperator op,
|
||||
ByteArrayComparable comparator, RowMutations mutations, boolean writeToWAL)
|
||||
ByteArrayComparable comparator, RowMutations mutations)
|
||||
throws IOException;
|
||||
|
||||
/**
|
||||
|
|
|
@ -6387,7 +6387,7 @@ public class TestHRegion {
|
|||
RowMutations rm = new RowMutations(row);
|
||||
rm.add(p);
|
||||
assertTrue(region.checkAndRowMutate(row, fam1, qual1, CompareOperator.EQUAL,
|
||||
new BinaryComparator(qual1), rm, false));
|
||||
new BinaryComparator(qual1), rm));
|
||||
result = region.get(new Get(row));
|
||||
c = result.getColumnLatestCell(fam1, qual1);
|
||||
assertEquals(10L, c.getTimestamp());
|
||||
|
|
Loading…
Reference in New Issue