From 36673040a54d1da4e5ce0b5f441bbe824deba197 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Mon, 29 Jun 2015 12:42:21 -0500 Subject: [PATCH] HBASE-13990 make maven site generation work with jdk8 --- .../org/apache/hadoop/hbase/io/hfile/HFileBlock.java | 2 +- .../hbase/master/normalizer/SimpleRegionNormalizer.java | 14 ++++++++------ pom.xml | 15 ++++++++++++++- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java index f60272f..f3bf0b7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java @@ -344,7 +344,7 @@ public class HFileBlock implements Cacheable { /** * Returns the buffer this block stores internally. The clients must not * 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. * Checksum data is not included in the returned buffer but header data is. * diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java index bf58691..75989d5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java @@ -36,13 +36,15 @@ import java.util.List; * * Logic in use: * - * - get all regions of a given table - * - get avg size S of each region (by total size of store files reported in RegionLoad) - * - If biggest region is bigger than S * 2, it is kindly requested to split, + *
    + *
  1. get all regions of a given table + *
  2. get avg size S of each region (by total size of store files reported in RegionLoad) + *
  3. If biggest region is bigger than S * 2, it is kindly requested to split, * and normalization stops - * - Otherwise, two smallest region R1 and its smallest neighbor R2 are kindly requested - * to merge, if R1 + R1 < S, and normalization stops - * - Otherwise, no action is performed + *
  4. Otherwise, two smallest region R1 and its smallest neighbor R2 are kindly requested + * to merge, if R1 + R1 < S, and normalization stops + *
  5. Otherwise, no action is performed + *
*/ @InterfaceAudience.Private public class SimpleRegionNormalizer implements RegionNormalizer { diff --git a/pom.xml b/pom.xml index bbb7ff4..5551905 100644 --- a/pom.xml +++ b/pom.xml @@ -1195,7 +1195,7 @@ 1.8 2.3.4 1.3.9-1 - 2.9 + 2.10.3 /usr /etc/hbase @@ -2747,6 +2747,19 @@ org.apache.hadoop.hbase.generated.master:org.apache.hadoop.hbase.protobuf.generated 2048m true + + + + org.mockito + mockito-all + ${mockito-all.version} + + + org.hamcrest + hamcrest-core + ${hamcrest.version} + + -- 1.7.10.2 (Apple Git-33)