HBASE-26713 Default to LATEST_TIMESTAMP if no timestamp sent along on Increment/Append (#4075)
Signed-off-by: Andrew Purtell <apurtell@apache.org>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
index 5bba1e1..f9be417 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
@@ -623,10 +623,7 @@
if (qv.hasQualifier()) {
qualifier = qv.getQualifier().toByteArray();
}
- long ts = HConstants.LATEST_TIMESTAMP;
- if (qv.hasTimestamp()) {
- ts = qv.getTimestamp();
- }
+ long ts = cellTimestampOrLatest(qv);
if (deleteType == DeleteType.DELETE_ONE_VERSION) {
delete.addColumn(family, qualifier, ts);
} else if (deleteType == DeleteType.DELETE_MULTIPLE_VERSIONS) {
@@ -690,7 +687,7 @@
if (qv.hasTags()) {
tags = qv.getTags().toByteArray();
}
- consumer.accept(mutation, CellUtil.createCell(mutation.getRow(), family, qualifier, qv.getTimestamp(),
+ consumer.accept(mutation, CellUtil.createCell(mutation.getRow(), family, qualifier, cellTimestampOrLatest(qv),
KeyValue.Type.Put, value, tags));
}
}
@@ -702,6 +699,14 @@
return mutation;
}
+ private static long cellTimestampOrLatest(QualifierValue cell) {
+ if (cell.hasTimestamp()) {
+ return cell.getTimestamp();
+ } else {
+ return HConstants.LATEST_TIMESTAMP;
+ }
+ }
+
/**
* Convert a protocol buffer Mutate to an Append
* @param cellScanner
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
index fe3d5ff..a36b375 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
@@ -779,10 +779,7 @@
if (qv.hasQualifier()) {
qualifier = qv.getQualifier().toByteArray();
}
- long ts = HConstants.LATEST_TIMESTAMP;
- if (qv.hasTimestamp()) {
- ts = qv.getTimestamp();
- }
+ long ts = cellTimestampOrLatest(qv);
if (deleteType == DeleteType.DELETE_ONE_VERSION) {
delete.addColumn(family, qualifier, ts);
} else if (deleteType == DeleteType.DELETE_MULTIPLE_VERSIONS) {
@@ -849,7 +846,7 @@
.setRow(mutation.getRow())
.setFamily(family)
.setQualifier(qualifier)
- .setTimestamp(qv.getTimestamp())
+ .setTimestamp(cellTimestampOrLatest(qv))
.setType(KeyValue.Type.Put.getCode())
.setValue(value)
.setTags(tags)
@@ -864,6 +861,14 @@
return mutation;
}
+ private static long cellTimestampOrLatest(QualifierValue cell) {
+ if (cell.hasTimestamp()) {
+ return cell.getTimestamp();
+ } else {
+ return HConstants.LATEST_TIMESTAMP;
+ }
+ }
+
/**
* Convert a protocol buffer Mutate to an Append
* @param cellScanner
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
index c47150b..317dff9 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/shaded/protobuf/TestProtobufUtil.java
@@ -33,6 +33,7 @@
import org.apache.hadoop.hbase.ExtendedCellBuilder;
import org.apache.hadoop.hbase.ExtendedCellBuilderFactory;
import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.PrivateCellUtil;
import org.apache.hadoop.hbase.Tag;
@@ -294,7 +295,22 @@
*/
@Test
public void testIncrement() throws IOException {
- long timeStamp = 111111;
+
+ MutationProto proto = getIncrementMutation(111111L);
+ // default fields
+ assertEquals(MutationProto.Durability.USE_DEFAULT, proto.getDurability());
+
+ // set the default value for equal comparison
+ MutationProto.Builder mutateBuilder = MutationProto.newBuilder(proto);
+ mutateBuilder.setDurability(MutationProto.Durability.USE_DEFAULT);
+
+ Increment increment = ProtobufUtil.toIncrement(proto, null);
+ mutateBuilder.setTimestamp(increment.getTimestamp());
+ mutateBuilder.setTimeRange(ProtobufUtil.toTimeRange(increment.getTimeRange()));
+ assertEquals(mutateBuilder.build(), ProtobufUtil.toMutation(MutationType.INCREMENT, increment));
+ }
+
+ private MutationProto getIncrementMutation(Long timestamp) {
MutationProto.Builder mutateBuilder = MutationProto.newBuilder();
mutateBuilder.setRow(ByteString.copyFromUtf8("row"));
mutateBuilder.setMutateType(MutationProto.MutationType.INCREMENT);
@@ -303,25 +319,33 @@
QualifierValue.Builder qualifierBuilder = QualifierValue.newBuilder();
qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c1"));
qualifierBuilder.setValue(ByteString.copyFrom(Bytes.toBytes(11L)));
- qualifierBuilder.setTimestamp(timeStamp);
+
+ if (timestamp != null) {
+ qualifierBuilder.setTimestamp(timestamp);
+ }
+
valueBuilder.addQualifierValue(qualifierBuilder.build());
qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c2"));
qualifierBuilder.setValue(ByteString.copyFrom(Bytes.toBytes(22L)));
valueBuilder.addQualifierValue(qualifierBuilder.build());
mutateBuilder.addColumnValue(valueBuilder.build());
- MutationProto proto = mutateBuilder.build();
- // default fields
- assertEquals(MutationProto.Durability.USE_DEFAULT, proto.getDurability());
+ return mutateBuilder.build();
+ }
- // set the default value for equal comparison
- mutateBuilder = MutationProto.newBuilder(proto);
- mutateBuilder.setDurability(MutationProto.Durability.USE_DEFAULT);
-
- Increment increment = ProtobufUtil.toIncrement(proto, null);
- mutateBuilder.setTimestamp(increment.getTimestamp());
- mutateBuilder.setTimeRange(ProtobufUtil.toTimeRange(increment.getTimeRange()));
- assertEquals(mutateBuilder.build(), ProtobufUtil.toMutation(MutationType.INCREMENT, increment));
+ /**
+ * Older clients may not send along a timestamp in the MutationProto. Check that we
+ * default correctly.
+ */
+ @Test
+ public void testIncrementNoTimestamp() throws IOException {
+ MutationProto mutation = getIncrementMutation(null);
+ Increment increment = ProtobufUtil.toIncrement(mutation, null);
+ assertEquals(HConstants.LATEST_TIMESTAMP, increment.getTimestamp());
+ increment.getFamilyCellMap().values()
+ .forEach(cells ->
+ cells.forEach(cell ->
+ assertEquals(HConstants.LATEST_TIMESTAMP, cell.getTimestamp())));
}
/**
@@ -331,29 +355,12 @@
*/
@Test
public void testAppend() throws IOException {
- long timeStamp = 111111;
- MutationProto.Builder mutateBuilder = MutationProto.newBuilder();
- mutateBuilder.setRow(ByteString.copyFromUtf8("row"));
- mutateBuilder.setMutateType(MutationType.APPEND);
- mutateBuilder.setTimestamp(timeStamp);
- ColumnValue.Builder valueBuilder = ColumnValue.newBuilder();
- valueBuilder.setFamily(ByteString.copyFromUtf8("f1"));
- QualifierValue.Builder qualifierBuilder = QualifierValue.newBuilder();
- qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c1"));
- qualifierBuilder.setValue(ByteString.copyFromUtf8("v1"));
- qualifierBuilder.setTimestamp(timeStamp);
- valueBuilder.addQualifierValue(qualifierBuilder.build());
- qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c2"));
- qualifierBuilder.setValue(ByteString.copyFromUtf8("v2"));
- valueBuilder.addQualifierValue(qualifierBuilder.build());
- mutateBuilder.addColumnValue(valueBuilder.build());
-
- MutationProto proto = mutateBuilder.build();
+ MutationProto proto = getAppendMutation(111111L);
// default fields
assertEquals(MutationProto.Durability.USE_DEFAULT, proto.getDurability());
// set the default value for equal comparison
- mutateBuilder = MutationProto.newBuilder(proto);
+ MutationProto.Builder mutateBuilder = MutationProto.newBuilder(proto);
mutateBuilder.setDurability(MutationProto.Durability.USE_DEFAULT);
Append append = ProtobufUtil.toAppend(proto, null);
@@ -365,6 +372,42 @@
assertEquals(mutateBuilder.build(), ProtobufUtil.toMutation(MutationType.APPEND, append));
}
+ /**
+ * Older clients may not send along a timestamp in the MutationProto. Check that we
+ * default correctly.
+ */
+ @Test
+ public void testAppendNoTimestamp() throws IOException {
+ MutationProto mutation = getAppendMutation(null);
+ Append append = ProtobufUtil.toAppend(mutation, null);
+ assertEquals(HConstants.LATEST_TIMESTAMP, append.getTimestamp());
+ append.getFamilyCellMap().values().forEach(cells -> cells.forEach(cell -> assertEquals(HConstants.LATEST_TIMESTAMP, cell.getTimestamp())));
+ }
+
+ private MutationProto getAppendMutation(Long timestamp) {
+ MutationProto.Builder mutateBuilder = MutationProto.newBuilder();
+ mutateBuilder.setRow(ByteString.copyFromUtf8("row"));
+ mutateBuilder.setMutateType(MutationType.APPEND);
+ if (timestamp != null) {
+ mutateBuilder.setTimestamp(timestamp);
+ }
+ ColumnValue.Builder valueBuilder = ColumnValue.newBuilder();
+ valueBuilder.setFamily(ByteString.copyFromUtf8("f1"));
+ QualifierValue.Builder qualifierBuilder = QualifierValue.newBuilder();
+ qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c1"));
+ qualifierBuilder.setValue(ByteString.copyFromUtf8("v1"));
+ if (timestamp != null) {
+ qualifierBuilder.setTimestamp(timestamp);
+ }
+ valueBuilder.addQualifierValue(qualifierBuilder.build());
+ qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c2"));
+ qualifierBuilder.setValue(ByteString.copyFromUtf8("v2"));
+ valueBuilder.addQualifierValue(qualifierBuilder.build());
+ mutateBuilder.addColumnValue(valueBuilder.build());
+
+ return mutateBuilder.build();
+ }
+
private static ProcedureProtos.Procedure.Builder createProcedureBuilder(long procId) {
ProcedureProtos.Procedure.Builder builder = ProcedureProtos.Procedure.newBuilder();
builder.setProcId(procId);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
index 69e656f..2d8d8e0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
@@ -122,29 +122,12 @@
*/
@Test
public void testAppend() throws IOException {
- long timeStamp = 111111;
- MutationProto.Builder mutateBuilder = MutationProto.newBuilder();
- mutateBuilder.setRow(ByteString.copyFromUtf8("row"));
- mutateBuilder.setMutateType(MutationType.APPEND);
- mutateBuilder.setTimestamp(timeStamp);
- ColumnValue.Builder valueBuilder = ColumnValue.newBuilder();
- valueBuilder.setFamily(ByteString.copyFromUtf8("f1"));
- QualifierValue.Builder qualifierBuilder = QualifierValue.newBuilder();
- qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c1"));
- qualifierBuilder.setValue(ByteString.copyFromUtf8("v1"));
- qualifierBuilder.setTimestamp(timeStamp);
- valueBuilder.addQualifierValue(qualifierBuilder.build());
- qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c2"));
- qualifierBuilder.setValue(ByteString.copyFromUtf8("v2"));
- valueBuilder.addQualifierValue(qualifierBuilder.build());
- mutateBuilder.addColumnValue(valueBuilder.build());
-
- MutationProto proto = mutateBuilder.build();
+ MutationProto proto = getAppendMutation(111111L);
// default fields
assertEquals(MutationProto.Durability.USE_DEFAULT, proto.getDurability());
// set the default value for equal comparison
- mutateBuilder = MutationProto.newBuilder(proto);
+ MutationProto.Builder mutateBuilder = MutationProto.newBuilder(proto);
mutateBuilder.setDurability(MutationProto.Durability.USE_DEFAULT);
Append append = ProtobufUtil.toAppend(proto, null);
@@ -157,6 +140,42 @@
}
/**
+ * Older clients may not send along a timestamp in the MutationProto. Check that we
+ * default correctly.
+ */
+ @Test
+ public void testAppendNoTimestamp() throws IOException {
+ MutationProto mutation = getAppendMutation(null);
+ Append append = ProtobufUtil.toAppend(mutation, null);
+ assertEquals(HConstants.LATEST_TIMESTAMP, append.getTimestamp());
+ append.getFamilyCellMap().values().forEach(cells -> cells.forEach(cell -> assertEquals(HConstants.LATEST_TIMESTAMP, cell.getTimestamp())));
+ }
+
+ private MutationProto getAppendMutation(Long timestamp) {
+ MutationProto.Builder mutateBuilder = MutationProto.newBuilder();
+ mutateBuilder.setRow(ByteString.copyFromUtf8("row"));
+ mutateBuilder.setMutateType(MutationType.APPEND);
+ if (timestamp != null) {
+ mutateBuilder.setTimestamp(timestamp);
+ }
+ ColumnValue.Builder valueBuilder = ColumnValue.newBuilder();
+ valueBuilder.setFamily(ByteString.copyFromUtf8("f1"));
+ QualifierValue.Builder qualifierBuilder = QualifierValue.newBuilder();
+ qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c1"));
+ qualifierBuilder.setValue(ByteString.copyFromUtf8("v1"));
+ if (timestamp != null) {
+ qualifierBuilder.setTimestamp(timestamp);
+ }
+ valueBuilder.addQualifierValue(qualifierBuilder.build());
+ qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c2"));
+ qualifierBuilder.setValue(ByteString.copyFromUtf8("v2"));
+ valueBuilder.addQualifierValue(qualifierBuilder.build());
+ mutateBuilder.addColumnValue(valueBuilder.build());
+
+ return mutateBuilder.build();
+ }
+
+ /**
* Test Delete Mutate conversions.
*
* @throws IOException
@@ -210,7 +229,36 @@
*/
@Test
public void testIncrement() throws IOException {
- long timeStamp = 111111;
+ MutationProto proto = getIncrementMutation(111111L);
+ // default fields
+ assertEquals(MutationProto.Durability.USE_DEFAULT, proto.getDurability());
+
+ // set the default value for equal comparison
+ MutationProto.Builder mutateBuilder = MutationProto.newBuilder(proto);
+ mutateBuilder.setDurability(MutationProto.Durability.USE_DEFAULT);
+
+ Increment increment = ProtobufUtil.toIncrement(proto, null);
+ mutateBuilder.setTimestamp(increment.getTimestamp());
+ mutateBuilder.setTimeRange(ProtobufUtil.toTimeRange(increment.getTimeRange()));
+ assertEquals(mutateBuilder.build(), ProtobufUtil.toMutation(MutationType.INCREMENT, increment));
+ }
+
+ /**
+ * Older clients may not send along a timestamp in the MutationProto. Check that we
+ * default correctly.
+ */
+ @Test
+ public void testIncrementNoTimestamp() throws IOException {
+ MutationProto mutation = getIncrementMutation(null);
+ Increment increment = ProtobufUtil.toIncrement(mutation, null);
+ assertEquals(HConstants.LATEST_TIMESTAMP, increment.getTimestamp());
+ increment.getFamilyCellMap().values()
+ .forEach(cells ->
+ cells.forEach(cell ->
+ assertEquals(HConstants.LATEST_TIMESTAMP, cell.getTimestamp())));
+ }
+
+ private MutationProto getIncrementMutation(Long timestamp) {
MutationProto.Builder mutateBuilder = MutationProto.newBuilder();
mutateBuilder.setRow(ByteString.copyFromUtf8("row"));
mutateBuilder.setMutateType(MutationType.INCREMENT);
@@ -219,25 +267,16 @@
QualifierValue.Builder qualifierBuilder = QualifierValue.newBuilder();
qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c1"));
qualifierBuilder.setValue(ByteString.copyFrom(Bytes.toBytes(11L)));
- qualifierBuilder.setTimestamp(timeStamp);
+ if (timestamp != null) {
+ qualifierBuilder.setTimestamp(timestamp);
+ }
valueBuilder.addQualifierValue(qualifierBuilder.build());
qualifierBuilder.setQualifier(ByteString.copyFromUtf8("c2"));
qualifierBuilder.setValue(ByteString.copyFrom(Bytes.toBytes(22L)));
valueBuilder.addQualifierValue(qualifierBuilder.build());
mutateBuilder.addColumnValue(valueBuilder.build());
- MutationProto proto = mutateBuilder.build();
- // default fields
- assertEquals(MutationProto.Durability.USE_DEFAULT, proto.getDurability());
-
- // set the default value for equal comparison
- mutateBuilder = MutationProto.newBuilder(proto);
- mutateBuilder.setDurability(MutationProto.Durability.USE_DEFAULT);
-
- Increment increment = ProtobufUtil.toIncrement(proto, null);
- mutateBuilder.setTimestamp(increment.getTimestamp());
- mutateBuilder.setTimeRange(ProtobufUtil.toTimeRange(increment.getTimeRange()));
- assertEquals(mutateBuilder.build(), ProtobufUtil.toMutation(MutationType.INCREMENT, increment));
+ return mutateBuilder.build();
}
/**
