You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/09/30 20:49:01 UTC
[5/5] hbase git commit: HBASE-14465 Backport 'Allow rowlock to be
reader/write' to branch-1
HBASE-14465 Backport 'Allow rowlock to be reader/write' to branch-1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4812d9a1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4812d9a1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4812d9a1
Branch: refs/heads/branch-1
Commit: 4812d9a178fc0f06d248702c22b96318475d982a
Parents: 2ff8580
Author: stack <st...@apache.org>
Authored: Wed Sep 30 11:48:46 2015 -0700
Committer: stack <st...@apache.org>
Committed: Wed Sep 30 11:48:46 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/HConstants.java | 7 +-
.../rest/model/NamespacesInstanceModel.java | 8 +-
.../hbase/rest/model/NamespacesModel.java | 2 +-
.../ZKSplitLogManagerCoordination.java | 8 +-
.../hadoop/hbase/io/hfile/HFileBlockIndex.java | 2 +-
.../hadoop/hbase/regionserver/HRegion.java | 1090 +++++++++---------
.../hadoop/hbase/regionserver/HStore.java | 4 +-
.../MultiVersionConcurrencyControl.java | 332 +++---
.../hadoop/hbase/regionserver/wal/FSHLog.java | 62 +-
.../hbase/regionserver/wal/FSWALEntry.java | 38 +-
.../hadoop/hbase/regionserver/wal/HLogKey.java | 40 +-
.../hbase/regionserver/wal/ReplayHLogKey.java | 11 +-
.../regionserver/wal/SequenceFileLogReader.java | 7 +-
.../hadoop/hbase/regionserver/wal/WALEdit.java | 5 +-
.../hadoop/hbase/regionserver/wal/WALUtil.java | 102 +-
.../apache/hadoop/hbase/util/HashedBytes.java | 2 +-
.../hadoop/hbase/wal/DisabledWALProvider.java | 2 +-
.../java/org/apache/hadoop/hbase/wal/WAL.java | 17 +-
.../org/apache/hadoop/hbase/wal/WALKey.java | 169 ++-
.../apache/hadoop/hbase/wal/WALSplitter.java | 2 +-
.../hadoop/hbase/TestFullLogReconstruction.java | 4 +-
.../org/apache/hadoop/hbase/TestIOFencing.java | 16 +-
.../hadoop/hbase/client/TestReplicasClient.java | 1 -
.../coprocessor/TestRegionObserverStacking.java | 4 +-
.../hbase/coprocessor/TestWALObserver.java | 29 +-
.../hbase/mapreduce/TestHLogRecordReader.java | 4 +-
.../hbase/mapreduce/TestWALRecordReader.java | 25 +-
.../master/TestDistributedLogSplitting.java | 39 +-
.../hbase/master/TestSplitLogManager.java | 3 +-
.../master/handler/TestEnableTableHandler.java | 8 +-
.../procedure/TestServerCrashProcedure.java | 13 +-
.../hbase/regionserver/TestAtomicOperation.java | 18 +-
.../hadoop/hbase/regionserver/TestBulkLoad.java | 65 +-
.../hbase/regionserver/TestDefaultMemStore.java | 56 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 140 ++-
.../regionserver/TestHRegionReplayEvents.java | 15 +-
.../hbase/regionserver/TestKeepDeletes.java | 9 +
.../TestMultiVersionConcurrencyControl.java | 8 +-
...TestMultiVersionConcurrencyControlBasic.java | 36 +-
.../regionserver/TestPerColumnFamilyFlush.java | 3 +-
.../regionserver/TestRegionReplicaFailover.java | 4 +-
.../TestStoreFileRefresherChore.java | 2 +-
.../hbase/regionserver/TestWALLockup.java | 14 +-
.../hbase/regionserver/wal/TestFSHLog.java | 42 +-
.../regionserver/wal/TestLogRollAbort.java | 17 +-
.../wal/TestLogRollingNoCluster.java | 8 +-
.../wal/TestWALActionsListener.java | 3 +-
.../hbase/regionserver/wal/TestWALReplay.java | 57 +-
.../TestReplicationSourceManager.java | 24 +-
.../TestReplicationWALReaderManager.java | 38 +-
...isibilityLabelsWithDistributedLogReplay.java | 55 -
.../apache/hadoop/hbase/wal/FaultyFSLog.java | 4 +-
.../hbase/wal/TestDefaultWALProvider.java | 42 +-
.../wal/TestDefaultWALProviderWithHLogKey.java | 2 +-
.../apache/hadoop/hbase/wal/TestSecureWAL.java | 3 +-
.../apache/hadoop/hbase/wal/TestWALFactory.java | 59 +-
.../hbase/wal/TestWALReaderOnSecureWAL.java | 31 +-
.../hbase/wal/WALPerformanceEvaluation.java | 12 +-
58 files changed, 1462 insertions(+), 1361 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4812d9a1/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 6af2faa..64bd8c5 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -411,7 +411,10 @@ public final class HConstants {
// should go down.
- /** The hbase:meta table's name. */
+ /**
+ * The hbase:meta table's name.
+ * @deprecated For upgrades of 0.94 to 0.96
+ */
@Deprecated // for compat from 0.94 -> 0.96.
public static final byte[] META_TABLE_NAME = TableName.META_TABLE_NAME.getName();
@@ -588,7 +591,7 @@ public final class HConstants {
* 1, 2, 3, 5, 10, 20, 40, 100, 100, 100.
* With 100ms, a back-off of 200 means 20s
*/
- public static final int RETRY_BACKOFF[] = {1, 2, 3, 5, 10, 20, 40, 100, 100, 100, 100, 200, 200};
+ public static final int [] RETRY_BACKOFF = {1, 2, 3, 5, 10, 20, 40, 100, 100, 100, 100, 200, 200};
public static final String REGION_IMPL = "hbase.hregion.impl";
http://git-wip-us.apache.org/repos/asf/hbase/blob/4812d9a1/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java
index d8528ef..b31ecf9 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java
@@ -67,7 +67,7 @@ public class NamespacesInstanceModel implements Serializable, ProtobufMessageHan
/**
* Constructor to use if namespace does not exist in HBASE.
- * @param namespaceName: the namespace name.
+ * @param namespaceName the namespace name.
* @throws IOException
*/
public NamespacesInstanceModel(String namespaceName) throws IOException {
@@ -76,8 +76,8 @@ public class NamespacesInstanceModel implements Serializable, ProtobufMessageHan
/**
* Constructor
- * @param admin: the administrative API
- * @param namespaceName: the namespace name.
+ * @param admin the administrative API
+ * @param namespaceName the namespace name.
* @throws IOException
*/
public NamespacesInstanceModel(Admin admin, String namespaceName) throws IOException {
@@ -95,7 +95,7 @@ public class NamespacesInstanceModel implements Serializable, ProtobufMessageHan
/**
* Add property to the namespace.
- * @param key: attribute name
+ * @param key attribute name
* @param value attribute value
*/
public void addProperty(String key, String value) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/4812d9a1/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java
index 7b8f3b7..d6a5685 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesModel.java
@@ -61,7 +61,7 @@ public class NamespacesModel implements Serializable, ProtobufMessageHandler {
/**
* Constructor
- * @param admin: the administrative API
+ * @param admin the administrative API
* @throws IOException
*/
public NamespacesModel(Admin admin) throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/4812d9a1/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
index 3cf9160..802f643 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
@@ -878,13 +878,7 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements
* @return true when distributed log replay is turned on
*/
private boolean isDistributedLogReplay(Configuration conf) {
- boolean dlr =
- conf.getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY,
- HConstants.DEFAULT_DISTRIBUTED_LOG_REPLAY_CONFIG);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Distributed log replay=" + dlr);
- }
- return dlr;
+ return false;
}
private boolean resubmit(ServerName serverName, String path, int version) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/4812d9a1/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.java
index 48ce693..1c315e9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.java
@@ -51,7 +51,7 @@ import org.apache.hadoop.util.StringUtils;
/**
* Provides functionality to write ({@link BlockIndexWriter}) and read
- * ({@link BlockIndexReader})
+ * BlockIndexReader
* single-level and multi-level block indexes.
*
* Examples of how to use the block index writer can be found in