You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/01/02 15:18:19 UTC
[04/17] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/25f2bbc0/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupSystemTable.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupSystemTable.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupSystemTable.html
index 27b1e55..8f0a222 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupSystemTable.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestBackupSystemTable.html
@@ -40,391 +40,391 @@
<span class="sourceLineNo">032</span>import java.util.HashSet;<a name="line.32"></a>
<span class="sourceLineNo">033</span>import java.util.Iterator;<a name="line.33"></a>
<span class="sourceLineNo">034</span>import java.util.List;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import java.util.Set;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import java.util.TreeSet;<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.TableName;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.backup.BackupInfo.BackupState;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.After;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.AfterClass;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.Before;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.BeforeClass;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.Test;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.experimental.categories.Category;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>/**<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * Test cases for backup system table API<a name="line.56"></a>
-<span class="sourceLineNo">057</span> */<a name="line.57"></a>
-<span class="sourceLineNo">058</span>@Category(MediumTests.class)<a name="line.58"></a>
-<span class="sourceLineNo">059</span>public class TestBackupSystemTable {<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.61"></a>
-<span class="sourceLineNo">062</span> protected static Configuration conf = UTIL.getConfiguration();<a name="line.62"></a>
-<span class="sourceLineNo">063</span> protected static MiniHBaseCluster cluster;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> protected static Connection conn;<a name="line.64"></a>
-<span class="sourceLineNo">065</span> protected BackupSystemTable table;<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> @BeforeClass<a name="line.67"></a>
-<span class="sourceLineNo">068</span> public static void setUp() throws Exception {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> conf.setBoolean(BackupRestoreConstants.BACKUP_ENABLE_KEY, true);<a name="line.69"></a>
-<span class="sourceLineNo">070</span> BackupManager.decorateMasterConfiguration(conf);<a name="line.70"></a>
-<span class="sourceLineNo">071</span> BackupManager.decorateRegionServerConfiguration(conf);<a name="line.71"></a>
-<span class="sourceLineNo">072</span> cluster = UTIL.startMiniCluster();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> conn = UTIL.getConnection();<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> @Before<a name="line.76"></a>
-<span class="sourceLineNo">077</span> public void before() throws IOException {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> table = new BackupSystemTable(conn);<a name="line.78"></a>
-<span class="sourceLineNo">079</span> }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> @After<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public void after() {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> if (table != null) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> table.close();<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> @Test<a name="line.89"></a>
-<span class="sourceLineNo">090</span> public void testUpdateReadDeleteBackupStatus() throws IOException {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> BackupInfo ctx = createBackupInfo();<a name="line.91"></a>
-<span class="sourceLineNo">092</span> table.updateBackupInfo(ctx);<a name="line.92"></a>
-<span class="sourceLineNo">093</span> BackupInfo readCtx = table.readBackupInfo(ctx.getBackupId());<a name="line.93"></a>
-<span class="sourceLineNo">094</span> assertTrue(compare(ctx, readCtx));<a name="line.94"></a>
-<span class="sourceLineNo">095</span> // try fake backup id<a name="line.95"></a>
-<span class="sourceLineNo">096</span> readCtx = table.readBackupInfo("fake");<a name="line.96"></a>
-<span class="sourceLineNo">097</span> assertNull(readCtx);<a name="line.97"></a>
-<span class="sourceLineNo">098</span> // delete backup info<a name="line.98"></a>
-<span class="sourceLineNo">099</span> table.deleteBackupInfo(ctx.getBackupId());<a name="line.99"></a>
-<span class="sourceLineNo">100</span> readCtx = table.readBackupInfo(ctx.getBackupId());<a name="line.100"></a>
-<span class="sourceLineNo">101</span> assertNull(readCtx);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> cleanBackupTable();<a name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> @Test<a name="line.105"></a>
-<span class="sourceLineNo">106</span> public void testWriteReadBackupStartCode() throws IOException {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> Long code = 100L;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> table.writeBackupStartCode(code, "root");<a name="line.108"></a>
-<span class="sourceLineNo">109</span> String readCode = table.readBackupStartCode("root");<a name="line.109"></a>
-<span class="sourceLineNo">110</span> assertEquals(code, new Long(Long.parseLong(readCode)));<a name="line.110"></a>
-<span class="sourceLineNo">111</span> cleanBackupTable();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> private void cleanBackupTable() throws IOException {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> admin.disableTable(BackupSystemTable.getTableName(conf));<a name="line.116"></a>
-<span class="sourceLineNo">117</span> admin.truncateTable(BackupSystemTable.getTableName(conf), true);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> if (admin.isTableDisabled(BackupSystemTable.getTableName(conf))) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> admin.enableTable(BackupSystemTable.getTableName(conf));<a name="line.119"></a>
-<span class="sourceLineNo">120</span> }<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> @Test<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void testBackupHistory() throws IOException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> int n = 10;<a name="line.125"></a>
-<span class="sourceLineNo">126</span> List<BackupInfo> list = createBackupInfoList(n);<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> // Load data<a name="line.128"></a>
-<span class="sourceLineNo">129</span> for (BackupInfo bc : list) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> // Make sure we set right status<a name="line.130"></a>
-<span class="sourceLineNo">131</span> bc.setState(BackupState.COMPLETE);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> table.updateBackupInfo(bc);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> // Reverse list for comparison<a name="line.135"></a>
-<span class="sourceLineNo">136</span> Collections.reverse(list);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> List<BackupInfo> history = table.getBackupHistory();<a name="line.137"></a>
-<span class="sourceLineNo">138</span> assertTrue(history.size() == n);<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> for (int i = 0; i < n; i++) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> BackupInfo ctx = list.get(i);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> BackupInfo data = history.get(i);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> assertTrue(compare(ctx, data));<a name="line.143"></a>
-<span class="sourceLineNo">144</span> }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> cleanBackupTable();<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> @Test<a name="line.150"></a>
-<span class="sourceLineNo">151</span> public void testBackupDelete() throws IOException {<a name="line.151"></a>
+<span class="sourceLineNo">035</span>import java.util.Map;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import java.util.Set;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import java.util.TreeSet;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.conf.Configuration;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.fs.FileStatus;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.fs.Path;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.TableName;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.backup.BackupInfo.BackupState;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.After;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.AfterClass;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.Before;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.BeforeClass;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.Test;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.experimental.categories.Category;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>/**<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * Test cases for backup system table API<a name="line.59"></a>
+<span class="sourceLineNo">060</span> */<a name="line.60"></a>
+<span class="sourceLineNo">061</span>@Category(MediumTests.class)<a name="line.61"></a>
+<span class="sourceLineNo">062</span>public class TestBackupSystemTable {<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> protected static Configuration conf = UTIL.getConfiguration();<a name="line.65"></a>
+<span class="sourceLineNo">066</span> protected static MiniHBaseCluster cluster;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> protected static Connection conn;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> protected BackupSystemTable table;<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> @BeforeClass<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public static void setUp() throws Exception {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> conf.setBoolean(BackupRestoreConstants.BACKUP_ENABLE_KEY, true);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> BackupManager.decorateMasterConfiguration(conf);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> BackupManager.decorateRegionServerConfiguration(conf);<a name="line.74"></a>
+<span class="sourceLineNo">075</span> cluster = UTIL.startMiniCluster();<a name="line.75"></a>
+<span class="sourceLineNo">076</span> conn = UTIL.getConnection();<a name="line.76"></a>
+<span class="sourceLineNo">077</span> }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> @Before<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public void before() throws IOException {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> table = new BackupSystemTable(conn);<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> @After<a name="line.84"></a>
+<span class="sourceLineNo">085</span> public void after() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (table != null) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> table.close();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> @Test<a name="line.92"></a>
+<span class="sourceLineNo">093</span> public void testUpdateReadDeleteBackupStatus() throws IOException {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> BackupInfo ctx = createBackupInfo();<a name="line.94"></a>
+<span class="sourceLineNo">095</span> table.updateBackupInfo(ctx);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> BackupInfo readCtx = table.readBackupInfo(ctx.getBackupId());<a name="line.96"></a>
+<span class="sourceLineNo">097</span> assertTrue(compare(ctx, readCtx));<a name="line.97"></a>
+<span class="sourceLineNo">098</span> // try fake backup id<a name="line.98"></a>
+<span class="sourceLineNo">099</span> readCtx = table.readBackupInfo("fake");<a name="line.99"></a>
+<span class="sourceLineNo">100</span> assertNull(readCtx);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> // delete backup info<a name="line.101"></a>
+<span class="sourceLineNo">102</span> table.deleteBackupInfo(ctx.getBackupId());<a name="line.102"></a>
+<span class="sourceLineNo">103</span> readCtx = table.readBackupInfo(ctx.getBackupId());<a name="line.103"></a>
+<span class="sourceLineNo">104</span> assertNull(readCtx);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> cleanBackupTable();<a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span> @Test<a name="line.108"></a>
+<span class="sourceLineNo">109</span> public void testWriteReadBackupStartCode() throws IOException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> Long code = 100L;<a name="line.110"></a>
+<span class="sourceLineNo">111</span> table.writeBackupStartCode(code, "root");<a name="line.111"></a>
+<span class="sourceLineNo">112</span> String readCode = table.readBackupStartCode("root");<a name="line.112"></a>
+<span class="sourceLineNo">113</span> assertEquals(code, new Long(Long.parseLong(readCode)));<a name="line.113"></a>
+<span class="sourceLineNo">114</span> cleanBackupTable();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span> private void cleanBackupTable() throws IOException {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.118"></a>
+<span class="sourceLineNo">119</span> admin.disableTable(BackupSystemTable.getTableName(conf));<a name="line.119"></a>
+<span class="sourceLineNo">120</span> admin.truncateTable(BackupSystemTable.getTableName(conf), true);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> if (admin.isTableDisabled(BackupSystemTable.getTableName(conf))) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> admin.enableTable(BackupSystemTable.getTableName(conf));<a name="line.122"></a>
+<span class="sourceLineNo">123</span> }<a name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> @Test<a name="line.126"></a>
+<span class="sourceLineNo">127</span> public void testBackupHistory() throws IOException {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> int n = 10;<a name="line.128"></a>
+<span class="sourceLineNo">129</span> List<BackupInfo> list = createBackupInfoList(n);<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> // Load data<a name="line.131"></a>
+<span class="sourceLineNo">132</span> for (BackupInfo bc : list) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> // Make sure we set right status<a name="line.133"></a>
+<span class="sourceLineNo">134</span> bc.setState(BackupState.COMPLETE);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> table.updateBackupInfo(bc);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> // Reverse list for comparison<a name="line.138"></a>
+<span class="sourceLineNo">139</span> Collections.reverse(list);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> List<BackupInfo> history = table.getBackupHistory();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> assertTrue(history.size() == n);<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> for (int i = 0; i < n; i++) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> BackupInfo ctx = list.get(i);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> BackupInfo data = history.get(i);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertTrue(compare(ctx, data));<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> cleanBackupTable();<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> }<a name="line.151"></a>
<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> int n = 10;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> List<BackupInfo> list = createBackupInfoList(n);<a name="line.156"></a>
+<span class="sourceLineNo">153</span> @Test<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public void testBackupDelete() throws IOException {<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.156"></a>
<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> // Load data<a name="line.158"></a>
-<span class="sourceLineNo">159</span> for (BackupInfo bc : list) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> // Make sure we set right status<a name="line.160"></a>
-<span class="sourceLineNo">161</span> bc.setState(BackupState.COMPLETE);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> table.updateBackupInfo(bc);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> // Verify exists<a name="line.165"></a>
-<span class="sourceLineNo">166</span> for (BackupInfo bc : list) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> assertNotNull(table.readBackupInfo(bc.getBackupId()));<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> // Delete all<a name="line.170"></a>
-<span class="sourceLineNo">171</span> for (BackupInfo bc : list) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> table.deleteBackupInfo(bc.getBackupId());<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span> // Verify do not exists<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (BackupInfo bc : list) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> assertNull(table.readBackupInfo(bc.getBackupId()));<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> cleanBackupTable();<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
+<span class="sourceLineNo">158</span> int n = 10;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> List<BackupInfo> list = createBackupInfoList(n);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> // Load data<a name="line.161"></a>
+<span class="sourceLineNo">162</span> for (BackupInfo bc : list) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> // Make sure we set right status<a name="line.163"></a>
+<span class="sourceLineNo">164</span> bc.setState(BackupState.COMPLETE);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> table.updateBackupInfo(bc);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span> // Verify exists<a name="line.168"></a>
+<span class="sourceLineNo">169</span> for (BackupInfo bc : list) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> assertNotNull(table.readBackupInfo(bc.getBackupId()));<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> // Delete all<a name="line.173"></a>
+<span class="sourceLineNo">174</span> for (BackupInfo bc : list) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span> table.deleteBackupInfo(bc.getBackupId());<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> // Verify do not exists<a name="line.178"></a>
+<span class="sourceLineNo">179</span> for (BackupInfo bc : list) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> assertNull(table.readBackupInfo(bc.getBackupId()));<a name="line.180"></a>
+<span class="sourceLineNo">181</span> }<a name="line.181"></a>
<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> @Test<a name="line.185"></a>
-<span class="sourceLineNo">186</span> public void testRegionServerLastLogRollResults() throws IOException {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> String[] servers = new String[] { "server1", "server2", "server3" };<a name="line.187"></a>
-<span class="sourceLineNo">188</span> Long[] timestamps = new Long[] { 100L, 102L, 107L };<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> for (int i = 0; i < servers.length; i++) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> table.writeRegionServerLastLogRollResult(servers[i], timestamps[i], "root");<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> HashMap<String, Long> result = table.readRegionServerLastLogRollResult("root");<a name="line.194"></a>
-<span class="sourceLineNo">195</span> assertTrue(servers.length == result.size());<a name="line.195"></a>
-<span class="sourceLineNo">196</span> Set<String> keys = result.keySet();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> String[] keysAsArray = new String[keys.size()];<a name="line.197"></a>
-<span class="sourceLineNo">198</span> keys.toArray(keysAsArray);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> Arrays.sort(keysAsArray);<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> for (int i = 0; i < keysAsArray.length; i++) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> assertEquals(keysAsArray[i], servers[i]);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> Long ts1 = timestamps[i];<a name="line.203"></a>
-<span class="sourceLineNo">204</span> Long ts2 = result.get(keysAsArray[i]);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> assertEquals(ts1, ts2);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> cleanBackupTable();<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">183</span> cleanBackupTable();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> @Test<a name="line.188"></a>
+<span class="sourceLineNo">189</span> public void testRegionServerLastLogRollResults() throws IOException {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> String[] servers = new String[] { "server1", "server2", "server3" };<a name="line.190"></a>
+<span class="sourceLineNo">191</span> Long[] timestamps = new Long[] { 100L, 102L, 107L };<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> for (int i = 0; i < servers.length; i++) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> table.writeRegionServerLastLogRollResult(servers[i], timestamps[i], "root");<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> HashMap<String, Long> result = table.readRegionServerLastLogRollResult("root");<a name="line.197"></a>
+<span class="sourceLineNo">198</span> assertTrue(servers.length == result.size());<a name="line.198"></a>
+<span class="sourceLineNo">199</span> Set<String> keys = result.keySet();<a name="line.199"></a>
+<span class="sourceLineNo">200</span> String[] keysAsArray = new String[keys.size()];<a name="line.200"></a>
+<span class="sourceLineNo">201</span> keys.toArray(keysAsArray);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> Arrays.sort(keysAsArray);<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> for (int i = 0; i < keysAsArray.length; i++) {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> assertEquals(keysAsArray[i], servers[i]);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> Long ts1 = timestamps[i];<a name="line.206"></a>
+<span class="sourceLineNo">207</span> Long ts2 = result.get(keysAsArray[i]);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> assertEquals(ts1, ts2);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> @Test<a name="line.211"></a>
-<span class="sourceLineNo">212</span> public void testIncrementalBackupTableSet() throws IOException {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> TreeSet<TableName> tables1 = new TreeSet<>();<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> tables1.add(TableName.valueOf("t1"));<a name="line.215"></a>
-<span class="sourceLineNo">216</span> tables1.add(TableName.valueOf("t2"));<a name="line.216"></a>
-<span class="sourceLineNo">217</span> tables1.add(TableName.valueOf("t3"));<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> TreeSet<TableName> tables2 = new TreeSet<>();<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> tables2.add(TableName.valueOf("t3"));<a name="line.221"></a>
-<span class="sourceLineNo">222</span> tables2.add(TableName.valueOf("t4"));<a name="line.222"></a>
-<span class="sourceLineNo">223</span> tables2.add(TableName.valueOf("t5"));<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> table.addIncrementalBackupTableSet(tables1, "root");<a name="line.225"></a>
-<span class="sourceLineNo">226</span> BackupSystemTable table = new BackupSystemTable(conn);<a name="line.226"></a>
-<span class="sourceLineNo">227</span> TreeSet<TableName> res1 = (TreeSet<TableName>) table.getIncrementalBackupTableSet("root");<a name="line.227"></a>
-<span class="sourceLineNo">228</span> assertTrue(tables1.size() == res1.size());<a name="line.228"></a>
-<span class="sourceLineNo">229</span> Iterator<TableName> desc1 = tables1.descendingIterator();<a name="line.229"></a>
-<span class="sourceLineNo">230</span> Iterator<TableName> desc2 = res1.descendingIterator();<a name="line.230"></a>
-<span class="sourceLineNo">231</span> while (desc1.hasNext()) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> assertEquals(desc1.next(), desc2.next());<a name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> table.addIncrementalBackupTableSet(tables2, "root");<a name="line.235"></a>
-<span class="sourceLineNo">236</span> TreeSet<TableName> res2 = (TreeSet<TableName>) table.getIncrementalBackupTableSet("root");<a name="line.236"></a>
-<span class="sourceLineNo">237</span> assertTrue((tables2.size() + tables1.size() - 1) == res2.size());<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> tables1.addAll(tables2);<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> desc1 = tables1.descendingIterator();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> desc2 = res2.descendingIterator();<a name="line.242"></a>
+<span class="sourceLineNo">211</span> cleanBackupTable();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> @Test<a name="line.214"></a>
+<span class="sourceLineNo">215</span> public void testIncrementalBackupTableSet() throws IOException {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> TreeSet<TableName> tables1 = new TreeSet<>();<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> tables1.add(TableName.valueOf("t1"));<a name="line.218"></a>
+<span class="sourceLineNo">219</span> tables1.add(TableName.valueOf("t2"));<a name="line.219"></a>
+<span class="sourceLineNo">220</span> tables1.add(TableName.valueOf("t3"));<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> TreeSet<TableName> tables2 = new TreeSet<>();<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> tables2.add(TableName.valueOf("t3"));<a name="line.224"></a>
+<span class="sourceLineNo">225</span> tables2.add(TableName.valueOf("t4"));<a name="line.225"></a>
+<span class="sourceLineNo">226</span> tables2.add(TableName.valueOf("t5"));<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> table.addIncrementalBackupTableSet(tables1, "root");<a name="line.228"></a>
+<span class="sourceLineNo">229</span> BackupSystemTable table = new BackupSystemTable(conn);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> TreeSet<TableName> res1 = (TreeSet<TableName>) table.getIncrementalBackupTableSet("root");<a name="line.230"></a>
+<span class="sourceLineNo">231</span> assertTrue(tables1.size() == res1.size());<a name="line.231"></a>
+<span class="sourceLineNo">232</span> Iterator<TableName> desc1 = tables1.descendingIterator();<a name="line.232"></a>
+<span class="sourceLineNo">233</span> Iterator<TableName> desc2 = res1.descendingIterator();<a name="line.233"></a>
+<span class="sourceLineNo">234</span> while (desc1.hasNext()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> assertEquals(desc1.next(), desc2.next());<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> table.addIncrementalBackupTableSet(tables2, "root");<a name="line.238"></a>
+<span class="sourceLineNo">239</span> TreeSet<TableName> res2 = (TreeSet<TableName>) table.getIncrementalBackupTableSet("root");<a name="line.239"></a>
+<span class="sourceLineNo">240</span> assertTrue((tables2.size() + tables1.size() - 1) == res2.size());<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> tables1.addAll(tables2);<a name="line.242"></a>
<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> while (desc1.hasNext()) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> assertEquals(desc1.next(), desc2.next());<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span> cleanBackupTable();<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span> @Test<a name="line.251"></a>
-<span class="sourceLineNo">252</span> public void testRegionServerLogTimestampMap() throws IOException {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> TreeSet<TableName> tables = new TreeSet<>();<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> tables.add(TableName.valueOf("t1"));<a name="line.255"></a>
-<span class="sourceLineNo">256</span> tables.add(TableName.valueOf("t2"));<a name="line.256"></a>
-<span class="sourceLineNo">257</span> tables.add(TableName.valueOf("t3"));<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> HashMap<String, Long> rsTimestampMap = new HashMap<String, Long>();<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> rsTimestampMap.put("rs1:100", 100L);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> rsTimestampMap.put("rs2:100", 101L);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> rsTimestampMap.put("rs3:100", 103L);<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> table.writeRegionServerLogTimestamp(tables, rsTimestampMap, "root");<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> HashMap<TableName, HashMap<String, Long>> result = table.readLogTimestampMap("root");<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> assertTrue(tables.size() == result.size());<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> for (TableName t : tables) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> HashMap<String, Long> rstm = result.get(t);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> assertNotNull(rstm);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> assertEquals(rstm.get("rs1:100"), new Long(100L));<a name="line.274"></a>
-<span class="sourceLineNo">275</span> assertEquals(rstm.get("rs2:100"), new Long(101L));<a name="line.275"></a>
-<span class="sourceLineNo">276</span> assertEquals(rstm.get("rs3:100"), new Long(103L));<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> Set<TableName> tables1 = new TreeSet<>();<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> tables1.add(TableName.valueOf("t3"));<a name="line.281"></a>
-<span class="sourceLineNo">282</span> tables1.add(TableName.valueOf("t4"));<a name="line.282"></a>
-<span class="sourceLineNo">283</span> tables1.add(TableName.valueOf("t5"));<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> HashMap<String, Long> rsTimestampMap1 = new HashMap<String, Long>();<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> rsTimestampMap1.put("rs1:100", 200L);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> rsTimestampMap1.put("rs2:100", 201L);<a name="line.288"></a>
-<span class="sourceLineNo">289</span> rsTimestampMap1.put("rs3:100", 203L);<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> table.writeRegionServerLogTimestamp(tables1, rsTimestampMap1, "root");<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> result = table.readLogTimestampMap("root");<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> assertTrue(5 == result.size());<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span> for (TableName t : tables) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> HashMap<String, Long> rstm = result.get(t);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> assertNotNull(rstm);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (t.equals(TableName.valueOf("t3")) == false) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> assertEquals(rstm.get("rs1:100"), new Long(100L));<a name="line.301"></a>
-<span class="sourceLineNo">302</span> assertEquals(rstm.get("rs2:100"), new Long(101L));<a name="line.302"></a>
-<span class="sourceLineNo">303</span> assertEquals(rstm.get("rs3:100"), new Long(103L));<a name="line.303"></a>
-<span class="sourceLineNo">304</span> } else {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> assertEquals(rstm.get("rs1:100"), new Long(200L));<a name="line.305"></a>
-<span class="sourceLineNo">306</span> assertEquals(rstm.get("rs2:100"), new Long(201L));<a name="line.306"></a>
-<span class="sourceLineNo">307</span> assertEquals(rstm.get("rs3:100"), new Long(203L));<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> for (TableName t : tables1) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> HashMap<String, Long> rstm = result.get(t);<a name="line.312"></a>
-<span class="sourceLineNo">313</span> assertNotNull(rstm);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> assertEquals(rstm.get("rs1:100"), new Long(200L));<a name="line.314"></a>
-<span class="sourceLineNo">315</span> assertEquals(rstm.get("rs2:100"), new Long(201L));<a name="line.315"></a>
-<span class="sourceLineNo">316</span> assertEquals(rstm.get("rs3:100"), new Long(203L));<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> cleanBackupTable();<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> @Test<a name="line.323"></a>
-<span class="sourceLineNo">324</span> public void testAddWALFiles() throws IOException {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> List<String> files =<a name="line.325"></a>
-<span class="sourceLineNo">326</span> Arrays.asList("hdfs://server/WALs/srv1,101,15555/srv1,101,15555.default.1",<a name="line.326"></a>
-<span class="sourceLineNo">327</span> "hdfs://server/WALs/srv2,102,16666/srv2,102,16666.default.2",<a name="line.327"></a>
-<span class="sourceLineNo">328</span> "hdfs://server/WALs/srv3,103,17777/srv3,103,17777.default.3");<a name="line.328"></a>
-<span class="sourceLineNo">329</span> String newFile = "hdfs://server/WALs/srv1,101,15555/srv1,101,15555.default.5";<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> table.addWALFiles(files, "backup", "root");<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> assertTrue(table.isWALFileDeletable(files.get(0)));<a name="line.333"></a>
-<span class="sourceLineNo">334</span> assertTrue(table.isWALFileDeletable(files.get(1)));<a name="line.334"></a>
-<span class="sourceLineNo">335</span> assertTrue(table.isWALFileDeletable(files.get(2)));<a name="line.335"></a>
-<span class="sourceLineNo">336</span> assertFalse(table.isWALFileDeletable(newFile));<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> cleanBackupTable();<a name="line.338"></a>
-<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">244</span> desc1 = tables1.descendingIterator();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> desc2 = res2.descendingIterator();<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> while (desc1.hasNext()) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> assertEquals(desc1.next(), desc2.next());<a name="line.248"></a>
+<span class="sourceLineNo">249</span> }<a name="line.249"></a>
+<span class="sourceLineNo">250</span> cleanBackupTable();<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span> @Test<a name="line.254"></a>
+<span class="sourceLineNo">255</span> public void testRegionServerLogTimestampMap() throws IOException {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> TreeSet<TableName> tables = new TreeSet<>();<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> tables.add(TableName.valueOf("t1"));<a name="line.258"></a>
+<span class="sourceLineNo">259</span> tables.add(TableName.valueOf("t2"));<a name="line.259"></a>
+<span class="sourceLineNo">260</span> tables.add(TableName.valueOf("t3"));<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> HashMap<String, Long> rsTimestampMap = new HashMap<String, Long>();<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> rsTimestampMap.put("rs1:100", 100L);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> rsTimestampMap.put("rs2:100", 101L);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> rsTimestampMap.put("rs3:100", 103L);<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> table.writeRegionServerLogTimestamp(tables, rsTimestampMap, "root");<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> HashMap<TableName, HashMap<String, Long>> result = table.readLogTimestampMap("root");<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> assertTrue(tables.size() == result.size());<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> for (TableName t : tables) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> HashMap<String, Long> rstm = result.get(t);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> assertNotNull(rstm);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> assertEquals(rstm.get("rs1:100"), new Long(100L));<a name="line.277"></a>
+<span class="sourceLineNo">278</span> assertEquals(rstm.get("rs2:100"), new Long(101L));<a name="line.278"></a>
+<span class="sourceLineNo">279</span> assertEquals(rstm.get("rs3:100"), new Long(103L));<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> Set<TableName> tables1 = new TreeSet<>();<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> tables1.add(TableName.valueOf("t3"));<a name="line.284"></a>
+<span class="sourceLineNo">285</span> tables1.add(TableName.valueOf("t4"));<a name="line.285"></a>
+<span class="sourceLineNo">286</span> tables1.add(TableName.valueOf("t5"));<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> HashMap<String, Long> rsTimestampMap1 = new HashMap<String, Long>();<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> rsTimestampMap1.put("rs1:100", 200L);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> rsTimestampMap1.put("rs2:100", 201L);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> rsTimestampMap1.put("rs3:100", 203L);<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> table.writeRegionServerLogTimestamp(tables1, rsTimestampMap1, "root");<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> result = table.readLogTimestampMap("root");<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> assertTrue(5 == result.size());<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> for (TableName t : tables) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> HashMap<String, Long> rstm = result.get(t);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> assertNotNull(rstm);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> if (t.equals(TableName.valueOf("t3")) == false) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> assertEquals(rstm.get("rs1:100"), new Long(100L));<a name="line.304"></a>
+<span class="sourceLineNo">305</span> assertEquals(rstm.get("rs2:100"), new Long(101L));<a name="line.305"></a>
+<span class="sourceLineNo">306</span> assertEquals(rstm.get("rs3:100"), new Long(103L));<a name="line.306"></a>
+<span class="sourceLineNo">307</span> } else {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> assertEquals(rstm.get("rs1:100"), new Long(200L));<a name="line.308"></a>
+<span class="sourceLineNo">309</span> assertEquals(rstm.get("rs2:100"), new Long(201L));<a name="line.309"></a>
+<span class="sourceLineNo">310</span> assertEquals(rstm.get("rs3:100"), new Long(203L));<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span> for (TableName t : tables1) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> HashMap<String, Long> rstm = result.get(t);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> assertNotNull(rstm);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> assertEquals(rstm.get("rs1:100"), new Long(200L));<a name="line.317"></a>
+<span class="sourceLineNo">318</span> assertEquals(rstm.get("rs2:100"), new Long(201L));<a name="line.318"></a>
+<span class="sourceLineNo">319</span> assertEquals(rstm.get("rs3:100"), new Long(203L));<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> cleanBackupTable();<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> @Test<a name="line.326"></a>
+<span class="sourceLineNo">327</span> public void testAddWALFiles() throws IOException {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> List<String> files =<a name="line.328"></a>
+<span class="sourceLineNo">329</span> Arrays.asList("hdfs://server/WALs/srv1,101,15555/srv1,101,15555.default.1",<a name="line.329"></a>
+<span class="sourceLineNo">330</span> "hdfs://server/WALs/srv2,102,16666/srv2,102,16666.default.2",<a name="line.330"></a>
+<span class="sourceLineNo">331</span> "hdfs://server/WALs/srv3,103,17777/srv3,103,17777.default.3");<a name="line.331"></a>
+<span class="sourceLineNo">332</span> String newFile = "hdfs://server/WALs/srv1,101,15555/srv1,101,15555.default.5";<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> table.addWALFiles(files, "backup", "root");<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> assertTrue(table.isWALFileDeletable(files.get(0)));<a name="line.336"></a>
+<span class="sourceLineNo">337</span> assertTrue(table.isWALFileDeletable(files.get(1)));<a name="line.337"></a>
+<span class="sourceLineNo">338</span> assertTrue(table.isWALFileDeletable(files.get(2)));<a name="line.338"></a>
+<span class="sourceLineNo">339</span> assertFalse(table.isWALFileDeletable(newFile));<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> * Backup set tests<a name="line.342"></a>
-<span class="sourceLineNo">343</span> */<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> @Test<a name="line.345"></a>
-<span class="sourceLineNo">346</span> public void testBackupSetAddNotExists() throws IOException {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.347"></a>
+<span class="sourceLineNo">341</span> // test for isWALFilesDeletable<a name="line.341"></a>
+<span class="sourceLineNo">342</span> List<FileStatus> fileStatues = new ArrayList<>();<a name="line.342"></a>
+<span class="sourceLineNo">343</span> for (String file : files) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> FileStatus fileStatus = new FileStatus();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> fileStatus.setPath(new Path(file));<a name="line.345"></a>
+<span class="sourceLineNo">346</span> fileStatues.add(fileStatus);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> String[] tables = new String[] { "table1", "table2", "table3" };<a name="line.349"></a>
-<span class="sourceLineNo">350</span> String setName = "name";<a name="line.350"></a>
-<span class="sourceLineNo">351</span> table.addToBackupSet(setName, tables);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> assertTrue(tnames != null);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> assertTrue(tnames.size() == tables.length);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> for (int i = 0; i < tnames.size(); i++) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> assertTrue(tnames.get(i).getNameAsString().equals(tables[i]));<a name="line.356"></a>
-<span class="sourceLineNo">357</span> }<a name="line.357"></a>
-<span class="sourceLineNo">358</span> cleanBackupTable();<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">349</span> FileStatus newFileStatus = new FileStatus();<a name="line.349"></a>
+<span class="sourceLineNo">350</span> newFileStatus.setPath(new Path(newFile));<a name="line.350"></a>
+<span class="sourceLineNo">351</span> fileStatues.add(newFileStatus);<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span> Map<FileStatus, Boolean> walFilesDeletableMap = table.areWALFilesDeletable(fileStatues);<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span> assertTrue(walFilesDeletableMap.get(fileStatues.get(0)));<a name="line.355"></a>
+<span class="sourceLineNo">356</span> assertTrue(walFilesDeletableMap.get(fileStatues.get(1)));<a name="line.356"></a>
+<span class="sourceLineNo">357</span> assertTrue(walFilesDeletableMap.get(fileStatues.get(2)));<a name="line.357"></a>
+<span class="sourceLineNo">358</span> assertFalse(walFilesDeletableMap.get(newFileStatus));<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> cleanBackupTable();<a name="line.360"></a>
<span class="sourceLineNo">361</span> }<a name="line.361"></a>
<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> @Test<a name="line.363"></a>
-<span class="sourceLineNo">364</span> public void testBackupSetAddExists() throws IOException {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.365"></a>
+<span class="sourceLineNo">363</span> /**<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * Backup set tests<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> String[] tables = new String[] { "table1", "table2", "table3" };<a name="line.367"></a>
-<span class="sourceLineNo">368</span> String setName = "name";<a name="line.368"></a>
-<span class="sourceLineNo">369</span> table.addToBackupSet(setName, tables);<a name="line.369"></a>
-<span class="sourceLineNo">370</span> String[] addTables = new String[] { "table4", "table5", "table6" };<a name="line.370"></a>
-<span class="sourceLineNo">371</span> table.addToBackupSet(setName, addTables);<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span> Set<String> expectedTables = new HashSet<>(Arrays.asList("table1", "table2", "table3",<a name="line.373"></a>
-<span class="sourceLineNo">374</span> "table4", "table5", "table6"));<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> assertTrue(tnames != null);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> assertTrue(tnames.size() == expectedTables.size());<a name="line.378"></a>
-<span class="sourceLineNo">379</span> for (TableName tableName : tnames) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> assertTrue(expectedTables.remove(tableName.getNameAsString()));<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span> cleanBackupTable();<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><a name="line.385"></a>
-<span class="sourceLineNo">386</span> @Test<a name="line.386"></a>
-<span class="sourceLineNo">387</span> public void testBackupSetAddExistsIntersects() throws IOException {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> String[] tables = new String[] { "table1", "table2", "table3" };<a name="line.390"></a>
-<span class="sourceLineNo">391</span> String setName = "name";<a name="line.391"></a>
-<span class="sourceLineNo">392</span> table.addToBackupSet(setName, tables);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> String[] addTables = new String[] { "table3", "table4", "table5", "table6" };<a name="line.393"></a>
-<span class="sourceLineNo">394</span> table.addToBackupSet(setName, addTables);<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> Set<String> expectedTables = new HashSet<>(Arrays.asList("table1", "table2", "table3",<a name="line.396"></a>
-<span class="sourceLineNo">397</span> "table4", "table5", "table6"));<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.399"></a>
-<span class="sourceLineNo">400</span> assertTrue(tnames != null);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> assertTrue(tnames.size() == expectedTables.size());<a name="line.401"></a>
-<span class="sourceLineNo">402</span> for (TableName tableName : tnames) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> assertTrue(expectedTables.remove(tableName.getNameAsString()));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> }<a name="line.404"></a>
-<span class="sourceLineNo">405</span> cleanBackupTable();<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<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> @Test<a name="line.409"></a>
-<span class="sourceLineNo">410</span> public void testBackupSetRemoveSomeNotExists() throws IOException {<a name="line.410"></a>
-<span class="sourceLineNo">411</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span> String[] tables = new String[] { "table1", "table2", "table3", "table4" };<a name="line.413"></a>
-<span class="sourceLineNo">414</span> String setName = "name";<a name="line.414"></a>
-<span class="sourceLineNo">415</span> table.addToBackupSet(setName, tables);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> String[] removeTables = new String[] { "table4", "table5", "table6" };<a name="line.416"></a>
-<span class="sourceLineNo">417</span> table.removeFromBackupSet(setName, removeTables);<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> Set<String> expectedTables = new HashSet<>(Arrays.asList("table1", "table2", "table3"));<a name="line.419"></a>
+<span class="sourceLineNo">367</span> @Test<a name="line.367"></a>
+<span class="sourceLineNo">368</span> public void testBackupSetAddNotExists() throws IOException {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> String[] tables = new String[] { "table1", "table2", "table3" };<a name="line.371"></a>
+<span class="sourceLineNo">372</span> String setName = "name";<a name="line.372"></a>
+<span class="sourceLineNo">373</span> table.addToBackupSet(setName, tables);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> assertTrue(tnames != null);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> assertTrue(tnames.size() == tables.length);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> for (int i = 0; i < tnames.size(); i++) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> assertTrue(tnames.get(i).getNameAsString().equals(tables[i]));<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span> cleanBackupTable();<a name="line.380"></a>
+<span class="sourceLineNo">381</span> }<a name="line.381"></a>
+<span class="sourceLineNo">382</span><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> @Test<a name="line.385"></a>
+<span class="sourceLineNo">386</span> public void testBackupSetAddExists() throws IOException {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span> String[] tables = new String[] { "table1", "table2", "table3" };<a name="line.389"></a>
+<span class="sourceLineNo">390</span> String setName = "name";<a name="line.390"></a>
+<span class="sourceLineNo">391</span> table.addToBackupSet(setName, tables);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> String[] addTables = new String[] { "table4", "table5", "table6" };<a name="line.392"></a>
+<span class="sourceLineNo">393</span> table.addToBackupSet(setName, addTables);<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> Set<String> expectedTables = new HashSet<>(Arrays.asList("table1", "table2", "table3",<a name="line.395"></a>
+<span class="sourceLineNo">396</span> "table4", "table5", "table6"));<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> assertTrue(tnames != null);<a name="line.399"></a>
+<span class="sourceLineNo">400</span> assertTrue(tnames.size() == expectedTables.size());<a name="line.400"></a>
+<span class="sourceLineNo">401</span> for (TableName tableName : tnames) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> assertTrue(expectedTables.remove(tableName.getNameAsString()));<a name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span> cleanBackupTable();<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> @Test<a name="line.408"></a>
+<span class="sourceLineNo">409</span> public void testBackupSetAddExistsIntersects() throws IOException {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> String[] tables = new String[] { "table1", "table2", "table3" };<a name="line.412"></a>
+<span class="sourceLineNo">413</span> String setName = "name";<a name="line.413"></a>
+<span class="sourceLineNo">414</span> table.addToBackupSet(setName, tables);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> String[] addTables = new String[] { "table3", "table4", "table5", "table6" };<a name="line.415"></a>
+<span class="sourceLineNo">416</span> table.addToBackupSet(setName, addTables);<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span> Set<String> expectedTables = new HashSet<>(Arrays.asList("table1", "table2", "table3",<a name="line.418"></a>
+<span class="sourceLineNo">419</span> "table4", "table5", "table6"));<a name="line.419"></a>
<span class="sourceLineNo">420</span><a name="line.420"></a>
<span class="sourceLineNo">421</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.421"></a>
<span class="sourceLineNo">422</span> assertTrue(tnames != null);<a name="line.422"></a>
@@ -437,16 +437,16 @@
<span class="sourceLineNo">429</span> }<a name="line.429"></a>
<span class="sourceLineNo">430</span><a name="line.430"></a>
<span class="sourceLineNo">431</span> @Test<a name="line.431"></a>
-<span class="sourceLineNo">432</span> public void testBackupSetRemove() throws IOException {<a name="line.432"></a>
+<span class="sourceLineNo">432</span> public void testBackupSetRemoveSomeNotExists() throws IOException {<a name="line.432"></a>
<span class="sourceLineNo">433</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.433"></a>
<span class="sourceLineNo">434</span><a name="line.434"></a>
<span class="sourceLineNo">435</span> String[] tables = new String[] { "table1", "table2", "table3", "table4" };<a name="line.435"></a>
<span class="sourceLineNo">436</span> String setName = "name";<a name="line.436"></a>
<span class="sourceLineNo">437</span> table.addToBackupSet(setName, tables);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> String[] removeTables = new String[] { "table4", "table3" };<a name="line.438"></a>
+<span class="sourceLineNo">438</span> String[] removeTables = new String[] { "table4", "table5", "table6" };<a name="line.438"></a>
<span class="sourceLineNo">439</span> table.removeFromBackupSet(setName, removeTables);<a name="line.439"></a>
<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span> Set<String> expectedTables = new HashSet<>(Arrays.asList("table1", "table2"));<a name="line.441"></a>
+<span class="sourceLineNo">441</span> Set<String> expectedTables = new HashSet<>(Arrays.asList("table1", "table2", "table3"));<a name="line.441"></a>
<span class="sourceLineNo">442</span><a name="line.442"></a>
<span class="sourceLineNo">443</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.443"></a>
<span class="sourceLineNo">444</span> assertTrue(tnames != null);<a name="line.444"></a>
@@ -459,75 +459,97 @@
<span class="sourceLineNo">451</span> }<a name="line.451"></a>
<span class="sourceLineNo">452</span><a name="line.452"></a>
<span class="sourceLineNo">453</span> @Test<a name="line.453"></a>
-<span class="sourceLineNo">454</span> public void testBackupSetDelete() throws IOException {<a name="line.454"></a>
+<span class="sourceLineNo">454</span> public void testBackupSetRemove() throws IOException {<a name="line.454"></a>
<span class="sourceLineNo">455</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.455"></a>
<span class="sourceLineNo">456</span><a name="line.456"></a>
<span class="sourceLineNo">457</span> String[] tables = new String[] { "table1", "table2", "table3", "table4" };<a name="line.457"></a>
<span class="sourceLineNo">458</span> String setName = "name";<a name="line.458"></a>
<span class="sourceLineNo">459</span> table.addToBackupSet(setName, tables);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> table.deleteBackupSet(setName);<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> assertTrue(tnames == null);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> cleanBackupTable();<a name="line.464"></a>
-<span class="sourceLineNo">465</span> }<a name="line.465"></a>
-<span class="sourceLineNo">466</span> }<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span> @Test<a name="line.468"></a>
-<span class="sourceLineNo">469</span> public void testBackupSetList() throws IOException {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span> String[] tables = new String[] { "table1", "table2", "table3", "table4" };<a name="line.472"></a>
-<span class="sourceLineNo">473</span> String setName1 = "name1";<a name="line.473"></a>
-<span class="sourceLineNo">474</span> String setName2 = "name2";<a name="line.474"></a>
-<span class="sourceLineNo">475</span> table.addToBackupSet(setName1, tables);<a name="line.475"></a>
-<span class="sourceLineNo">476</span> table.addToBackupSet(setName2, tables);<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> List<String> list = table.listBackupSets();<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> assertTrue(list.size() == 2);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> assertTrue(list.get(0).equals(setName1));<a name="line.481"></a>
-<span class="sourceLineNo">482</span> assertTrue(list.get(1).equals(setName2));<a name="line.482"></a>
+<span class="sourceLineNo">460</span> String[] removeTables = new String[] { "table4", "table3" };<a name="line.460"></a>
+<span class="sourceLineNo">461</span> table.removeFromBackupSet(setName, removeTables);<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> Set<String> expectedTables = new HashSet<>(Arrays.asList("table1", "table2"));<a name="line.463"></a>
+<span class="sourceLineNo">464</span><a name="line.464"></a>
+<span class="sourceLineNo">465</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> assertTrue(tnames != null);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> assertTrue(tnames.size() == expectedTables.size());<a name="line.467"></a>
+<span class="sourceLineNo">468</span> for (TableName tableName : tnames) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> assertTrue(expectedTables.remove(tableName.getNameAsString()));<a name="line.469"></a>
+<span class="sourceLineNo">470</span> }<a name="line.470"></a>
+<span class="sourceLineNo">471</span> cleanBackupTable();<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span> @Test<a name="line.475"></a>
+<span class="sourceLineNo">476</span> public void testBackupSetDelete() throws IOException {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span> String[] tables = new String[] { "table1", "table2", "table3", "table4" };<a name="line.479"></a>
+<span class="sourceLineNo">480</span> String setName = "name";<a name="line.480"></a>
+<span class="sourceLineNo">481</span> table.addToBackupSet(setName, tables);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> table.deleteBackupSet(setName);<a name="line.482"></a>
<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> cleanBackupTable();<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> }<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span> private boolean compare(BackupInfo one, BackupInfo two) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span> return one.getBackupId().equals(two.getBackupId()) && one.getType().equals(two.getType())<a name="line.489"></a>
-<span class="sourceLineNo">490</span> && one.getBackupRootDir().equals(two.getBackupRootDir())<a name="line.490"></a>
-<span class="sourceLineNo">491</span> && one.getStartTs() == two.getStartTs() && one.getCompleteTs() == two.getCompleteTs();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">484</span> List<TableName> tnames = table.describeBackupSet(setName);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> assertTrue(tnames == null);<a name="line.485"></a>
+<span class="sourceLineNo">486</span> cleanBackupTable();<a name="line.486"></a>
+<span class="sourceLineNo">487</span> }<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span> @Test<a name="line.490"></a>
+<span class="sourceLineNo">491</span> public void testBackupSetList() throws IOException {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.492"></a>
<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span> private BackupInfo createBackupInfo() {<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span> BackupInfo ctxt =<a name="line.496"></a>
-<span class="sourceLineNo">497</span> new BackupInfo("backup_" + System.nanoTime(), BackupType.FULL, new TableName[] {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> TableName.valueOf("t1"), TableName.valueOf("t2"), TableName.valueOf("t3") },<a name="line.498"></a>
-<span class="sourceLineNo">499</span> "/hbase/backup");<a name="line.499"></a>
-<span class="sourceLineNo">500</span> ctxt.setStartTs(System.currentTimeMillis());<a name="line.500"></a>
-<span class="sourceLineNo">501</span> ctxt.setCompleteTs(System.currentTimeMillis() + 1);<a name="line.501"></a>
-<span class="sourceLineNo">502</span> return ctxt;<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> private List<BackupInfo> createBackupInfoList(int size) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> List<BackupInfo> list = new ArrayList<BackupInfo>();<a name="line.506"></a>
-<span class="sourceLineNo">507</span> for (int i = 0; i < size; i++) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span> list.add(createBackupInfo());<a name="line.508"></a>
-<span class="sourceLineNo">509</span> try {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> Thread.sleep(10);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> } catch (InterruptedException e) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> e.printStackTrace();<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span> return list;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
+<span class="sourceLineNo">494</span> String[] tables = new String[] { "table1", "table2", "table3", "table4" };<a name="line.494"></a>
+<span class="sourceLineNo">495</span> String setName1 = "name1";<a name="line.495"></a>
+<span class="sourceLineNo">496</span> String setName2 = "name2";<a name="line.496"></a>
+<span class="sourceLineNo">497</span> table.addToBackupSet(setName1, tables);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> table.addToBackupSet(setName2, tables);<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span> List<String> list = table.listBackupSets();<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span> assertTrue(list.size() == 2);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> assertTrue(list.get(0).equals(setName1));<a name="line.503"></a>
+<span class="sourceLineNo">504</span> assertTrue(list.get(1).equals(setName2));<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> cleanBackupTable();<a name="line.506"></a>
+<span class="sourceLineNo">507</span> }<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span> private boolean compare(BackupInfo one, BackupInfo two) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span> return one.getBackupId().equals(two.getBackupId()) && one.getType().equals(two.getType())<a name="line.511"></a>
+<span class="sourceLineNo">512</span> && one.getBackupRootDir().equals(two.getBackupRootDir())<a name="line.512"></a>
+<span class="sourceLineNo">513</span> && one.getStartTs() == two.getStartTs() && one.getCompleteTs() == two.getCompleteTs();<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span> private BackupInfo createBackupInfo() {<a name="line.516"></a>
<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span> @AfterClass<a name="line.518"></a>
-<span class="sourceLineNo">519</span> public static void tearDown() throws IOException {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> if (cluster != null) cluster.shutdown();<a name="line.520"></a>
-<span class="sourceLineNo">521</span> }<a name="line.521"></a>
-<span class="sourceLineNo">522</span>}<a name="line.522"></a>
+<span class="sourceLineNo">518</span> BackupInfo ctxt =<a name="line.518"></a>
+<span class="sourceLineNo">519</span> new BackupInfo("backup_" + System.nanoTime(), BackupType.FULL, new TableName[] {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> TableName.valueOf("t1"), TableName.valueOf("t2"), TableName.valueOf("t3") },<a name="line.520"></a>
+<span class="sourceLineNo">521</span> "/hbase/backup");<a name="line.521"></a>
+<span class="sourceLineNo">522</span> ctxt.setStartTs(System.currentTimeMillis());<a name="line.522"></a>
+<span class="sourceLineNo">523</span> ctxt.setCompleteTs(System.currentTimeMillis() + 1);<a name="line.523"></a>
+<span class="sourceLineNo">524</span> return ctxt;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> }<a name="line.525"></a>
+<span class="sourceLineNo">526</span><a name="line.526"></a>
+<span class="sourceLineNo">527</span> private List<BackupInfo> createBackupInfoList(int size) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> List<BackupInfo> list = new ArrayList<BackupInfo>();<a name="line.528"></a>
+<span class="sourceLineNo">529</span> for (int i = 0; i < size; i++) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span> list.add(createBackupInfo());<a name="line.530"></a>
+<span class="sourceLineNo">531</span> try {<a name="line.531"></a>
+<span class="sourceLineNo">532</span> Thread.sleep(10);<a name="line.532"></a>
+<span class="sourceLineNo">533</span> } catch (InterruptedException e) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span> e.printStackTrace();<a name="line.534"></a>
+<span class="sourceLineNo">535</span> }<a name="line.535"></a>
+<span class="sourceLineNo">536</span> }<a name="line.536"></a>
+<span class="sourceLineNo">537</span> return list;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span> @AfterClass<a name="line.540"></a>
+<span class="sourceLineNo">541</span> public static void tearDown() throws IOException {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> if (cluster != null) cluster.shutdown();<a name="line.542"></a>
+<span class="sourceLineNo">543</span> }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>}<a name="line.544"></
<TRUNCATED>