http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5299e667/devapidocs/src-html/org/apache/hadoop/hbase/master/ClusterSchemaServiceImpl.html
----------------------------------------------------------------------
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/master/ClusterSchemaServiceImpl.html
b/devapidocs/src-html/org/apache/hadoop/hbase/master/ClusterSchemaServiceImpl.html
index 09e7d34..2149280 100644
---
a/devapidocs/src-html/org/apache/hadoop/hbase/master/ClusterSchemaServiceImpl.html
+++
b/devapidocs/src-html/org/apache/hadoop/hbase/master/ClusterSchemaServiceImpl.html
@@ -26,118 +26,110 @@
<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.master;<a
name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
<span class="sourceLineNo">020</span>import java.io.IOException;<a
name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.ArrayList;<a
name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.Collections;<a
name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.List;<a
name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.Set;<a
name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import
org.apache.hadoop.hbase.NamespaceDescriptor;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import
org.apache.hadoop.hbase.NamespaceNotFoundException;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import
org.apache.hadoop.hbase.ServiceNotRunningException;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import
org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import
org.apache.hadoop.hbase.master.procedure.CreateNamespaceProcedure;<a
name="line.30"></a>
-<span class="sourceLineNo">031</span>import
org.apache.hadoop.hbase.master.procedure.DeleteNamespaceProcedure;<a
name="line.31"></a>
-<span class="sourceLineNo">032</span>import
org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a
name="line.32"></a>
-<span class="sourceLineNo">033</span>import
org.apache.hadoop.hbase.master.procedure.ModifyNamespaceProcedure;<a
name="line.33"></a>
-<span class="sourceLineNo">034</span>import
org.apache.hadoop.hbase.master.procedure.ProcedurePrepareLatch;<a
name="line.34"></a>
-<span class="sourceLineNo">035</span>import
org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import
org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import
org.apache.hbase.thirdparty.com.google.common.util.concurrent.AbstractService;<a
name="line.37"></a>
-<span class="sourceLineNo">038</span>import
org.apache.hadoop.hbase.util.NonceKey;<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>@InterfaceAudience.Private<a
name="line.40"></a>
-<span class="sourceLineNo">041</span>class ClusterSchemaServiceImpl extends
AbstractService implements ClusterSchemaService {<a name="line.41"></a>
-<span class="sourceLineNo">042</span> private final TableNamespaceManager
tableNamespaceManager;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> private final MasterServices
masterServices;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> private final static
List<NamespaceDescriptor> EMPTY_NAMESPACE_LIST =<a name="line.44"></a>
-<span class="sourceLineNo">045</span> Collections.unmodifiableList(new
ArrayList<NamespaceDescriptor>(0));<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> ClusterSchemaServiceImpl(final
MasterServices masterServices) {<a name="line.47"></a>
-<span class="sourceLineNo">048</span> this.masterServices =
masterServices;<a name="line.48"></a>
-<span class="sourceLineNo">049</span> this.tableNamespaceManager = new
TableNamespaceManager(masterServices);<a name="line.49"></a>
-<span class="sourceLineNo">050</span> }<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> // All below are synchronized so
consistent view on whether running or not.<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> private synchronized void
checkIsRunning() throws ServiceNotRunningException {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> if (!isRunning()) throw new
ServiceNotRunningException();<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> @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span> public synchronized void doStart() {<a
name="line.60"></a>
-<span class="sourceLineNo">061</span> try {<a name="line.61"></a>
-<span class="sourceLineNo">062</span> notifyStarted();<a
name="line.62"></a>
-<span class="sourceLineNo">063</span>
this.tableNamespaceManager.start();<a name="line.63"></a>
-<span class="sourceLineNo">064</span> } catch (IOException ioe) {<a
name="line.64"></a>
-<span class="sourceLineNo">065</span> notifyFailed(ioe);<a
name="line.65"></a>
-<span class="sourceLineNo">066</span> }<a name="line.66"></a>
-<span class="sourceLineNo">067</span> }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> @Override<a name="line.69"></a>
-<span class="sourceLineNo">070</span> protected void doStop() {<a
name="line.70"></a>
-<span class="sourceLineNo">071</span> // This is no stop for the table
manager.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> notifyStopped();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> TableNamespaceManager tnsm =
getTableNamespaceManager();<a name="line.73"></a>
-<span class="sourceLineNo">074</span> if (tnsm != null) {<a
name="line.74"></a>
-<span class="sourceLineNo">075</span> tnsm.stop("Stopping");<a
name="line.75"></a>
-<span class="sourceLineNo">076</span> }<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> @Override<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public TableNamespaceManager
getTableNamespaceManager() {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return this.tableNamespaceManager;<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> private long submitProcedure(final
Procedure<MasterProcedureEnv> procedure,<a name="line.84"></a>
-<span class="sourceLineNo">085</span> final NonceKey nonceKey) throws
ServiceNotRunningException {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> checkIsRunning();<a
name="line.86"></a>
-<span class="sourceLineNo">087</span>
ProcedureExecutor<MasterProcedureEnv> pe =
this.masterServices.getMasterProcedureExecutor();<a name="line.87"></a>
-<span class="sourceLineNo">088</span> return pe.submitProcedure(procedure,
nonceKey);<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> @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span> public long
createNamespace(NamespaceDescriptor namespaceDescriptor, final NonceKey
nonceKey,<a name="line.92"></a>
-<span class="sourceLineNo">093</span> final ProcedurePrepareLatch
latch)<a name="line.93"></a>
-<span class="sourceLineNo">094</span> throws IOException {<a
name="line.94"></a>
-<span class="sourceLineNo">095</span> return submitProcedure(new
CreateNamespaceProcedure(<a name="line.95"></a>
-<span class="sourceLineNo">096</span>
this.masterServices.getMasterProcedureExecutor().getEnvironment(),
namespaceDescriptor, latch),<a name="line.96"></a>
-<span class="sourceLineNo">097</span> nonceKey);<a name="line.97"></a>
-<span class="sourceLineNo">098</span> }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span> @Override<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public long
modifyNamespace(NamespaceDescriptor namespaceDescriptor, final NonceKey
nonceKey,<a name="line.101"></a>
-<span class="sourceLineNo">102</span> final ProcedurePrepareLatch latch)
throws IOException {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return submitProcedure(new
ModifyNamespaceProcedure(<a name="line.103"></a>
-<span class="sourceLineNo">104</span>
this.masterServices.getMasterProcedureExecutor().getEnvironment(),
namespaceDescriptor, latch),<a name="line.104"></a>
-<span class="sourceLineNo">105</span> nonceKey);<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> @Override<a name="line.108"></a>
-<span class="sourceLineNo">109</span> public long deleteNamespace(String
name, final NonceKey nonceKey, final ProcedurePrepareLatch latch)<a
name="line.109"></a>
-<span class="sourceLineNo">110</span> throws IOException {<a
name="line.110"></a>
-<span class="sourceLineNo">111</span> return submitProcedure(new
DeleteNamespaceProcedure(<a name="line.111"></a>
-<span class="sourceLineNo">112</span>
this.masterServices.getMasterProcedureExecutor().getEnvironment(), name,
latch),<a name="line.112"></a>
-<span class="sourceLineNo">113</span> nonceKey);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> }<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span> @Override<a name="line.116"></a>
-<span class="sourceLineNo">117</span> public NamespaceDescriptor
getNamespace(String name) throws IOException {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> NamespaceDescriptor nsd =
getTableNamespaceManager().get(name);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> if (nsd == null) throw new
NamespaceNotFoundException(name);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return nsd;<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> @Override<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public List<NamespaceDescriptor>
getNamespaces() throws IOException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> checkIsRunning();<a
name="line.125"></a>
-<span class="sourceLineNo">126</span> Set<NamespaceDescriptor> set =
getTableNamespaceManager().list();<a name="line.126"></a>
-<span class="sourceLineNo">127</span> if (set == null || set.isEmpty())
return EMPTY_NAMESPACE_LIST;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> List<NamespaceDescriptor> list
= new ArrayList<>(set.size());<a name="line.128"></a>
-<span class="sourceLineNo">129</span> list.addAll(set);<a
name="line.129"></a>
-<span class="sourceLineNo">130</span> return
Collections.unmodifiableList(list);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>}<a name="line.132"></a>
+<span class="sourceLineNo">021</span>import java.util.List;<a
name="line.21"></a>
+<span class="sourceLineNo">022</span>import
org.apache.hadoop.hbase.NamespaceDescriptor;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import
org.apache.hadoop.hbase.NamespaceNotFoundException;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import
org.apache.hadoop.hbase.ServiceNotRunningException;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import
org.apache.hadoop.hbase.master.procedure.CreateNamespaceProcedure;<a
name="line.25"></a>
+<span class="sourceLineNo">026</span>import
org.apache.hadoop.hbase.master.procedure.DeleteNamespaceProcedure;<a
name="line.26"></a>
+<span class="sourceLineNo">027</span>import
org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a
name="line.27"></a>
+<span class="sourceLineNo">028</span>import
org.apache.hadoop.hbase.master.procedure.ModifyNamespaceProcedure;<a
name="line.28"></a>
+<span class="sourceLineNo">029</span>import
org.apache.hadoop.hbase.master.procedure.ProcedurePrepareLatch;<a
name="line.29"></a>
+<span class="sourceLineNo">030</span>import
org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import
org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import
org.apache.hadoop.hbase.util.NonceKey;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import
org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>import
org.apache.hbase.thirdparty.com.google.common.collect.ImmutableList;<a
name="line.35"></a>
+<span class="sourceLineNo">036</span>import
org.apache.hbase.thirdparty.com.google.common.util.concurrent.AbstractService;<a
name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>@InterfaceAudience.Private<a
name="line.38"></a>
+<span class="sourceLineNo">039</span>class ClusterSchemaServiceImpl extends
AbstractService implements ClusterSchemaService {<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> private final TableNamespaceManager
tableNamespaceManager;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> private final MasterServices
masterServices;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span> ClusterSchemaServiceImpl(final
MasterServices masterServices) {<a name="line.44"></a>
+<span class="sourceLineNo">045</span> this.masterServices =
masterServices;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> this.tableNamespaceManager = new
TableNamespaceManager(masterServices);<a name="line.46"></a>
+<span class="sourceLineNo">047</span> }<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span> // All below are synchronized so
consistent view on whether running or not.<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span> private synchronized void
checkIsRunning() throws ServiceNotRunningException {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> if (!isRunning()) {<a
name="line.52"></a>
+<span class="sourceLineNo">053</span> throw new
ServiceNotRunningException();<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><a name="line.56"></a>
+<span class="sourceLineNo">057</span> @Override<a name="line.57"></a>
+<span class="sourceLineNo">058</span> public synchronized void doStart() {<a
name="line.58"></a>
+<span class="sourceLineNo">059</span> try {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> notifyStarted();<a
name="line.60"></a>
+<span class="sourceLineNo">061</span>
this.tableNamespaceManager.start();<a name="line.61"></a>
+<span class="sourceLineNo">062</span> } catch (IOException ioe) {<a
name="line.62"></a>
+<span class="sourceLineNo">063</span> notifyFailed(ioe);<a
name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> @Override<a name="line.67"></a>
+<span class="sourceLineNo">068</span> protected void doStop() {<a
name="line.68"></a>
+<span class="sourceLineNo">069</span> // This is no stop for the table
manager.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> notifyStopped();<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> @Override<a name="line.73"></a>
+<span class="sourceLineNo">074</span> public TableNamespaceManager
getTableNamespaceManager() {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> return this.tableNamespaceManager;<a
name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> private long submitProcedure(final
Procedure<MasterProcedureEnv> procedure,<a name="line.78"></a>
+<span class="sourceLineNo">079</span> final NonceKey nonceKey) throws
ServiceNotRunningException {<a name="line.79"></a>
+<span class="sourceLineNo">080</span> checkIsRunning();<a
name="line.80"></a>
+<span class="sourceLineNo">081</span>
ProcedureExecutor<MasterProcedureEnv> pe =
this.masterServices.getMasterProcedureExecutor();<a name="line.81"></a>
+<span class="sourceLineNo">082</span> return pe.submitProcedure(procedure,
nonceKey);<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> @Override<a name="line.85"></a>
+<span class="sourceLineNo">086</span> public long
createNamespace(NamespaceDescriptor namespaceDescriptor, final NonceKey
nonceKey,<a name="line.86"></a>
+<span class="sourceLineNo">087</span> final ProcedurePrepareLatch
latch)<a name="line.87"></a>
+<span class="sourceLineNo">088</span> throws IOException {<a
name="line.88"></a>
+<span class="sourceLineNo">089</span> return submitProcedure(new
CreateNamespaceProcedure(<a name="line.89"></a>
+<span class="sourceLineNo">090</span>
this.masterServices.getMasterProcedureExecutor().getEnvironment(),
namespaceDescriptor, latch),<a name="line.90"></a>
+<span class="sourceLineNo">091</span> nonceKey);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> @Override<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public long
modifyNamespace(NamespaceDescriptor namespaceDescriptor, final NonceKey
nonceKey,<a name="line.95"></a>
+<span class="sourceLineNo">096</span> final ProcedurePrepareLatch latch)
throws IOException {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return submitProcedure(new
ModifyNamespaceProcedure(<a name="line.97"></a>
+<span class="sourceLineNo">098</span>
this.masterServices.getMasterProcedureExecutor().getEnvironment(),
namespaceDescriptor, latch),<a name="line.98"></a>
+<span class="sourceLineNo">099</span> nonceKey);<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> @Override<a name="line.102"></a>
+<span class="sourceLineNo">103</span> public long deleteNamespace(String
name, final NonceKey nonceKey, final ProcedurePrepareLatch latch)<a
name="line.103"></a>
+<span class="sourceLineNo">104</span> throws IOException {<a
name="line.104"></a>
+<span class="sourceLineNo">105</span> return submitProcedure(new
DeleteNamespaceProcedure(<a name="line.105"></a>
+<span class="sourceLineNo">106</span>
this.masterServices.getMasterProcedureExecutor().getEnvironment(), name,
latch),<a name="line.106"></a>
+<span class="sourceLineNo">107</span> nonceKey);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> @Override<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public NamespaceDescriptor
getNamespace(String name) throws IOException {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> NamespaceDescriptor nsd =
getTableNamespaceManager().get(name);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> if (nsd == null) throw new
NamespaceNotFoundException(name);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return nsd;<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> @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public List<NamespaceDescriptor>
getNamespaces() throws IOException {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> checkIsRunning();<a
name="line.119"></a>
+<span class="sourceLineNo">120</span> return
getTableNamespaceManager().list().stream()<a name="line.120"></a>
+<span class="sourceLineNo">121</span>
.sorted(NamespaceDescriptor.NAMESPACE_DESCRIPTOR_COMPARATOR)<a
name="line.121"></a>
+<span class="sourceLineNo">122</span>
.collect(ImmutableList.toImmutableList());<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>