Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13109 Fix Javadoc warning; and some misc checkstyle warnings

This commit is contained in:
Lars Hofhansl 2015-03-04 18:02:04 -08:00
parent de9791e91e
commit 0bdab85b06
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ExplicitColumnTracker.java
View File

@ -76,8 +76,6 @@ public class ExplicitColumnTracker implements ColumnTracker {
* @param maxVersions maximum versions to return per column * @param maxVersions maximum versions to return per column
* @param oldestUnexpiredTS the oldest timestamp we are interested in, * @param oldestUnexpiredTS the oldest timestamp we are interested in,
* based on TTL * based on TTL
* @param lookAhead number of KeyValues to look ahead via next before
* (re)seeking
*/ */
public ExplicitColumnTracker(NavigableSet<byte[]> columns, int minVersions, public ExplicitColumnTracker(NavigableSet<byte[]> columns, int minVersions,
int maxVersions, long oldestUnexpiredTS) { int maxVersions, long oldestUnexpiredTS) {

9
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanQueryMatcher.java
View File

@ -233,8 +233,9 @@ public class ScanQueryMatcher {
* @throws IOException * @throws IOException
*/ */
public ScanQueryMatcher(Scan scan, ScanInfo scanInfo, NavigableSet<byte[]> columns, public ScanQueryMatcher(Scan scan, ScanInfo scanInfo, NavigableSet<byte[]> columns,
long readPointToUse, long earliestPutTs, long oldestUnexpiredTS, long now, byte[] dropDeletesFromRow, long readPointToUse, long earliestPutTs, long oldestUnexpiredTS, long now,
byte[] dropDeletesToRow, RegionCoprocessorHost regionCoprocessorHost) throws IOException { byte[] dropDeletesFromRow, byte[] dropDeletesToRow,
RegionCoprocessorHost regionCoprocessorHost) throws IOException {
this(scan, scanInfo, columns, ScanType.COMPACT_RETAIN_DELETES, readPointToUse, earliestPutTs, this(scan, scanInfo, columns, ScanType.COMPACT_RETAIN_DELETES, readPointToUse, earliestPutTs,
oldestUnexpiredTS, now, regionCoprocessorHost); oldestUnexpiredTS, now, regionCoprocessorHost);
Preconditions.checkArgument((dropDeletesFromRow != null) && (dropDeletesToRow != null)); 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 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 * @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 * @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 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 * @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 * @return result of the compare between the indexed key and the key portion of the passed cell
*/ */

5
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
View File

@ -338,7 +338,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
} }
scanner.seek(seekKey); scanner.seek(seekKey);
Cell c = scanner.peek(); Cell c = scanner.peek();
if (c != null ) { if (c != null) {
totalScannersSoughtBytes += CellUtil.estimatedSerializedSizeOf(c); totalScannersSoughtBytes += CellUtil.estimatedSerializedSizeOf(c);
} }
} }
@ -628,7 +628,8 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
*/ */
private ScanQueryMatcher.MatchCode optimize(ScanQueryMatcher.MatchCode qcode, Cell cell) { private ScanQueryMatcher.MatchCode optimize(ScanQueryMatcher.MatchCode qcode, Cell cell) {
Cell nextIndexedKey = getNextIndexedKey(); 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; return qcode;
} }
switch(qcode) { switch(qcode) {