You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2015/03/05 03:02:15 UTC
hbase git commit: HBASE-13109 Fix Javadoc warning;
and some misc checkstyle warnings
Repository: hbase
Updated Branches:
refs/heads/master de9791e91 -> 0bdab85b0
HBASE-13109 Fix Javadoc warning; and some misc checkstyle warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0bdab85b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0bdab85b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0bdab85b
Branch: refs/heads/master
Commit: 0bdab85b065bd0876152ac30c2ec6d08adae8006
Parents: de9791e
Author: Lars Hofhansl <la...@apache.org>
Authored: Wed Mar 4 18:02:04 2015 -0800
Committer: Lars Hofhansl <la...@apache.org>
Committed: Wed Mar 4 18:02:04 2015 -0800
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/ExplicitColumnTracker.java | 2 --
.../apache/hadoop/hbase/regionserver/ScanQueryMatcher.java | 9 +++------
.../org/apache/hadoop/hbase/regionserver/StoreScanner.java | 5 +++--
3 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0bdab85b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
index 040ada4..b779e22 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
@@ -76,8 +76,6 @@ public class ExplicitColumnTracker implements ColumnTracker {
* @param maxVersions maximum versions to return per column
* @param oldestUnexpiredTS the oldest timestamp we are interested in,
* based on TTL
- * @param lookAhead number of KeyValues to look ahead via next before
- * (re)seeking
*/
public ExplicitColumnTracker(NavigableSet<byte[]> columns, int minVersions,
int maxVersions, long oldestUnexpiredTS) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/0bdab85b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
index a79b35f..032b4ce 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
@@ -233,8 +233,9 @@ public class ScanQueryMatcher {
* @throws IOException
*/
public ScanQueryMatcher(Scan scan, ScanInfo scanInfo, NavigableSet<byte[]> columns,
- long readPointToUse, long earliestPutTs, long oldestUnexpiredTS, long now, byte[] dropDeletesFromRow,
- byte[] dropDeletesToRow, RegionCoprocessorHost regionCoprocessorHost) throws IOException {
+ long readPointToUse, long earliestPutTs, long oldestUnexpiredTS, long now,
+ byte[] dropDeletesFromRow, byte[] dropDeletesToRow,
+ RegionCoprocessorHost regionCoprocessorHost) throws IOException {
this(scan, scanInfo, columns, ScanType.COMPACT_RETAIN_DELETES, readPointToUse, earliestPutTs,
oldestUnexpiredTS, now, regionCoprocessorHost);
Preconditions.checkArgument((dropDeletesFromRow != null) && (dropDeletesToRow != null));
@@ -579,8 +580,6 @@ public class ScanQueryMatcher {
/**
* @param nextIndexed the key of the next entry in the block index (if any)
- * @param off
- * @param len
* @param kv The Cell we're using to calculate the seek key
* @return result of the compare between the indexed key and the key portion of the passed cell
*/
@@ -594,8 +593,6 @@ public class ScanQueryMatcher {
/**
* @param nextIndexed the key of the next entry in the block index (if any)
- * @param off
- * @param len
* @param kv The Cell we're using to calculate the seek key
* @return result of the compare between the indexed key and the key portion of the passed cell
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/0bdab85b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index 16d3fc1..7ce4e0b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -338,7 +338,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
}
scanner.seek(seekKey);
Cell c = scanner.peek();
- if (c != null ) {
+ if (c != null) {
totalScannersSoughtBytes += CellUtil.estimatedSerializedSizeOf(c);
}
}
@@ -628,7 +628,8 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
*/
private ScanQueryMatcher.MatchCode optimize(ScanQueryMatcher.MatchCode qcode, Cell cell) {
Cell nextIndexedKey = getNextIndexedKey();
- if (nextIndexedKey == null || nextIndexedKey == HConstants.NO_NEXT_INDEXED_KEY || store == null) {
+ if (nextIndexedKey == null || nextIndexedKey == HConstants.NO_NEXT_INDEXED_KEY ||
+ store == null) {
return qcode;
}
switch(qcode) {