You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/02/03 18:26:14 UTC

[41/51] [partial] hbase-site git commit: Published site at 2f5767376f42c0416e025df412e3d5944a1b2a67.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6a13df3e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html
index f41a45b..9f165f1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.html
@@ -644,156 +644,159 @@
 <span class="sourceLineNo">636</span>    Configuration conf = job.getConfiguration();<a name="line.636"></a>
 <span class="sourceLineNo">637</span>    // create the partitions file<a name="line.637"></a>
 <span class="sourceLineNo">638</span>    FileSystem fs = FileSystem.get(conf);<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    Path partitionsPath = new Path(conf.get("hbase.fs.tmp.dir"), "partitions_" + UUID.randomUUID());<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    fs.makeQualified(partitionsPath);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    writePartitions(conf, partitionsPath, splitPoints);<a name="line.641"></a>
-<span class="sourceLineNo">642</span>    fs.deleteOnExit(partitionsPath);<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span>    // configure job to use it<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    job.setPartitionerClass(TotalOrderPartitioner.class);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    TotalOrderPartitioner.setPartitionFile(conf, partitionsPath);<a name="line.646"></a>
-<span class="sourceLineNo">647</span>  }<a name="line.647"></a>
-<span class="sourceLineNo">648</span><a name="line.648"></a>
-<span class="sourceLineNo">649</span>  /**<a name="line.649"></a>
-<span class="sourceLineNo">650</span>   * Serialize column family to compression algorithm map to configuration.<a name="line.650"></a>
-<span class="sourceLineNo">651</span>   * Invoked while configuring the MR job for incremental load.<a name="line.651"></a>
-<span class="sourceLineNo">652</span>   *<a name="line.652"></a>
-<span class="sourceLineNo">653</span>   * @param tableDescriptor to read the properties from<a name="line.653"></a>
-<span class="sourceLineNo">654</span>   * @param conf to persist serialized values into<a name="line.654"></a>
-<span class="sourceLineNo">655</span>   * @throws IOException<a name="line.655"></a>
-<span class="sourceLineNo">656</span>   *           on failure to read column family descriptors<a name="line.656"></a>
-<span class="sourceLineNo">657</span>   */<a name="line.657"></a>
-<span class="sourceLineNo">658</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")<a name="line.659"></a>
-<span class="sourceLineNo">660</span>  @VisibleForTesting<a name="line.660"></a>
-<span class="sourceLineNo">661</span>  static void configureCompression(Configuration conf, HTableDescriptor tableDescriptor)<a name="line.661"></a>
-<span class="sourceLineNo">662</span>      throws UnsupportedEncodingException {<a name="line.662"></a>
-<span class="sourceLineNo">663</span>    StringBuilder compressionConfigValue = new StringBuilder();<a name="line.663"></a>
-<span class="sourceLineNo">664</span>    if(tableDescriptor == null){<a name="line.664"></a>
-<span class="sourceLineNo">665</span>      // could happen with mock table instance<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      return;<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    Collection&lt;HColumnDescriptor&gt; families = tableDescriptor.getFamilies();<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    int i = 0;<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    for (HColumnDescriptor familyDescriptor : families) {<a name="line.670"></a>
-<span class="sourceLineNo">671</span>      if (i++ &gt; 0) {<a name="line.671"></a>
-<span class="sourceLineNo">672</span>        compressionConfigValue.append('&amp;');<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      }<a name="line.673"></a>
-<span class="sourceLineNo">674</span>      compressionConfigValue.append(URLEncoder.encode(<a name="line.674"></a>
-<span class="sourceLineNo">675</span>        familyDescriptor.getNameAsString(), "UTF-8"));<a name="line.675"></a>
-<span class="sourceLineNo">676</span>      compressionConfigValue.append('=');<a name="line.676"></a>
+<span class="sourceLineNo">639</span>    String hbaseTmpFsDir =<a name="line.639"></a>
+<span class="sourceLineNo">640</span>        conf.get(HConstants.TEMPORARY_FS_DIRECTORY_KEY,<a name="line.640"></a>
+<span class="sourceLineNo">641</span>          HConstants.DEFAULT_TEMPORARY_HDFS_DIRECTORY);<a name="line.641"></a>
+<span class="sourceLineNo">642</span>    Path partitionsPath = new Path(hbaseTmpFsDir, "partitions_" + UUID.randomUUID());<a name="line.642"></a>
+<span class="sourceLineNo">643</span>    fs.makeQualified(partitionsPath);<a name="line.643"></a>
+<span class="sourceLineNo">644</span>    writePartitions(conf, partitionsPath, splitPoints);<a name="line.644"></a>
+<span class="sourceLineNo">645</span>    fs.deleteOnExit(partitionsPath);<a name="line.645"></a>
+<span class="sourceLineNo">646</span><a name="line.646"></a>
+<span class="sourceLineNo">647</span>    // configure job to use it<a name="line.647"></a>
+<span class="sourceLineNo">648</span>    job.setPartitionerClass(TotalOrderPartitioner.class);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    TotalOrderPartitioner.setPartitionFile(conf, partitionsPath);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>  }<a name="line.650"></a>
+<span class="sourceLineNo">651</span><a name="line.651"></a>
+<span class="sourceLineNo">652</span>  /**<a name="line.652"></a>
+<span class="sourceLineNo">653</span>   * Serialize column family to compression algorithm map to configuration.<a name="line.653"></a>
+<span class="sourceLineNo">654</span>   * Invoked while configuring the MR job for incremental load.<a name="line.654"></a>
+<span class="sourceLineNo">655</span>   *<a name="line.655"></a>
+<span class="sourceLineNo">656</span>   * @param tableDescriptor to read the properties from<a name="line.656"></a>
+<span class="sourceLineNo">657</span>   * @param conf to persist serialized values into<a name="line.657"></a>
+<span class="sourceLineNo">658</span>   * @throws IOException<a name="line.658"></a>
+<span class="sourceLineNo">659</span>   *           on failure to read column family descriptors<a name="line.659"></a>
+<span class="sourceLineNo">660</span>   */<a name="line.660"></a>
+<span class="sourceLineNo">661</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(<a name="line.661"></a>
+<span class="sourceLineNo">662</span>      value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")<a name="line.662"></a>
+<span class="sourceLineNo">663</span>  @VisibleForTesting<a name="line.663"></a>
+<span class="sourceLineNo">664</span>  static void configureCompression(Configuration conf, HTableDescriptor tableDescriptor)<a name="line.664"></a>
+<span class="sourceLineNo">665</span>      throws UnsupportedEncodingException {<a name="line.665"></a>
+<span class="sourceLineNo">666</span>    StringBuilder compressionConfigValue = new StringBuilder();<a name="line.666"></a>
+<span class="sourceLineNo">667</span>    if(tableDescriptor == null){<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      // could happen with mock table instance<a name="line.668"></a>
+<span class="sourceLineNo">669</span>      return;<a name="line.669"></a>
+<span class="sourceLineNo">670</span>    }<a name="line.670"></a>
+<span class="sourceLineNo">671</span>    Collection&lt;HColumnDescriptor&gt; families = tableDescriptor.getFamilies();<a name="line.671"></a>
+<span class="sourceLineNo">672</span>    int i = 0;<a name="line.672"></a>
+<span class="sourceLineNo">673</span>    for (HColumnDescriptor familyDescriptor : families) {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      if (i++ &gt; 0) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span>        compressionConfigValue.append('&amp;');<a name="line.675"></a>
+<span class="sourceLineNo">676</span>      }<a name="line.676"></a>
 <span class="sourceLineNo">677</span>      compressionConfigValue.append(URLEncoder.encode(<a name="line.677"></a>
-<span class="sourceLineNo">678</span>        familyDescriptor.getCompressionType().getName(), "UTF-8"));<a name="line.678"></a>
-<span class="sourceLineNo">679</span>    }<a name="line.679"></a>
-<span class="sourceLineNo">680</span>    // Get rid of the last ampersand<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    conf.set(COMPRESSION_FAMILIES_CONF_KEY, compressionConfigValue.toString());<a name="line.681"></a>
-<span class="sourceLineNo">682</span>  }<a name="line.682"></a>
-<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span>  /**<a name="line.684"></a>
-<span class="sourceLineNo">685</span>   * Serialize column family to block size map to configuration.<a name="line.685"></a>
-<span class="sourceLineNo">686</span>   * Invoked while configuring the MR job for incremental load.<a name="line.686"></a>
-<span class="sourceLineNo">687</span>   * @param tableDescriptor to read the properties from<a name="line.687"></a>
-<span class="sourceLineNo">688</span>   * @param conf to persist serialized values into<a name="line.688"></a>
-<span class="sourceLineNo">689</span>   *<a name="line.689"></a>
-<span class="sourceLineNo">690</span>   * @throws IOException<a name="line.690"></a>
-<span class="sourceLineNo">691</span>   *           on failure to read column family descriptors<a name="line.691"></a>
-<span class="sourceLineNo">692</span>   */<a name="line.692"></a>
-<span class="sourceLineNo">693</span>  @VisibleForTesting<a name="line.693"></a>
-<span class="sourceLineNo">694</span>  static void configureBlockSize(HTableDescriptor tableDescriptor, Configuration conf)<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      throws UnsupportedEncodingException {<a name="line.695"></a>
-<span class="sourceLineNo">696</span>    StringBuilder blockSizeConfigValue = new StringBuilder();<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    if (tableDescriptor == null) {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>      // could happen with mock table instance<a name="line.698"></a>
-<span class="sourceLineNo">699</span>      return;<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    }<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    Collection&lt;HColumnDescriptor&gt; families = tableDescriptor.getFamilies();<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    int i = 0;<a name="line.702"></a>
-<span class="sourceLineNo">703</span>    for (HColumnDescriptor familyDescriptor : families) {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      if (i++ &gt; 0) {<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        blockSizeConfigValue.append('&amp;');<a name="line.705"></a>
-<span class="sourceLineNo">706</span>      }<a name="line.706"></a>
-<span class="sourceLineNo">707</span>      blockSizeConfigValue.append(URLEncoder.encode(<a name="line.707"></a>
-<span class="sourceLineNo">708</span>          familyDescriptor.getNameAsString(), "UTF-8"));<a name="line.708"></a>
-<span class="sourceLineNo">709</span>      blockSizeConfigValue.append('=');<a name="line.709"></a>
+<span class="sourceLineNo">678</span>        familyDescriptor.getNameAsString(), "UTF-8"));<a name="line.678"></a>
+<span class="sourceLineNo">679</span>      compressionConfigValue.append('=');<a name="line.679"></a>
+<span class="sourceLineNo">680</span>      compressionConfigValue.append(URLEncoder.encode(<a name="line.680"></a>
+<span class="sourceLineNo">681</span>        familyDescriptor.getCompressionType().getName(), "UTF-8"));<a name="line.681"></a>
+<span class="sourceLineNo">682</span>    }<a name="line.682"></a>
+<span class="sourceLineNo">683</span>    // Get rid of the last ampersand<a name="line.683"></a>
+<span class="sourceLineNo">684</span>    conf.set(COMPRESSION_FAMILIES_CONF_KEY, compressionConfigValue.toString());<a name="line.684"></a>
+<span class="sourceLineNo">685</span>  }<a name="line.685"></a>
+<span class="sourceLineNo">686</span><a name="line.686"></a>
+<span class="sourceLineNo">687</span>  /**<a name="line.687"></a>
+<span class="sourceLineNo">688</span>   * Serialize column family to block size map to configuration.<a name="line.688"></a>
+<span class="sourceLineNo">689</span>   * Invoked while configuring the MR job for incremental load.<a name="line.689"></a>
+<span class="sourceLineNo">690</span>   * @param tableDescriptor to read the properties from<a name="line.690"></a>
+<span class="sourceLineNo">691</span>   * @param conf to persist serialized values into<a name="line.691"></a>
+<span class="sourceLineNo">692</span>   *<a name="line.692"></a>
+<span class="sourceLineNo">693</span>   * @throws IOException<a name="line.693"></a>
+<span class="sourceLineNo">694</span>   *           on failure to read column family descriptors<a name="line.694"></a>
+<span class="sourceLineNo">695</span>   */<a name="line.695"></a>
+<span class="sourceLineNo">696</span>  @VisibleForTesting<a name="line.696"></a>
+<span class="sourceLineNo">697</span>  static void configureBlockSize(HTableDescriptor tableDescriptor, Configuration conf)<a name="line.697"></a>
+<span class="sourceLineNo">698</span>      throws UnsupportedEncodingException {<a name="line.698"></a>
+<span class="sourceLineNo">699</span>    StringBuilder blockSizeConfigValue = new StringBuilder();<a name="line.699"></a>
+<span class="sourceLineNo">700</span>    if (tableDescriptor == null) {<a name="line.700"></a>
+<span class="sourceLineNo">701</span>      // could happen with mock table instance<a name="line.701"></a>
+<span class="sourceLineNo">702</span>      return;<a name="line.702"></a>
+<span class="sourceLineNo">703</span>    }<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    Collection&lt;HColumnDescriptor&gt; families = tableDescriptor.getFamilies();<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    int i = 0;<a name="line.705"></a>
+<span class="sourceLineNo">706</span>    for (HColumnDescriptor familyDescriptor : families) {<a name="line.706"></a>
+<span class="sourceLineNo">707</span>      if (i++ &gt; 0) {<a name="line.707"></a>
+<span class="sourceLineNo">708</span>        blockSizeConfigValue.append('&amp;');<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      }<a name="line.709"></a>
 <span class="sourceLineNo">710</span>      blockSizeConfigValue.append(URLEncoder.encode(<a name="line.710"></a>
-<span class="sourceLineNo">711</span>          String.valueOf(familyDescriptor.getBlocksize()), "UTF-8"));<a name="line.711"></a>
-<span class="sourceLineNo">712</span>    }<a name="line.712"></a>
-<span class="sourceLineNo">713</span>    // Get rid of the last ampersand<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    conf.set(BLOCK_SIZE_FAMILIES_CONF_KEY, blockSizeConfigValue.toString());<a name="line.714"></a>
-<span class="sourceLineNo">715</span>  }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span>  /**<a name="line.717"></a>
-<span class="sourceLineNo">718</span>   * Serialize column family to bloom type map to configuration.<a name="line.718"></a>
-<span class="sourceLineNo">719</span>   * Invoked while configuring the MR job for incremental load.<a name="line.719"></a>
-<span class="sourceLineNo">720</span>   * @param tableDescriptor to read the properties from<a name="line.720"></a>
-<span class="sourceLineNo">721</span>   * @param conf to persist serialized values into<a name="line.721"></a>
-<span class="sourceLineNo">722</span>   *<a name="line.722"></a>
-<span class="sourceLineNo">723</span>   * @throws IOException<a name="line.723"></a>
-<span class="sourceLineNo">724</span>   *           on failure to read column family descriptors<a name="line.724"></a>
-<span class="sourceLineNo">725</span>   */<a name="line.725"></a>
-<span class="sourceLineNo">726</span>  @VisibleForTesting<a name="line.726"></a>
-<span class="sourceLineNo">727</span>  static void configureBloomType(HTableDescriptor tableDescriptor, Configuration conf)<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      throws UnsupportedEncodingException {<a name="line.728"></a>
-<span class="sourceLineNo">729</span>    if (tableDescriptor == null) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span>      // could happen with mock table instance<a name="line.730"></a>
-<span class="sourceLineNo">731</span>      return;<a name="line.731"></a>
-<span class="sourceLineNo">732</span>    }<a name="line.732"></a>
-<span class="sourceLineNo">733</span>    StringBuilder bloomTypeConfigValue = new StringBuilder();<a name="line.733"></a>
-<span class="sourceLineNo">734</span>    Collection&lt;HColumnDescriptor&gt; families = tableDescriptor.getFamilies();<a name="line.734"></a>
-<span class="sourceLineNo">735</span>    int i = 0;<a name="line.735"></a>
-<span class="sourceLineNo">736</span>    for (HColumnDescriptor familyDescriptor : families) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span>      if (i++ &gt; 0) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span>        bloomTypeConfigValue.append('&amp;');<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      }<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      bloomTypeConfigValue.append(URLEncoder.encode(<a name="line.740"></a>
-<span class="sourceLineNo">741</span>        familyDescriptor.getNameAsString(), "UTF-8"));<a name="line.741"></a>
-<span class="sourceLineNo">742</span>      bloomTypeConfigValue.append('=');<a name="line.742"></a>
-<span class="sourceLineNo">743</span>      String bloomType = familyDescriptor.getBloomFilterType().toString();<a name="line.743"></a>
-<span class="sourceLineNo">744</span>      if (bloomType == null) {<a name="line.744"></a>
-<span class="sourceLineNo">745</span>        bloomType = HColumnDescriptor.DEFAULT_BLOOMFILTER;<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      }<a name="line.746"></a>
-<span class="sourceLineNo">747</span>      bloomTypeConfigValue.append(URLEncoder.encode(bloomType, "UTF-8"));<a name="line.747"></a>
-<span class="sourceLineNo">748</span>    }<a name="line.748"></a>
-<span class="sourceLineNo">749</span>    conf.set(BLOOM_TYPE_FAMILIES_CONF_KEY, bloomTypeConfigValue.toString());<a name="line.749"></a>
-<span class="sourceLineNo">750</span>  }<a name="line.750"></a>
-<span class="sourceLineNo">751</span><a name="line.751"></a>
-<span class="sourceLineNo">752</span>  /**<a name="line.752"></a>
-<span class="sourceLineNo">753</span>   * Serialize column family to data block encoding map to configuration.<a name="line.753"></a>
-<span class="sourceLineNo">754</span>   * Invoked while configuring the MR job for incremental load.<a name="line.754"></a>
-<span class="sourceLineNo">755</span>   *<a name="line.755"></a>
-<span class="sourceLineNo">756</span>   * @param tableDescriptor to read the properties from<a name="line.756"></a>
-<span class="sourceLineNo">757</span>   * @param conf to persist serialized values into<a name="line.757"></a>
-<span class="sourceLineNo">758</span>   * @throws IOException<a name="line.758"></a>
-<span class="sourceLineNo">759</span>   *           on failure to read column family descriptors<a name="line.759"></a>
-<span class="sourceLineNo">760</span>   */<a name="line.760"></a>
-<span class="sourceLineNo">761</span>  @VisibleForTesting<a name="line.761"></a>
-<span class="sourceLineNo">762</span>  static void configureDataBlockEncoding(HTableDescriptor tableDescriptor,<a name="line.762"></a>
-<span class="sourceLineNo">763</span>      Configuration conf) throws UnsupportedEncodingException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span>    if (tableDescriptor == null) {<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      // could happen with mock table instance<a name="line.765"></a>
-<span class="sourceLineNo">766</span>      return;<a name="line.766"></a>
-<span class="sourceLineNo">767</span>    }<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    StringBuilder dataBlockEncodingConfigValue = new StringBuilder();<a name="line.768"></a>
-<span class="sourceLineNo">769</span>    Collection&lt;HColumnDescriptor&gt; families = tableDescriptor.getFamilies();<a name="line.769"></a>
-<span class="sourceLineNo">770</span>    int i = 0;<a name="line.770"></a>
-<span class="sourceLineNo">771</span>    for (HColumnDescriptor familyDescriptor : families) {<a name="line.771"></a>
-<span class="sourceLineNo">772</span>      if (i++ &gt; 0) {<a name="line.772"></a>
-<span class="sourceLineNo">773</span>        dataBlockEncodingConfigValue.append('&amp;');<a name="line.773"></a>
-<span class="sourceLineNo">774</span>      }<a name="line.774"></a>
-<span class="sourceLineNo">775</span>      dataBlockEncodingConfigValue.append(<a name="line.775"></a>
-<span class="sourceLineNo">776</span>          URLEncoder.encode(familyDescriptor.getNameAsString(), "UTF-8"));<a name="line.776"></a>
-<span class="sourceLineNo">777</span>      dataBlockEncodingConfigValue.append('=');<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      DataBlockEncoding encoding = familyDescriptor.getDataBlockEncoding();<a name="line.778"></a>
-<span class="sourceLineNo">779</span>      if (encoding == null) {<a name="line.779"></a>
-<span class="sourceLineNo">780</span>        encoding = DataBlockEncoding.NONE;<a name="line.780"></a>
-<span class="sourceLineNo">781</span>      }<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      dataBlockEncodingConfigValue.append(URLEncoder.encode(encoding.toString(),<a name="line.782"></a>
-<span class="sourceLineNo">783</span>          "UTF-8"));<a name="line.783"></a>
-<span class="sourceLineNo">784</span>    }<a name="line.784"></a>
-<span class="sourceLineNo">785</span>    conf.set(DATABLOCK_ENCODING_FAMILIES_CONF_KEY,<a name="line.785"></a>
-<span class="sourceLineNo">786</span>        dataBlockEncodingConfigValue.toString());<a name="line.786"></a>
-<span class="sourceLineNo">787</span>  }<a name="line.787"></a>
-<span class="sourceLineNo">788</span>}<a name="line.788"></a>
+<span class="sourceLineNo">711</span>          familyDescriptor.getNameAsString(), "UTF-8"));<a name="line.711"></a>
+<span class="sourceLineNo">712</span>      blockSizeConfigValue.append('=');<a name="line.712"></a>
+<span class="sourceLineNo">713</span>      blockSizeConfigValue.append(URLEncoder.encode(<a name="line.713"></a>
+<span class="sourceLineNo">714</span>          String.valueOf(familyDescriptor.getBlocksize()), "UTF-8"));<a name="line.714"></a>
+<span class="sourceLineNo">715</span>    }<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    // Get rid of the last ampersand<a name="line.716"></a>
+<span class="sourceLineNo">717</span>    conf.set(BLOCK_SIZE_FAMILIES_CONF_KEY, blockSizeConfigValue.toString());<a name="line.717"></a>
+<span class="sourceLineNo">718</span>  }<a name="line.718"></a>
+<span class="sourceLineNo">719</span><a name="line.719"></a>
+<span class="sourceLineNo">720</span>  /**<a name="line.720"></a>
+<span class="sourceLineNo">721</span>   * Serialize column family to bloom type map to configuration.<a name="line.721"></a>
+<span class="sourceLineNo">722</span>   * Invoked while configuring the MR job for incremental load.<a name="line.722"></a>
+<span class="sourceLineNo">723</span>   * @param tableDescriptor to read the properties from<a name="line.723"></a>
+<span class="sourceLineNo">724</span>   * @param conf to persist serialized values into<a name="line.724"></a>
+<span class="sourceLineNo">725</span>   *<a name="line.725"></a>
+<span class="sourceLineNo">726</span>   * @throws IOException<a name="line.726"></a>
+<span class="sourceLineNo">727</span>   *           on failure to read column family descriptors<a name="line.727"></a>
+<span class="sourceLineNo">728</span>   */<a name="line.728"></a>
+<span class="sourceLineNo">729</span>  @VisibleForTesting<a name="line.729"></a>
+<span class="sourceLineNo">730</span>  static void configureBloomType(HTableDescriptor tableDescriptor, Configuration conf)<a name="line.730"></a>
+<span class="sourceLineNo">731</span>      throws UnsupportedEncodingException {<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    if (tableDescriptor == null) {<a name="line.732"></a>
+<span class="sourceLineNo">733</span>      // could happen with mock table instance<a name="line.733"></a>
+<span class="sourceLineNo">734</span>      return;<a name="line.734"></a>
+<span class="sourceLineNo">735</span>    }<a name="line.735"></a>
+<span class="sourceLineNo">736</span>    StringBuilder bloomTypeConfigValue = new StringBuilder();<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    Collection&lt;HColumnDescriptor&gt; families = tableDescriptor.getFamilies();<a name="line.737"></a>
+<span class="sourceLineNo">738</span>    int i = 0;<a name="line.738"></a>
+<span class="sourceLineNo">739</span>    for (HColumnDescriptor familyDescriptor : families) {<a name="line.739"></a>
+<span class="sourceLineNo">740</span>      if (i++ &gt; 0) {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>        bloomTypeConfigValue.append('&amp;');<a name="line.741"></a>
+<span class="sourceLineNo">742</span>      }<a name="line.742"></a>
+<span class="sourceLineNo">743</span>      bloomTypeConfigValue.append(URLEncoder.encode(<a name="line.743"></a>
+<span class="sourceLineNo">744</span>        familyDescriptor.getNameAsString(), "UTF-8"));<a name="line.744"></a>
+<span class="sourceLineNo">745</span>      bloomTypeConfigValue.append('=');<a name="line.745"></a>
+<span class="sourceLineNo">746</span>      String bloomType = familyDescriptor.getBloomFilterType().toString();<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      if (bloomType == null) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span>        bloomType = HColumnDescriptor.DEFAULT_BLOOMFILTER;<a name="line.748"></a>
+<span class="sourceLineNo">749</span>      }<a name="line.749"></a>
+<span class="sourceLineNo">750</span>      bloomTypeConfigValue.append(URLEncoder.encode(bloomType, "UTF-8"));<a name="line.750"></a>
+<span class="sourceLineNo">751</span>    }<a name="line.751"></a>
+<span class="sourceLineNo">752</span>    conf.set(BLOOM_TYPE_FAMILIES_CONF_KEY, bloomTypeConfigValue.toString());<a name="line.752"></a>
+<span class="sourceLineNo">753</span>  }<a name="line.753"></a>
+<span class="sourceLineNo">754</span><a name="line.754"></a>
+<span class="sourceLineNo">755</span>  /**<a name="line.755"></a>
+<span class="sourceLineNo">756</span>   * Serialize column family to data block encoding map to configuration.<a name="line.756"></a>
+<span class="sourceLineNo">757</span>   * Invoked while configuring the MR job for incremental load.<a name="line.757"></a>
+<span class="sourceLineNo">758</span>   *<a name="line.758"></a>
+<span class="sourceLineNo">759</span>   * @param tableDescriptor to read the properties from<a name="line.759"></a>
+<span class="sourceLineNo">760</span>   * @param conf to persist serialized values into<a name="line.760"></a>
+<span class="sourceLineNo">761</span>   * @throws IOException<a name="line.761"></a>
+<span class="sourceLineNo">762</span>   *           on failure to read column family descriptors<a name="line.762"></a>
+<span class="sourceLineNo">763</span>   */<a name="line.763"></a>
+<span class="sourceLineNo">764</span>  @VisibleForTesting<a name="line.764"></a>
+<span class="sourceLineNo">765</span>  static void configureDataBlockEncoding(HTableDescriptor tableDescriptor,<a name="line.765"></a>
+<span class="sourceLineNo">766</span>      Configuration conf) throws UnsupportedEncodingException {<a name="line.766"></a>
+<span class="sourceLineNo">767</span>    if (tableDescriptor == null) {<a name="line.767"></a>
+<span class="sourceLineNo">768</span>      // could happen with mock table instance<a name="line.768"></a>
+<span class="sourceLineNo">769</span>      return;<a name="line.769"></a>
+<span class="sourceLineNo">770</span>    }<a name="line.770"></a>
+<span class="sourceLineNo">771</span>    StringBuilder dataBlockEncodingConfigValue = new StringBuilder();<a name="line.771"></a>
+<span class="sourceLineNo">772</span>    Collection&lt;HColumnDescriptor&gt; families = tableDescriptor.getFamilies();<a name="line.772"></a>
+<span class="sourceLineNo">773</span>    int i = 0;<a name="line.773"></a>
+<span class="sourceLineNo">774</span>    for (HColumnDescriptor familyDescriptor : families) {<a name="line.774"></a>
+<span class="sourceLineNo">775</span>      if (i++ &gt; 0) {<a name="line.775"></a>
+<span class="sourceLineNo">776</span>        dataBlockEncodingConfigValue.append('&amp;');<a name="line.776"></a>
+<span class="sourceLineNo">777</span>      }<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      dataBlockEncodingConfigValue.append(<a name="line.778"></a>
+<span class="sourceLineNo">779</span>          URLEncoder.encode(familyDescriptor.getNameAsString(), "UTF-8"));<a name="line.779"></a>
+<span class="sourceLineNo">780</span>      dataBlockEncodingConfigValue.append('=');<a name="line.780"></a>
+<span class="sourceLineNo">781</span>      DataBlockEncoding encoding = familyDescriptor.getDataBlockEncoding();<a name="line.781"></a>
+<span class="sourceLineNo">782</span>      if (encoding == null) {<a name="line.782"></a>
+<span class="sourceLineNo">783</span>        encoding = DataBlockEncoding.NONE;<a name="line.783"></a>
+<span class="sourceLineNo">784</span>      }<a name="line.784"></a>
+<span class="sourceLineNo">785</span>      dataBlockEncodingConfigValue.append(URLEncoder.encode(encoding.toString(),<a name="line.785"></a>
+<span class="sourceLineNo">786</span>          "UTF-8"));<a name="line.786"></a>
+<span class="sourceLineNo">787</span>    }<a name="line.787"></a>
+<span class="sourceLineNo">788</span>    conf.set(DATABLOCK_ENCODING_FAMILIES_CONF_KEY,<a name="line.788"></a>
+<span class="sourceLineNo">789</span>        dataBlockEncodingConfigValue.toString());<a name="line.789"></a>
+<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
+<span class="sourceLineNo">791</span>}<a name="line.791"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6a13df3e/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
index 0129065..f72db18 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
@@ -222,227 +222,228 @@
 <span class="sourceLineNo">214</span>  int scan() throws IOException {<a name="line.214"></a>
 <span class="sourceLineNo">215</span>    try {<a name="line.215"></a>
 <span class="sourceLineNo">216</span>      if (!alreadyRunning.compareAndSet(false, true)) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>        return 0;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      Triple&lt;Integer, Map&lt;HRegionInfo, Result&gt;, Map&lt;HRegionInfo, Result&gt;&gt; scanTriple =<a name="line.219"></a>
-<span class="sourceLineNo">220</span>        getMergedRegionsAndSplitParents();<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      int count = scanTriple.getFirst();<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      /**<a name="line.222"></a>
-<span class="sourceLineNo">223</span>       * clean merge regions first<a name="line.223"></a>
-<span class="sourceLineNo">224</span>       */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      int mergeCleaned = 0;<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      Map&lt;HRegionInfo, Result&gt; mergedRegions = scanTriple.getSecond();<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      for (Map.Entry&lt;HRegionInfo, Result&gt; e : mergedRegions.entrySet()) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        PairOfSameType&lt;HRegionInfo&gt; p = MetaTableAccessor.getMergeRegions(e.getValue());<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        HRegionInfo regionA = p.getFirst();<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        HRegionInfo regionB = p.getSecond();<a name="line.230"></a>
-<span class="sourceLineNo">231</span>        if (regionA == null || regionB == null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>          LOG.warn("Unexpected references regionA="<a name="line.232"></a>
-<span class="sourceLineNo">233</span>              + (regionA == null ? "null" : regionA.getRegionNameAsString())<a name="line.233"></a>
-<span class="sourceLineNo">234</span>              + ",regionB="<a name="line.234"></a>
-<span class="sourceLineNo">235</span>              + (regionB == null ? "null" : regionB.getRegionNameAsString())<a name="line.235"></a>
-<span class="sourceLineNo">236</span>              + " in merged region " + e.getKey().getRegionNameAsString());<a name="line.236"></a>
-<span class="sourceLineNo">237</span>        } else {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>          if (cleanMergeRegion(e.getKey(), regionA, regionB)) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>            mergeCleaned++;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      }<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      /**<a name="line.243"></a>
-<span class="sourceLineNo">244</span>       * clean split parents<a name="line.244"></a>
-<span class="sourceLineNo">245</span>       */<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      Map&lt;HRegionInfo, Result&gt; splitParents = scanTriple.getThird();<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>      // Now work on our list of found parents. See if any we can clean up.<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      int splitCleaned = 0;<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      // regions whose parents are still around<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      HashSet&lt;String&gt; parentNotCleaned = new HashSet&lt;String&gt;();<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      for (Map.Entry&lt;HRegionInfo, Result&gt; e : splitParents.entrySet()) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        if (!parentNotCleaned.contains(e.getKey().getEncodedName()) &amp;&amp;<a name="line.253"></a>
-<span class="sourceLineNo">254</span>            cleanParent(e.getKey(), e.getValue())) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>          splitCleaned++;<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        } else {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>          // We could not clean the parent, so it's daughters should not be<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          // cleaned either (HBASE-6160)<a name="line.258"></a>
-<span class="sourceLineNo">259</span>          PairOfSameType&lt;HRegionInfo&gt; daughters =<a name="line.259"></a>
-<span class="sourceLineNo">260</span>              MetaTableAccessor.getDaughterRegions(e.getValue());<a name="line.260"></a>
-<span class="sourceLineNo">261</span>          parentNotCleaned.add(daughters.getFirst().getEncodedName());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>          parentNotCleaned.add(daughters.getSecond().getEncodedName());<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        }<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      if ((mergeCleaned + splitCleaned) != 0) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>        LOG.info("Scanned " + count + " catalog row(s), gc'd " + mergeCleaned<a name="line.266"></a>
-<span class="sourceLineNo">267</span>            + " unreferenced merged region(s) and " + splitCleaned<a name="line.267"></a>
-<span class="sourceLineNo">268</span>            + " unreferenced parent region(s)");<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      } else if (LOG.isTraceEnabled()) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>        LOG.trace("Scanned " + count + " catalog row(s), gc'd " + mergeCleaned<a name="line.270"></a>
-<span class="sourceLineNo">271</span>            + " unreferenced merged region(s) and " + splitCleaned<a name="line.271"></a>
-<span class="sourceLineNo">272</span>            + " unreferenced parent region(s)");<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      }<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      return mergeCleaned + splitCleaned;<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    } finally {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      alreadyRunning.set(false);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span>  }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>  /**<a name="line.280"></a>
-<span class="sourceLineNo">281</span>   * Compare HRegionInfos in a way that has split parents sort BEFORE their<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * daughters.<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
-<span class="sourceLineNo">284</span>  static class SplitParentFirstComparator implements Comparator&lt;HRegionInfo&gt; {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    Comparator&lt;byte[]&gt; rowEndKeyComparator = new Bytes.RowEndKeyComparator();<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    @Override<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    public int compare(HRegionInfo left, HRegionInfo right) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      // This comparator differs from the one HRegionInfo in that it sorts<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      // parent before daughters.<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      if (left == null) return -1;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      if (right == null) return 1;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      // Same table name.<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      int result = left.getTable().compareTo(right.getTable());<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      if (result != 0) return result;<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      // Compare start keys.<a name="line.295"></a>
-<span class="sourceLineNo">296</span>      result = Bytes.compareTo(left.getStartKey(), right.getStartKey());<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      if (result != 0) return result;<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      // Compare end keys, but flip the operands so parent comes first<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      result = rowEndKeyComparator.compare(right.getEndKey(), left.getEndKey());<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>      return result;<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    }<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span>  /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span>   * If daughters no longer hold reference to the parents, delete the parent.<a name="line.306"></a>
-<span class="sourceLineNo">307</span>   * @param parent HRegionInfo of split offlined parent<a name="line.307"></a>
-<span class="sourceLineNo">308</span>   * @param rowContent Content of &lt;code&gt;parent&lt;/code&gt; row in<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   * &lt;code&gt;metaRegionName&lt;/code&gt;<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   * @return True if we removed &lt;code&gt;parent&lt;/code&gt; from meta table and from<a name="line.310"></a>
-<span class="sourceLineNo">311</span>   * the filesystem.<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   * @throws IOException<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   */<a name="line.313"></a>
-<span class="sourceLineNo">314</span>  boolean cleanParent(final HRegionInfo parent, Result rowContent)<a name="line.314"></a>
-<span class="sourceLineNo">315</span>  throws IOException {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    boolean result = false;<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    // Check whether it is a merged region and not clean reference<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    // No necessary to check MERGEB_QUALIFIER because these two qualifiers will<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    // be inserted/deleted together<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    if (rowContent.getValue(HConstants.CATALOG_FAMILY,<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        HConstants.MERGEA_QUALIFIER) != null) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // wait cleaning merge region first<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      return result;<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    // Run checks on each daughter split.<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(rowContent);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    Pair&lt;Boolean, Boolean&gt; a = checkDaughterInFs(parent, daughters.getFirst());<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    Pair&lt;Boolean, Boolean&gt; b = checkDaughterInFs(parent, daughters.getSecond());<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    if (hasNoReferences(a) &amp;&amp; hasNoReferences(b)) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      LOG.debug("Deleting region " + parent.getRegionNameAsString() +<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        " because daughter splits no longer hold references");<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      FileSystem fs = this.services.getMasterFileSystem().getFileSystem();<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      if (LOG.isTraceEnabled()) LOG.trace("Archiving parent region: " + parent);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      HFileArchiver.archiveRegion(this.services.getConfiguration(), fs, parent);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      MetaTableAccessor.deleteRegion(this.connection, parent);<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      result = true;<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    }<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    return result;<a name="line.338"></a>
-<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>  /**<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   * @param p A pair where the first boolean says whether or not the daughter<a name="line.342"></a>
-<span class="sourceLineNo">343</span>   * region directory exists in the filesystem and then the second boolean says<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   * whether the daughter has references to the parent.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * @return True the passed &lt;code&gt;p&lt;/code&gt; signifies no references.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   */<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  private boolean hasNoReferences(final Pair&lt;Boolean, Boolean&gt; p) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    return !p.getFirst() || !p.getSecond();<a name="line.348"></a>
-<span class="sourceLineNo">349</span>  }<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>  /**<a name="line.351"></a>
-<span class="sourceLineNo">352</span>   * Checks if a daughter region -- either splitA or splitB -- still holds<a name="line.352"></a>
-<span class="sourceLineNo">353</span>   * references to parent.<a name="line.353"></a>
-<span class="sourceLineNo">354</span>   * @param parent Parent region<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * @param daughter Daughter region<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * @return A pair where the first boolean says whether or not the daughter<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * region directory exists in the filesystem and then the second boolean says<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   * whether the daughter has references to the parent.<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * @throws IOException<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   */<a name="line.360"></a>
-<span class="sourceLineNo">361</span>  Pair&lt;Boolean, Boolean&gt; checkDaughterInFs(final HRegionInfo parent, final HRegionInfo daughter)<a name="line.361"></a>
-<span class="sourceLineNo">362</span>  throws IOException {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    if (daughter == null)  {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      return new Pair&lt;Boolean, Boolean&gt;(Boolean.FALSE, Boolean.FALSE);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    }<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span>    FileSystem fs = this.services.getMasterFileSystem().getFileSystem();<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    Path rootdir = this.services.getMasterFileSystem().getRootDir();<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    Path tabledir = FSUtils.getTableDir(rootdir, daughter.getTable());<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>    Path daughterRegionDir = new Path(tabledir, daughter.getEncodedName());<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>    HRegionFileSystem regionFs = null;<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>    try {<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      if (!FSUtils.isExists(fs, daughterRegionDir)) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        return new Pair&lt;Boolean, Boolean&gt;(Boolean.FALSE, Boolean.FALSE);<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      }<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    } catch (IOException ioe) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      LOG.warn("Error trying to determine if daughter region exists, " +<a name="line.380"></a>
-<span class="sourceLineNo">381</span>               "assuming exists and has references", ioe);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      return new Pair&lt;Boolean, Boolean&gt;(Boolean.TRUE, Boolean.TRUE);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    }<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span>    try {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      regionFs = HRegionFileSystem.openRegionFromFileSystem(<a name="line.386"></a>
-<span class="sourceLineNo">387</span>          this.services.getConfiguration(), fs, tabledir, daughter, true);<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    } catch (IOException e) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>      LOG.warn("Error trying to determine referenced files from : " + daughter.getEncodedName()<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          + ", to: " + parent.getEncodedName() + " assuming has references", e);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      return new Pair&lt;Boolean, Boolean&gt;(Boolean.TRUE, Boolean.TRUE);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>    boolean references = false;<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    HTableDescriptor parentDescriptor = getTableDescriptor(parent.getTable());<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    for (HColumnDescriptor family: parentDescriptor.getFamilies()) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      if ((references = regionFs.hasReferences(family.getNameAsString()))) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        break;<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      }<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    return new Pair&lt;Boolean, Boolean&gt;(Boolean.TRUE, Boolean.valueOf(references));<a name="line.401"></a>
-<span class="sourceLineNo">402</span>  }<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span>  private HTableDescriptor getTableDescriptor(final TableName tableName)<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      throws FileNotFoundException, IOException {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    return this.services.getTableDescriptors().get(tableName);<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>  /**<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   * Checks if the specified region has merge qualifiers, if so, try to clean<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   * them<a name="line.411"></a>
-<span class="sourceLineNo">412</span>   * @param region<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   * @return true if the specified region doesn't have merge qualifier now<a name="line.413"></a>
-<span class="sourceLineNo">414</span>   * @throws IOException<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   */<a name="line.415"></a>
-<span class="sourceLineNo">416</span>  public boolean cleanMergeQualifier(final HRegionInfo region)<a name="line.416"></a>
-<span class="sourceLineNo">417</span>      throws IOException {<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    // Get merge regions if it is a merged region and already has merge<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    // qualifier<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    Pair&lt;HRegionInfo, HRegionInfo&gt; mergeRegions = MetaTableAccessor<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        .getRegionsFromMergeQualifier(this.services.getConnection(),<a name="line.421"></a>
-<span class="sourceLineNo">422</span>          region.getRegionName());<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    if (mergeRegions == null<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        || (mergeRegions.getFirst() == null &amp;&amp; mergeRegions.getSecond() == null)) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      // It doesn't have merge qualifier, no need to clean<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      return true;<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    // It shouldn't happen, we must insert/delete these two qualifiers together<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    if (mergeRegions.getFirst() == null || mergeRegions.getSecond() == null) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      LOG.error("Merged region " + region.getRegionNameAsString()<a name="line.430"></a>
-<span class="sourceLineNo">431</span>          + " has only one merge qualifier in META.");<a name="line.431"></a>
-<span class="sourceLineNo">432</span>      return false;<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    return cleanMergeRegion(region, mergeRegions.getFirst(),<a name="line.434"></a>
-<span class="sourceLineNo">435</span>        mergeRegions.getSecond());<a name="line.435"></a>
-<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
-<span class="sourceLineNo">437</span>}<a name="line.437"></a>
+<span class="sourceLineNo">217</span>        LOG.debug("CatalogJanitor already running");<a name="line.217"></a>
+<span class="sourceLineNo">218</span>        return 0;<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      Triple&lt;Integer, Map&lt;HRegionInfo, Result&gt;, Map&lt;HRegionInfo, Result&gt;&gt; scanTriple =<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        getMergedRegionsAndSplitParents();<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      int count = scanTriple.getFirst();<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      /**<a name="line.223"></a>
+<span class="sourceLineNo">224</span>       * clean merge regions first<a name="line.224"></a>
+<span class="sourceLineNo">225</span>       */<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      int mergeCleaned = 0;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      Map&lt;HRegionInfo, Result&gt; mergedRegions = scanTriple.getSecond();<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      for (Map.Entry&lt;HRegionInfo, Result&gt; e : mergedRegions.entrySet()) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        PairOfSameType&lt;HRegionInfo&gt; p = MetaTableAccessor.getMergeRegions(e.getValue());<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        HRegionInfo regionA = p.getFirst();<a name="line.230"></a>
+<span class="sourceLineNo">231</span>        HRegionInfo regionB = p.getSecond();<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        if (regionA == null || regionB == null) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>          LOG.warn("Unexpected references regionA="<a name="line.233"></a>
+<span class="sourceLineNo">234</span>              + (regionA == null ? "null" : regionA.getRegionNameAsString())<a name="line.234"></a>
+<span class="sourceLineNo">235</span>              + ",regionB="<a name="line.235"></a>
+<span class="sourceLineNo">236</span>              + (regionB == null ? "null" : regionB.getRegionNameAsString())<a name="line.236"></a>
+<span class="sourceLineNo">237</span>              + " in merged region " + e.getKey().getRegionNameAsString());<a name="line.237"></a>
+<span class="sourceLineNo">238</span>        } else {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>          if (cleanMergeRegion(e.getKey(), regionA, regionB)) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>            mergeCleaned++;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      /**<a name="line.244"></a>
+<span class="sourceLineNo">245</span>       * clean split parents<a name="line.245"></a>
+<span class="sourceLineNo">246</span>       */<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      Map&lt;HRegionInfo, Result&gt; splitParents = scanTriple.getThird();<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>      // Now work on our list of found parents. See if any we can clean up.<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      int splitCleaned = 0;<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      // regions whose parents are still around<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      HashSet&lt;String&gt; parentNotCleaned = new HashSet&lt;String&gt;();<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      for (Map.Entry&lt;HRegionInfo, Result&gt; e : splitParents.entrySet()) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>        if (!parentNotCleaned.contains(e.getKey().getEncodedName()) &amp;&amp;<a name="line.254"></a>
+<span class="sourceLineNo">255</span>            cleanParent(e.getKey(), e.getValue())) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          splitCleaned++;<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        } else {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>          // We could not clean the parent, so it's daughters should not be<a name="line.258"></a>
+<span class="sourceLineNo">259</span>          // cleaned either (HBASE-6160)<a name="line.259"></a>
+<span class="sourceLineNo">260</span>          PairOfSameType&lt;HRegionInfo&gt; daughters =<a name="line.260"></a>
+<span class="sourceLineNo">261</span>              MetaTableAccessor.getDaughterRegions(e.getValue());<a name="line.261"></a>
+<span class="sourceLineNo">262</span>          parentNotCleaned.add(daughters.getFirst().getEncodedName());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>          parentNotCleaned.add(daughters.getSecond().getEncodedName());<a name="line.263"></a>
+<span class="sourceLineNo">264</span>        }<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      if ((mergeCleaned + splitCleaned) != 0) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>        LOG.info("Scanned " + count + " catalog row(s), gc'd " + mergeCleaned<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            + " unreferenced merged region(s) and " + splitCleaned<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            + " unreferenced parent region(s)");<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      } else if (LOG.isTraceEnabled()) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>        LOG.trace("Scanned " + count + " catalog row(s), gc'd " + mergeCleaned<a name="line.271"></a>
+<span class="sourceLineNo">272</span>            + " unreferenced merged region(s) and " + splitCleaned<a name="line.272"></a>
+<span class="sourceLineNo">273</span>            + " unreferenced parent region(s)");<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      }<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      return mergeCleaned + splitCleaned;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    } finally {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      alreadyRunning.set(false);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>  /**<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * Compare HRegionInfos in a way that has split parents sort BEFORE their<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   * daughters.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>   */<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  static class SplitParentFirstComparator implements Comparator&lt;HRegionInfo&gt; {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    Comparator&lt;byte[]&gt; rowEndKeyComparator = new Bytes.RowEndKeyComparator();<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    @Override<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    public int compare(HRegionInfo left, HRegionInfo right) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      // This comparator differs from the one HRegionInfo in that it sorts<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      // parent before daughters.<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      if (left == null) return -1;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      if (right == null) return 1;<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      // Same table name.<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      int result = left.getTable().compareTo(right.getTable());<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      if (result != 0) return result;<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      // Compare start keys.<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      result = Bytes.compareTo(left.getStartKey(), right.getStartKey());<a name="line.297"></a>
+<span class="sourceLineNo">298</span>      if (result != 0) return result;<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      // Compare end keys, but flip the operands so parent comes first<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      result = rowEndKeyComparator.compare(right.getEndKey(), left.getEndKey());<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>      return result;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
+<span class="sourceLineNo">304</span>  }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>  /**<a name="line.306"></a>
+<span class="sourceLineNo">307</span>   * If daughters no longer hold reference to the parents, delete the parent.<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   * @param parent HRegionInfo of split offlined parent<a name="line.308"></a>
+<span class="sourceLineNo">309</span>   * @param rowContent Content of &lt;code&gt;parent&lt;/code&gt; row in<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   * &lt;code&gt;metaRegionName&lt;/code&gt;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   * @return True if we removed &lt;code&gt;parent&lt;/code&gt; from meta table and from<a name="line.311"></a>
+<span class="sourceLineNo">312</span>   * the filesystem.<a name="line.312"></a>
+<span class="sourceLineNo">313</span>   * @throws IOException<a name="line.313"></a>
+<span class="sourceLineNo">314</span>   */<a name="line.314"></a>
+<span class="sourceLineNo">315</span>  boolean cleanParent(final HRegionInfo parent, Result rowContent)<a name="line.315"></a>
+<span class="sourceLineNo">316</span>  throws IOException {<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    boolean result = false;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    // Check whether it is a merged region and not clean reference<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    // No necessary to check MERGEB_QUALIFIER because these two qualifiers will<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    // be inserted/deleted together<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    if (rowContent.getValue(HConstants.CATALOG_FAMILY,<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        HConstants.MERGEA_QUALIFIER) != null) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      // wait cleaning merge region first<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      return result;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    // Run checks on each daughter split.<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    PairOfSameType&lt;HRegionInfo&gt; daughters = MetaTableAccessor.getDaughterRegions(rowContent);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    Pair&lt;Boolean, Boolean&gt; a = checkDaughterInFs(parent, daughters.getFirst());<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    Pair&lt;Boolean, Boolean&gt; b = checkDaughterInFs(parent, daughters.getSecond());<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    if (hasNoReferences(a) &amp;&amp; hasNoReferences(b)) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      LOG.debug("Deleting region " + parent.getRegionNameAsString() +<a name="line.331"></a>
+<span class="sourceLineNo">332</span>        " because daughter splits no longer hold references");<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      FileSystem fs = this.services.getMasterFileSystem().getFileSystem();<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      if (LOG.isTraceEnabled()) LOG.trace("Archiving parent region: " + parent);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      HFileArchiver.archiveRegion(this.services.getConfiguration(), fs, parent);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      MetaTableAccessor.deleteRegion(this.connection, parent);<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      result = true;<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    return result;<a name="line.339"></a>
+<span class="sourceLineNo">340</span>  }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>  /**<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   * @param p A pair where the first boolean says whether or not the daughter<a name="line.343"></a>
+<span class="sourceLineNo">344</span>   * region directory exists in the filesystem and then the second boolean says<a name="line.344"></a>
+<span class="sourceLineNo">345</span>   * whether the daughter has references to the parent.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>   * @return True the passed &lt;code&gt;p&lt;/code&gt; signifies no references.<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   */<a name="line.347"></a>
+<span class="sourceLineNo">348</span>  private boolean hasNoReferences(final Pair&lt;Boolean, Boolean&gt; p) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    return !p.getFirst() || !p.getSecond();<a name="line.349"></a>
+<span class="sourceLineNo">350</span>  }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>  /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span>   * Checks if a daughter region -- either splitA or splitB -- still holds<a name="line.353"></a>
+<span class="sourceLineNo">354</span>   * references to parent.<a name="line.354"></a>
+<span class="sourceLineNo">355</span>   * @param parent Parent region<a name="line.355"></a>
+<span class="sourceLineNo">356</span>   * @param daughter Daughter region<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   * @return A pair where the first boolean says whether or not the daughter<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   * region directory exists in the filesystem and then the second boolean says<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * whether the daughter has references to the parent.<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * @throws IOException<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   */<a name="line.361"></a>
+<span class="sourceLineNo">362</span>  Pair&lt;Boolean, Boolean&gt; checkDaughterInFs(final HRegionInfo parent, final HRegionInfo daughter)<a name="line.362"></a>
+<span class="sourceLineNo">363</span>  throws IOException {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    if (daughter == null)  {<a name="line.364"></a>
+<span class="sourceLineNo">365</span>      return new Pair&lt;Boolean, Boolean&gt;(Boolean.FALSE, Boolean.FALSE);<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>    FileSystem fs = this.services.getMasterFileSystem().getFileSystem();<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    Path rootdir = this.services.getMasterFileSystem().getRootDir();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    Path tabledir = FSUtils.getTableDir(rootdir, daughter.getTable());<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>    Path daughterRegionDir = new Path(tabledir, daughter.getEncodedName());<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span>    HRegionFileSystem regionFs = null;<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span>    try {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      if (!FSUtils.isExists(fs, daughterRegionDir)) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>        return new Pair&lt;Boolean, Boolean&gt;(Boolean.FALSE, Boolean.FALSE);<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      }<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    } catch (IOException ioe) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      LOG.warn("Error trying to determine if daughter region exists, " +<a name="line.381"></a>
+<span class="sourceLineNo">382</span>               "assuming exists and has references", ioe);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      return new Pair&lt;Boolean, Boolean&gt;(Boolean.TRUE, Boolean.TRUE);<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>    try {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      regionFs = HRegionFileSystem.openRegionFromFileSystem(<a name="line.387"></a>
+<span class="sourceLineNo">388</span>          this.services.getConfiguration(), fs, tabledir, daughter, true);<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    } catch (IOException e) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      LOG.warn("Error trying to determine referenced files from : " + daughter.getEncodedName()<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          + ", to: " + parent.getEncodedName() + " assuming has references", e);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>      return new Pair&lt;Boolean, Boolean&gt;(Boolean.TRUE, Boolean.TRUE);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>    boolean references = false;<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    HTableDescriptor parentDescriptor = getTableDescriptor(parent.getTable());<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    for (HColumnDescriptor family: parentDescriptor.getFamilies()) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      if ((references = regionFs.hasReferences(family.getNameAsString()))) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        break;<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      }<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    return new Pair&lt;Boolean, Boolean&gt;(Boolean.TRUE, Boolean.valueOf(references));<a name="line.402"></a>
+<span class="sourceLineNo">403</span>  }<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>  private HTableDescriptor getTableDescriptor(final TableName tableName)<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      throws FileNotFoundException, IOException {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    return this.services.getTableDescriptors().get(tableName);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>  }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>  /**<a name="line.410"></a>
+<span class="sourceLineNo">411</span>   * Checks if the specified region has merge qualifiers, if so, try to clean<a name="line.411"></a>
+<span class="sourceLineNo">412</span>   * them<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   * @param region<a name="line.413"></a>
+<span class="sourceLineNo">414</span>   * @return true if the specified region doesn't have merge qualifier now<a name="line.414"></a>
+<span class="sourceLineNo">415</span>   * @throws IOException<a name="line.415"></a>
+<span class="sourceLineNo">416</span>   */<a name="line.416"></a>
+<span class="sourceLineNo">417</span>  public boolean cleanMergeQualifier(final HRegionInfo region)<a name="line.417"></a>
+<span class="sourceLineNo">418</span>      throws IOException {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    // Get merge regions if it is a merged region and already has merge<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    // qualifier<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    Pair&lt;HRegionInfo, HRegionInfo&gt; mergeRegions = MetaTableAccessor<a name="line.421"></a>
+<span class="sourceLineNo">422</span>        .getRegionsFromMergeQualifier(this.services.getConnection(),<a name="line.422"></a>
+<span class="sourceLineNo">423</span>          region.getRegionName());<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    if (mergeRegions == null<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        || (mergeRegions.getFirst() == null &amp;&amp; mergeRegions.getSecond() == null)) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      // It doesn't have merge qualifier, no need to clean<a name="line.426"></a>
+<span class="sourceLineNo">427</span>      return true;<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    }<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    // It shouldn't happen, we must insert/delete these two qualifiers together<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    if (mergeRegions.getFirst() == null || mergeRegions.getSecond() == null) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      LOG.error("Merged region " + region.getRegionNameAsString()<a name="line.431"></a>
+<span class="sourceLineNo">432</span>          + " has only one merge qualifier in META.");<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      return false;<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    }<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    return cleanMergeRegion(region, mergeRegions.getFirst(),<a name="line.435"></a>
+<span class="sourceLineNo">436</span>        mergeRegions.getSecond());<a name="line.436"></a>
+<span class="sourceLineNo">437</span>  }<a name="line.437"></a>
+<span class="sourceLineNo">438</span>}<a name="line.438"></a>