You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2017/01/22 16:44:18 UTC
hbase git commit: HBASE-17504 The passed durability of Increment is
ignored when syncing WAL (ChiaPing Tsai)
Repository: hbase
Updated Branches:
refs/heads/branch-1 57409371a -> 6e0f3f5bb
HBASE-17504 The passed durability of Increment is ignored when syncing WAL (ChiaPing Tsai)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6e0f3f5b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6e0f3f5b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6e0f3f5b
Branch: refs/heads/branch-1
Commit: 6e0f3f5bbc3183c8e768a72dbacde56be51442a1
Parents: 5740937
Author: tedyu <yu...@gmail.com>
Authored: Sun Jan 22 08:44:11 2017 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Sun Jan 22 08:44:11 2017 -0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/6e0f3f5b/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 18865f3..209f6ad 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
@@ -7984,7 +7984,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
// sync the transaction log outside the rowlock
if(txid != 0) {
- syncOrDefer(txid, durability);
+ syncOrDefer(txid, effectiveDurability);
}
doRollBackMemstore = false;
} finally {
@@ -8060,13 +8060,12 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
// Append new incremented KeyValue to list
- byte [] qualifier = CellUtil.cloneQualifier(inc);
byte [] incrementAmountInBytes = Bytes.toBytes(incrementAmount);
tags = carryForwardTTLTag(tags, increment);
Cell newValue = new KeyValue(row, 0, row.length,
columnFamilyName, 0, columnFamilyName.length,
- qualifier, 0, qualifier.length,
+ inc.getQualifierArray(), inc.getQualifierOffset(), inc.getQualifierLength(),
ts, KeyValue.Type.Put,
incrementAmountInBytes, 0, incrementAmountInBytes.length,
tags);