You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/12/04 22:15:27 UTC
hbase git commit: HBASE-17112 Prevent setting timestamp of delta
operations the same as previous value's (Phil Yang)
Repository: hbase
Updated Branches:
refs/heads/0.98 7e5a76f0a -> 7e9ca969b
HBASE-17112 Prevent setting timestamp of delta operations the same as previous value's (Phil Yang)
Amending-Author: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7e9ca969
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7e9ca969
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7e9ca969
Branch: refs/heads/0.98
Commit: 7e9ca969b845b00f9325246bb8e494fe5c3ed9a4
Parents: 7e5a76f
Author: tedyu <yu...@gmail.com>
Authored: Thu Nov 17 09:04:39 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Sun Dec 4 14:16:03 2016 -0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ++--
.../java/org/apache/hadoop/hbase/regionserver/TestHRegion.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7e9ca969/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index ec84ba9..24851e0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -5550,7 +5550,7 @@ public class HRegion implements HeapSize { // , Writable{
if (idx < results.size()
&& CellUtil.matchingQualifier(results.get(idx), kv)) {
oldKv = KeyValueUtil.ensureKeyValue(results.get(idx));
- long ts = Math.max(now, oldKv.getTimestamp());
+ long ts = Math.max(now, oldKv.getTimestamp() + 1);
// Process cell tags
List<Tag> newTags = new ArrayList<Tag>();
@@ -5806,7 +5806,7 @@ public class HRegion implements HeapSize { // , Writable{
long ts = now;
if (idx < results.size() && CellUtil.matchingQualifier(results.get(idx), cell)) {
c = results.get(idx);
- ts = Math.max(now, c.getTimestamp());
+ ts = Math.max(now, c.getTimestamp() + 1);
if(c.getValueLength() == Bytes.SIZEOF_LONG) {
amount += Bytes.toLong(c.getValueArray(), c.getValueOffset(), Bytes.SIZEOF_LONG);
} else {
http://git-wip-us.apache.org/repos/asf/hbase/blob/7e9ca969/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index addad00..a38c2d4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -5563,7 +5563,7 @@ public class TestHRegion {
region.increment(inc);
result = region.get(new Get(row));
c = result.getColumnLatestCell(fam1, qual1);
- assertEquals(c.getTimestamp(), 10L);
+ assertEquals(c.getTimestamp(), 11L);
assertEquals(Bytes.toLong(c.getValueArray(), c.getValueOffset(), c.getValueLength()), 2L);
}
@@ -5588,7 +5588,7 @@ public class TestHRegion {
region.append(a);
result = region.get(new Get(row));
c = result.getColumnLatestCell(fam1, qual1);
- assertEquals(c.getTimestamp(), 10L);
+ assertEquals(c.getTimestamp(), 11L);
byte[] expected = new byte[qual1.length*2];
System.arraycopy(qual1, 0, expected, 0, qual1.length);