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

HBASE-13990 make maven site generation work with jdk8

This commit is contained in:
Sean Busbey 2015-06-29 12:42:21 -05:00
parent 85c278a6a8
commit 6ca337cb3e
3 changed files with 23 additions and 8 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/io/hfile/HFileBlock.java
View File

@ -344,7 +344,7 @@ public class HFileBlock implements Cacheable {
/** /**
* Returns the buffer this block stores internally. The clients must not * Returns the buffer this block stores internally. The clients must not
* modify the buffer object. This method has to be public because it is * modify the buffer object. This method has to be public because it is
* used in {@link org.apache.hadoop.hbase.util.CompoundBloomFilter} to avoid object * used in {@link CompoundBloomFilter} to avoid object
* creation on every Bloom filter lookup, but has to be used with caution. * creation on every Bloom filter lookup, but has to be used with caution.
* Checksum data is not included in the returned buffer but header data is. * Checksum data is not included in the returned buffer but header data is.
* *

14
hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
View File

@ -36,13 +36,15 @@ import java.util.List;
* *
* Logic in use: * Logic in use:
* *
* - get all regions of a given table * <ol>
* - get avg size S of each region (by total size of store files reported in RegionLoad) * <li> get all regions of a given table
* - If biggest region is bigger than S * 2, it is kindly requested to split, * <li> get avg size S of each region (by total size of store files reported in RegionLoad)
* <li> If biggest region is bigger than S * 2, it is kindly requested to split,
* and normalization stops * and normalization stops
* - Otherwise, two smallest region R1 and its smallest neighbor R2 are kindly requested * <li> Otherwise, two smallest region R1 and its smallest neighbor R2 are kindly requested
* to merge, if R1 + R1 < S, and normalization stops * to merge, if R1 + R1 &lt; S, and normalization stops
* - Otherwise, no action is performed * <li> Otherwise, no action is performed
* </ol>
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
public class SimpleRegionNormalizer implements RegionNormalizer { public class SimpleRegionNormalizer implements RegionNormalizer {

15
pom.xml
View File

@ -1195,7 +1195,7 @@
<maven.antrun.version>1.8</maven.antrun.version> <maven.antrun.version>1.8</maven.antrun.version>
<jamon.plugin.version>2.3.4</jamon.plugin.version> <jamon.plugin.version>2.3.4</jamon.plugin.version>
<findbugs-annotations>1.3.9-1</findbugs-annotations> <findbugs-annotations>1.3.9-1</findbugs-annotations>
<javadoc.version>2.9</javadoc.version> <javadoc.version>2.10.3</javadoc.version>
<!-- General Packaging --> <!-- General Packaging -->
<package.prefix>/usr</package.prefix> <package.prefix>/usr</package.prefix>
<package.conf.dir>/etc/hbase</package.conf.dir> <package.conf.dir>/etc/hbase</package.conf.dir>
@ -2747,6 +2747,19 @@
<excludePackageNames>org.apache.hadoop.hbase.generated.master:org.apache.hadoop.hbase.protobuf.generated</excludePackageNames> <excludePackageNames>org.apache.hadoop.hbase.generated.master:org.apache.hadoop.hbase.protobuf.generated</excludePackageNames>
<maxmemory>2048m</maxmemory> <maxmemory>2048m</maxmemory>
<notimestamp>true</notimestamp> <notimestamp>true</notimestamp>
<!-- JDK8 javadoc requires test scope transitive dependencies due to our custom doclet -->
<additionalDependencies>
<additionalDependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito-all.version}</version>
</additionalDependency>
<additionalDependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest.version}</version>
</additionalDependency>
</additionalDependencies>
</configuration> </configuration>
<reportSets> <reportSets>
<reportSet> <reportSet>