http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/apidocs/src-html/org/apache/hadoop/hbase/TableName.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/TableName.html b/apidocs/src-html/org/apache/hadoop/hbase/TableName.html index b54153b..655084f 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/TableName.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/TableName.html @@ -149,415 +149,417 @@ <span class="sourceLineNo">141</span> throw new IllegalArgumentException("Name is null or empty");<a name="line.141"></a> <span class="sourceLineNo">142</span> }<a name="line.142"></a> <span class="sourceLineNo">143</span><a name="line.143"></a> -<span class="sourceLineNo">144</span> int namespaceDelimIndex = com.google.common.primitives.Bytes.lastIndexOf(tableName,<a name="line.144"></a> -<span class="sourceLineNo">145</span> (byte) NAMESPACE_DELIM);<a name="line.145"></a> -<span class="sourceLineNo">146</span> if (namespaceDelimIndex < 0){<a name="line.146"></a> -<span class="sourceLineNo">147</span> isLegalTableQualifierName(tableName);<a name="line.147"></a> -<span class="sourceLineNo">148</span> } else {<a name="line.148"></a> -<span class="sourceLineNo">149</span> isLegalNamespaceName(tableName, 0, namespaceDelimIndex);<a name="line.149"></a> -<span class="sourceLineNo">150</span> isLegalTableQualifierName(tableName, namespaceDelimIndex + 1, tableName.length);<a name="line.150"></a> -<span class="sourceLineNo">151</span> }<a name="line.151"></a> -<span class="sourceLineNo">152</span> return tableName;<a name="line.152"></a> -<span class="sourceLineNo">153</span> }<a name="line.153"></a> -<span class="sourceLineNo">154</span><a name="line.154"></a> -<span class="sourceLineNo">155</span> public static byte [] isLegalTableQualifierName(final byte[] qualifierName) {<a name="line.155"></a> -<span class="sourceLineNo">156</span> isLegalTableQualifierName(qualifierName, 0, qualifierName.length, false);<a name="line.156"></a> -<span class="sourceLineNo">157</span> return qualifierName;<a name="line.157"></a> -<span class="sourceLineNo">158</span> }<a name="line.158"></a> -<span class="sourceLineNo">159</span><a name="line.159"></a> -<span class="sourceLineNo">160</span> public static byte [] isLegalTableQualifierName(final byte[] qualifierName, boolean isSnapshot) {<a name="line.160"></a> -<span class="sourceLineNo">161</span> isLegalTableQualifierName(qualifierName, 0, qualifierName.length, isSnapshot);<a name="line.161"></a> -<span class="sourceLineNo">162</span> return qualifierName;<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">144</span> int namespaceDelimIndex =<a name="line.144"></a> +<span class="sourceLineNo">145</span> org.apache.hadoop.hbase.shaded.com.google.common.primitives.Bytes.lastIndexOf(tableName,<a name="line.145"></a> +<span class="sourceLineNo">146</span> (byte) NAMESPACE_DELIM);<a name="line.146"></a> +<span class="sourceLineNo">147</span> if (namespaceDelimIndex < 0){<a name="line.147"></a> +<span class="sourceLineNo">148</span> isLegalTableQualifierName(tableName);<a name="line.148"></a> +<span class="sourceLineNo">149</span> } else {<a name="line.149"></a> +<span class="sourceLineNo">150</span> isLegalNamespaceName(tableName, 0, namespaceDelimIndex);<a name="line.150"></a> +<span class="sourceLineNo">151</span> isLegalTableQualifierName(tableName, namespaceDelimIndex + 1, tableName.length);<a name="line.151"></a> +<span class="sourceLineNo">152</span> }<a name="line.152"></a> +<span class="sourceLineNo">153</span> return tableName;<a name="line.153"></a> +<span class="sourceLineNo">154</span> }<a name="line.154"></a> +<span class="sourceLineNo">155</span><a name="line.155"></a> +<span class="sourceLineNo">156</span> public static byte [] isLegalTableQualifierName(final byte[] qualifierName) {<a name="line.156"></a> +<span class="sourceLineNo">157</span> isLegalTableQualifierName(qualifierName, 0, qualifierName.length, false);<a name="line.157"></a> +<span class="sourceLineNo">158</span> return qualifierName;<a name="line.158"></a> +<span class="sourceLineNo">159</span> }<a name="line.159"></a> +<span class="sourceLineNo">160</span><a name="line.160"></a> +<span class="sourceLineNo">161</span> public static byte [] isLegalTableQualifierName(final byte[] qualifierName, boolean isSnapshot) {<a name="line.161"></a> +<span class="sourceLineNo">162</span> isLegalTableQualifierName(qualifierName, 0, qualifierName.length, isSnapshot);<a name="line.162"></a> +<span class="sourceLineNo">163</span> return qualifierName;<a name="line.163"></a> +<span class="sourceLineNo">164</span> }<a name="line.164"></a> <span class="sourceLineNo">165</span><a name="line.165"></a> -<span class="sourceLineNo">166</span> /**<a name="line.166"></a> -<span class="sourceLineNo">167</span> * Qualifier names can only contain 'word' characters<a name="line.167"></a> -<span class="sourceLineNo">168</span> * <code>[\p{IsAlphabetic}\p{Digit}]</code> or '_', '.' or '-'.<a name="line.168"></a> -<span class="sourceLineNo">169</span> * The name may not start with '.' or '-'.<a name="line.169"></a> -<span class="sourceLineNo">170</span> *<a name="line.170"></a> -<span class="sourceLineNo">171</span> * @param qualifierName byte array containing the qualifier name<a name="line.171"></a> -<span class="sourceLineNo">172</span> * @param start start index<a name="line.172"></a> -<span class="sourceLineNo">173</span> * @param end end index (exclusive)<a name="line.173"></a> -<span class="sourceLineNo">174</span> */<a name="line.174"></a> -<span class="sourceLineNo">175</span> public static void isLegalTableQualifierName(final byte[] qualifierName,<a name="line.175"></a> -<span class="sourceLineNo">176</span> int start,<a name="line.176"></a> -<span class="sourceLineNo">177</span> int end) {<a name="line.177"></a> -<span class="sourceLineNo">178</span> isLegalTableQualifierName(qualifierName, start, end, false);<a name="line.178"></a> -<span class="sourceLineNo">179</span> }<a name="line.179"></a> -<span class="sourceLineNo">180</span><a name="line.180"></a> -<span class="sourceLineNo">181</span> public static void isLegalTableQualifierName(final byte[] qualifierName,<a name="line.181"></a> -<span class="sourceLineNo">182</span> int start,<a name="line.182"></a> -<span class="sourceLineNo">183</span> int end,<a name="line.183"></a> -<span class="sourceLineNo">184</span> boolean isSnapshot) {<a name="line.184"></a> -<span class="sourceLineNo">185</span> if(end - start < 1) {<a name="line.185"></a> -<span class="sourceLineNo">186</span> throw new IllegalArgumentException(isSnapshot ? "Snapshot" : "Table" + " qualifier must not be empty");<a name="line.186"></a> -<span class="sourceLineNo">187</span> }<a name="line.187"></a> -<span class="sourceLineNo">188</span> if (qualifierName[start] == '.' || qualifierName[start] == '-') {<a name="line.188"></a> -<span class="sourceLineNo">189</span> throw new IllegalArgumentException("Illegal first character <" + qualifierName[start] +<a name="line.189"></a> -<span class="sourceLineNo">190</span> "> at 0. " + (isSnapshot ? "Snapshot" : "User-space table") +<a name="line.190"></a> -<span class="sourceLineNo">191</span> " qualifiers can only start with 'alphanumeric " +<a name="line.191"></a> -<span class="sourceLineNo">192</span> "characters' from any language: " +<a name="line.192"></a> -<span class="sourceLineNo">193</span> Bytes.toString(qualifierName, start, end));<a name="line.193"></a> -<span class="sourceLineNo">194</span> }<a name="line.194"></a> -<span class="sourceLineNo">195</span> // Treat the bytes as UTF-8<a name="line.195"></a> -<span class="sourceLineNo">196</span> String qualifierString = new String(<a name="line.196"></a> -<span class="sourceLineNo">197</span> qualifierName, start, (end - start), StandardCharsets.UTF_8);<a name="line.197"></a> -<span class="sourceLineNo">198</span> if (qualifierString.equals(DISALLOWED_TABLE_NAME)) {<a name="line.198"></a> -<span class="sourceLineNo">199</span> // Per https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel<a name="line.199"></a> -<span class="sourceLineNo">200</span> // A znode named "zookeeper" is disallowed by zookeeper.<a name="line.200"></a> -<span class="sourceLineNo">201</span> throw new IllegalArgumentException("Tables may not be named '" + DISALLOWED_TABLE_NAME + "'");<a name="line.201"></a> -<span class="sourceLineNo">202</span> }<a name="line.202"></a> -<span class="sourceLineNo">203</span> for (int i = 0; i < qualifierString.length(); i++) {<a name="line.203"></a> -<span class="sourceLineNo">204</span> // Treat the string as a char-array as some characters may be multi-byte<a name="line.204"></a> -<span class="sourceLineNo">205</span> char c = qualifierString.charAt(i);<a name="line.205"></a> -<span class="sourceLineNo">206</span> // Check for letter, digit, underscore, hyphen, or period, and allowed by ZK.<a name="line.206"></a> -<span class="sourceLineNo">207</span> // ZooKeeper also has limitations, but Character.isAlphabetic omits those all<a name="line.207"></a> -<span class="sourceLineNo">208</span> // See https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel<a name="line.208"></a> -<span class="sourceLineNo">209</span> if (Character.isAlphabetic(c) || Character.isDigit(c) || c == '_' || c == '-' || c == '.') {<a name="line.209"></a> -<span class="sourceLineNo">210</span> continue;<a name="line.210"></a> -<span class="sourceLineNo">211</span> }<a name="line.211"></a> -<span class="sourceLineNo">212</span> throw new IllegalArgumentException("Illegal character code:" + (int) c + ", <" + c + "> at " +<a name="line.212"></a> -<span class="sourceLineNo">213</span> i + ". " + (isSnapshot ? "Snapshot" : "User-space table") +<a name="line.213"></a> -<span class="sourceLineNo">214</span> " qualifiers may only contain 'alphanumeric characters' and digits: " +<a name="line.214"></a> -<span class="sourceLineNo">215</span> qualifierString);<a name="line.215"></a> -<span class="sourceLineNo">216</span> }<a name="line.216"></a> -<span class="sourceLineNo">217</span> }<a name="line.217"></a> -<span class="sourceLineNo">218</span><a name="line.218"></a> -<span class="sourceLineNo">219</span> public static void isLegalNamespaceName(byte[] namespaceName) {<a name="line.219"></a> -<span class="sourceLineNo">220</span> isLegalNamespaceName(namespaceName, 0, namespaceName.length);<a name="line.220"></a> -<span class="sourceLineNo">221</span> }<a name="line.221"></a> -<span class="sourceLineNo">222</span><a name="line.222"></a> -<span class="sourceLineNo">223</span> /**<a name="line.223"></a> -<span class="sourceLineNo">224</span> * Valid namespace characters are alphabetic characters, numbers, and underscores.<a name="line.224"></a> -<span class="sourceLineNo">225</span> */<a name="line.225"></a> -<span class="sourceLineNo">226</span> public static void isLegalNamespaceName(final byte[] namespaceName,<a name="line.226"></a> -<span class="sourceLineNo">227</span> final int start,<a name="line.227"></a> -<span class="sourceLineNo">228</span> final int end) {<a name="line.228"></a> -<span class="sourceLineNo">229</span> if(end - start < 1) {<a name="line.229"></a> -<span class="sourceLineNo">230</span> throw new IllegalArgumentException("Namespace name must not be empty");<a name="line.230"></a> -<span class="sourceLineNo">231</span> }<a name="line.231"></a> -<span class="sourceLineNo">232</span> String nsString = new String(namespaceName, start, (end - start), StandardCharsets.UTF_8);<a name="line.232"></a> -<span class="sourceLineNo">233</span> if (nsString.equals(DISALLOWED_TABLE_NAME)) {<a name="line.233"></a> -<span class="sourceLineNo">234</span> // Per https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel<a name="line.234"></a> -<span class="sourceLineNo">235</span> // A znode named "zookeeper" is disallowed by zookeeper.<a name="line.235"></a> -<span class="sourceLineNo">236</span> throw new IllegalArgumentException("Tables may not be named '" + DISALLOWED_TABLE_NAME + "'");<a name="line.236"></a> -<span class="sourceLineNo">237</span> }<a name="line.237"></a> -<span class="sourceLineNo">238</span> for (int i = 0; i < nsString.length(); i++) {<a name="line.238"></a> -<span class="sourceLineNo">239</span> // Treat the string as a char-array as some characters may be multi-byte<a name="line.239"></a> -<span class="sourceLineNo">240</span> char c = nsString.charAt(i);<a name="line.240"></a> -<span class="sourceLineNo">241</span> // ZooKeeper also has limitations, but Character.isAlphabetic omits those all<a name="line.241"></a> -<span class="sourceLineNo">242</span> // See https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel<a name="line.242"></a> -<span class="sourceLineNo">243</span> if (Character.isAlphabetic(c) || Character.isDigit(c)|| c == '_') {<a name="line.243"></a> -<span class="sourceLineNo">244</span> continue;<a name="line.244"></a> -<span class="sourceLineNo">245</span> }<a name="line.245"></a> -<span class="sourceLineNo">246</span> throw new IllegalArgumentException("Illegal character <" + c +<a name="line.246"></a> -<span class="sourceLineNo">247</span> "> at " + i + ". Namespaces may only contain " +<a name="line.247"></a> -<span class="sourceLineNo">248</span> "'alphanumeric characters' from any language and digits: " + nsString);<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><a name="line.251"></a> -<span class="sourceLineNo">252</span> public byte[] getName() {<a name="line.252"></a> -<span class="sourceLineNo">253</span> return name;<a name="line.253"></a> -<span class="sourceLineNo">254</span> }<a name="line.254"></a> -<span class="sourceLineNo">255</span><a name="line.255"></a> -<span class="sourceLineNo">256</span> public String getNameAsString() {<a name="line.256"></a> -<span class="sourceLineNo">257</span> return nameAsString;<a name="line.257"></a> -<span class="sourceLineNo">258</span> }<a name="line.258"></a> -<span class="sourceLineNo">259</span><a name="line.259"></a> -<span class="sourceLineNo">260</span> public byte[] getNamespace() {<a name="line.260"></a> -<span class="sourceLineNo">261</span> return namespace;<a name="line.261"></a> -<span class="sourceLineNo">262</span> }<a name="line.262"></a> -<span class="sourceLineNo">263</span><a name="line.263"></a> -<span class="sourceLineNo">264</span> public String getNamespaceAsString() {<a name="line.264"></a> -<span class="sourceLineNo">265</span> return namespaceAsString;<a name="line.265"></a> -<span class="sourceLineNo">266</span> }<a name="line.266"></a> -<span class="sourceLineNo">267</span><a name="line.267"></a> -<span class="sourceLineNo">268</span> /**<a name="line.268"></a> -<span class="sourceLineNo">269</span> * Ideally, getNameAsString should contain namespace within it,<a name="line.269"></a> -<span class="sourceLineNo">270</span> * but if the namespace is default, it just returns the name. This method<a name="line.270"></a> -<span class="sourceLineNo">271</span> * takes care of this corner case.<a name="line.271"></a> -<span class="sourceLineNo">272</span> */<a name="line.272"></a> -<span class="sourceLineNo">273</span> public String getNameWithNamespaceInclAsString() {<a name="line.273"></a> -<span class="sourceLineNo">274</span> if(getNamespaceAsString().equals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR)) {<a name="line.274"></a> -<span class="sourceLineNo">275</span> return NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR +<a name="line.275"></a> -<span class="sourceLineNo">276</span> TableName.NAMESPACE_DELIM + getNameAsString();<a name="line.276"></a> -<span class="sourceLineNo">277</span> }<a name="line.277"></a> -<span class="sourceLineNo">278</span> return getNameAsString();<a name="line.278"></a> -<span class="sourceLineNo">279</span> }<a name="line.279"></a> -<span class="sourceLineNo">280</span><a name="line.280"></a> -<span class="sourceLineNo">281</span> public byte[] getQualifier() {<a name="line.281"></a> -<span class="sourceLineNo">282</span> return qualifier;<a name="line.282"></a> -<span class="sourceLineNo">283</span> }<a name="line.283"></a> -<span class="sourceLineNo">284</span><a name="line.284"></a> -<span class="sourceLineNo">285</span> public String getQualifierAsString() {<a name="line.285"></a> -<span class="sourceLineNo">286</span> return qualifierAsString;<a name="line.286"></a> -<span class="sourceLineNo">287</span> }<a name="line.287"></a> -<span class="sourceLineNo">288</span><a name="line.288"></a> -<span class="sourceLineNo">289</span> public byte[] toBytes() {<a name="line.289"></a> -<span class="sourceLineNo">290</span> return name;<a name="line.290"></a> -<span class="sourceLineNo">291</span> }<a name="line.291"></a> -<span class="sourceLineNo">292</span><a name="line.292"></a> -<span class="sourceLineNo">293</span> public boolean isSystemTable() {<a name="line.293"></a> -<span class="sourceLineNo">294</span> return systemTable;<a name="line.294"></a> -<span class="sourceLineNo">295</span> }<a name="line.295"></a> -<span class="sourceLineNo">296</span><a name="line.296"></a> -<span class="sourceLineNo">297</span> @Override<a name="line.297"></a> -<span class="sourceLineNo">298</span> public String toString() {<a name="line.298"></a> -<span class="sourceLineNo">299</span> return nameAsString;<a name="line.299"></a> -<span class="sourceLineNo">300</span> }<a name="line.300"></a> -<span class="sourceLineNo">301</span><a name="line.301"></a> -<span class="sourceLineNo">302</span> /**<a name="line.302"></a> -<span class="sourceLineNo">303</span> *<a name="line.303"></a> -<span class="sourceLineNo">304</span> * @throws IllegalArgumentException See {@link #valueOf(byte[])}<a name="line.304"></a> -<span class="sourceLineNo">305</span> */<a name="line.305"></a> -<span class="sourceLineNo">306</span> private TableName(ByteBuffer namespace, ByteBuffer qualifier) throws IllegalArgumentException {<a name="line.306"></a> -<span class="sourceLineNo">307</span> this.qualifier = new byte[qualifier.remaining()];<a name="line.307"></a> -<span class="sourceLineNo">308</span> qualifier.duplicate().get(this.qualifier);<a name="line.308"></a> -<span class="sourceLineNo">309</span> this.qualifierAsString = Bytes.toString(this.qualifier);<a name="line.309"></a> -<span class="sourceLineNo">310</span><a name="line.310"></a> -<span class="sourceLineNo">311</span> if (qualifierAsString.equals(OLD_ROOT_STR)) {<a name="line.311"></a> -<span class="sourceLineNo">312</span> throw new IllegalArgumentException(OLD_ROOT_STR + " has been deprecated.");<a name="line.312"></a> -<span class="sourceLineNo">313</span> }<a name="line.313"></a> -<span class="sourceLineNo">314</span> if (qualifierAsString.equals(OLD_META_STR)) {<a name="line.314"></a> -<span class="sourceLineNo">315</span> throw new IllegalArgumentException(OLD_META_STR + " no longer exists. The table has been " +<a name="line.315"></a> -<span class="sourceLineNo">316</span> "renamed to " + META_TABLE_NAME);<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> if (Bytes.equals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME, namespace)) {<a name="line.319"></a> -<span class="sourceLineNo">320</span> // Using the same objects: this will make the comparison faster later<a name="line.320"></a> -<span class="sourceLineNo">321</span> this.namespace = NamespaceDescriptor.DEFAULT_NAMESPACE_NAME;<a name="line.321"></a> -<span class="sourceLineNo">322</span> this.namespaceAsString = NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR;<a name="line.322"></a> -<span class="sourceLineNo">323</span> this.systemTable = false;<a name="line.323"></a> -<span class="sourceLineNo">324</span><a name="line.324"></a> -<span class="sourceLineNo">325</span> // The name does not include the namespace when it's the default one.<a name="line.325"></a> -<span class="sourceLineNo">326</span> this.nameAsString = qualifierAsString;<a name="line.326"></a> -<span class="sourceLineNo">327</span> this.name = this.qualifier;<a name="line.327"></a> -<span class="sourceLineNo">328</span> } else {<a name="line.328"></a> -<span class="sourceLineNo">329</span> if (Bytes.equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME, namespace)) {<a name="line.329"></a> -<span class="sourceLineNo">330</span> this.namespace = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME;<a name="line.330"></a> -<span class="sourceLineNo">331</span> this.namespaceAsString = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR;<a name="line.331"></a> -<span class="sourceLineNo">332</span> this.systemTable = true;<a name="line.332"></a> -<span class="sourceLineNo">333</span> } else {<a name="line.333"></a> -<span class="sourceLineNo">334</span> this.namespace = new byte[namespace.remaining()];<a name="line.334"></a> -<span class="sourceLineNo">335</span> namespace.duplicate().get(this.namespace);<a name="line.335"></a> -<span class="sourceLineNo">336</span> this.namespaceAsString = Bytes.toString(this.namespace);<a name="line.336"></a> -<span class="sourceLineNo">337</span> this.systemTable = false;<a name="line.337"></a> -<span class="sourceLineNo">338</span> }<a name="line.338"></a> -<span class="sourceLineNo">339</span> this.nameAsString = namespaceAsString + NAMESPACE_DELIM + qualifierAsString;<a name="line.339"></a> -<span class="sourceLineNo">340</span> this.name = Bytes.toBytes(nameAsString);<a name="line.340"></a> -<span class="sourceLineNo">341</span> }<a name="line.341"></a> -<span class="sourceLineNo">342</span><a name="line.342"></a> -<span class="sourceLineNo">343</span> this.hashCode = nameAsString.hashCode();<a name="line.343"></a> -<span class="sourceLineNo">344</span><a name="line.344"></a> -<span class="sourceLineNo">345</span> isLegalNamespaceName(this.namespace);<a name="line.345"></a> -<span class="sourceLineNo">346</span> isLegalTableQualifierName(this.qualifier);<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> /**<a name="line.349"></a> -<span class="sourceLineNo">350</span> * This is only for the old and meta tables.<a name="line.350"></a> -<span class="sourceLineNo">351</span> */<a name="line.351"></a> -<span class="sourceLineNo">352</span> private TableName(String qualifier) {<a name="line.352"></a> -<span class="sourceLineNo">353</span> this.qualifier = Bytes.toBytes(qualifier);<a name="line.353"></a> -<span class="sourceLineNo">354</span> this.qualifierAsString = qualifier;<a name="line.354"></a> -<span class="sourceLineNo">355</span><a name="line.355"></a> -<span class="sourceLineNo">356</span> this.namespace = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME;<a name="line.356"></a> -<span class="sourceLineNo">357</span> this.namespaceAsString = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR;<a name="line.357"></a> -<span class="sourceLineNo">358</span> this.systemTable = true;<a name="line.358"></a> -<span class="sourceLineNo">359</span><a name="line.359"></a> -<span class="sourceLineNo">360</span> // WARNING: nameAsString is different than name for old meta & root!<a name="line.360"></a> -<span class="sourceLineNo">361</span> // This is by design.<a name="line.361"></a> -<span class="sourceLineNo">362</span> this.nameAsString = namespaceAsString + NAMESPACE_DELIM + qualifierAsString;<a name="line.362"></a> -<span class="sourceLineNo">363</span> this.name = this.qualifier;<a name="line.363"></a> -<span class="sourceLineNo">364</span><a name="line.364"></a> -<span class="sourceLineNo">365</span> this.hashCode = nameAsString.hashCode();<a name="line.365"></a> -<span class="sourceLineNo">366</span> }<a name="line.366"></a> -<span class="sourceLineNo">367</span><a name="line.367"></a> +<span class="sourceLineNo">166</span><a name="line.166"></a> +<span class="sourceLineNo">167</span> /**<a name="line.167"></a> +<span class="sourceLineNo">168</span> * Qualifier names can only contain 'word' characters<a name="line.168"></a> +<span class="sourceLineNo">169</span> * <code>[\p{IsAlphabetic}\p{Digit}]</code> or '_', '.' or '-'.<a name="line.169"></a> +<span class="sourceLineNo">170</span> * The name may not start with '.' or '-'.<a name="line.170"></a> +<span class="sourceLineNo">171</span> *<a name="line.171"></a> +<span class="sourceLineNo">172</span> * @param qualifierName byte array containing the qualifier name<a name="line.172"></a> +<span class="sourceLineNo">173</span> * @param start start index<a name="line.173"></a> +<span class="sourceLineNo">174</span> * @param end end index (exclusive)<a name="line.174"></a> +<span class="sourceLineNo">175</span> */<a name="line.175"></a> +<span class="sourceLineNo">176</span> public static void isLegalTableQualifierName(final byte[] qualifierName,<a name="line.176"></a> +<span class="sourceLineNo">177</span> int start,<a name="line.177"></a> +<span class="sourceLineNo">178</span> int end) {<a name="line.178"></a> +<span class="sourceLineNo">179</span> isLegalTableQualifierName(qualifierName, start, end, false);<a name="line.179"></a> +<span class="sourceLineNo">180</span> }<a name="line.180"></a> +<span class="sourceLineNo">181</span><a name="line.181"></a> +<span class="sourceLineNo">182</span> public static void isLegalTableQualifierName(final byte[] qualifierName,<a name="line.182"></a> +<span class="sourceLineNo">183</span> int start,<a name="line.183"></a> +<span class="sourceLineNo">184</span> int end,<a name="line.184"></a> +<span class="sourceLineNo">185</span> boolean isSnapshot) {<a name="line.185"></a> +<span class="sourceLineNo">186</span> if(end - start < 1) {<a name="line.186"></a> +<span class="sourceLineNo">187</span> throw new IllegalArgumentException(isSnapshot ? "Snapshot" : "Table" + " qualifier must not be empty");<a name="line.187"></a> +<span class="sourceLineNo">188</span> }<a name="line.188"></a> +<span class="sourceLineNo">189</span> if (qualifierName[start] == '.' || qualifierName[start] == '-') {<a name="line.189"></a> +<span class="sourceLineNo">190</span> throw new IllegalArgumentException("Illegal first character <" + qualifierName[start] +<a name="line.190"></a> +<span class="sourceLineNo">191</span> "> at 0. " + (isSnapshot ? "Snapshot" : "User-space table") +<a name="line.191"></a> +<span class="sourceLineNo">192</span> " qualifiers can only start with 'alphanumeric " +<a name="line.192"></a> +<span class="sourceLineNo">193</span> "characters' from any language: " +<a name="line.193"></a> +<span class="sourceLineNo">194</span> Bytes.toString(qualifierName, start, end));<a name="line.194"></a> +<span class="sourceLineNo">195</span> }<a name="line.195"></a> +<span class="sourceLineNo">196</span> // Treat the bytes as UTF-8<a name="line.196"></a> +<span class="sourceLineNo">197</span> String qualifierString = new String(<a name="line.197"></a> +<span class="sourceLineNo">198</span> qualifierName, start, (end - start), StandardCharsets.UTF_8);<a name="line.198"></a> +<span class="sourceLineNo">199</span> if (qualifierString.equals(DISALLOWED_TABLE_NAME)) {<a name="line.199"></a> +<span class="sourceLineNo">200</span> // Per https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel<a name="line.200"></a> +<span class="sourceLineNo">201</span> // A znode named "zookeeper" is disallowed by zookeeper.<a name="line.201"></a> +<span class="sourceLineNo">202</span> throw new IllegalArgumentException("Tables may not be named '" + DISALLOWED_TABLE_NAME + "'");<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 < qualifierString.length(); i++) {<a name="line.204"></a> +<span class="sourceLineNo">205</span> // Treat the string as a char-array as some characters may be multi-byte<a name="line.205"></a> +<span class="sourceLineNo">206</span> char c = qualifierString.charAt(i);<a name="line.206"></a> +<span class="sourceLineNo">207</span> // Check for letter, digit, underscore, hyphen, or period, and allowed by ZK.<a name="line.207"></a> +<span class="sourceLineNo">208</span> // ZooKeeper also has limitations, but Character.isAlphabetic omits those all<a name="line.208"></a> +<span class="sourceLineNo">209</span> // See https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel<a name="line.209"></a> +<span class="sourceLineNo">210</span> if (Character.isAlphabetic(c) || Character.isDigit(c) || c == '_' || c == '-' || c == '.') {<a name="line.210"></a> +<span class="sourceLineNo">211</span> continue;<a name="line.211"></a> +<span class="sourceLineNo">212</span> }<a name="line.212"></a> +<span class="sourceLineNo">213</span> throw new IllegalArgumentException("Illegal character code:" + (int) c + ", <" + c + "> at " +<a name="line.213"></a> +<span class="sourceLineNo">214</span> i + ". " + (isSnapshot ? "Snapshot" : "User-space table") +<a name="line.214"></a> +<span class="sourceLineNo">215</span> " qualifiers may only contain 'alphanumeric characters' and digits: " +<a name="line.215"></a> +<span class="sourceLineNo">216</span> qualifierString);<a name="line.216"></a> +<span class="sourceLineNo">217</span> }<a name="line.217"></a> +<span class="sourceLineNo">218</span> }<a name="line.218"></a> +<span class="sourceLineNo">219</span><a name="line.219"></a> +<span class="sourceLineNo">220</span> public static void isLegalNamespaceName(byte[] namespaceName) {<a name="line.220"></a> +<span class="sourceLineNo">221</span> isLegalNamespaceName(namespaceName, 0, namespaceName.length);<a name="line.221"></a> +<span class="sourceLineNo">222</span> }<a name="line.222"></a> +<span class="sourceLineNo">223</span><a name="line.223"></a> +<span class="sourceLineNo">224</span> /**<a name="line.224"></a> +<span class="sourceLineNo">225</span> * Valid namespace characters are alphabetic characters, numbers, and underscores.<a name="line.225"></a> +<span class="sourceLineNo">226</span> */<a name="line.226"></a> +<span class="sourceLineNo">227</span> public static void isLegalNamespaceName(final byte[] namespaceName,<a name="line.227"></a> +<span class="sourceLineNo">228</span> final int start,<a name="line.228"></a> +<span class="sourceLineNo">229</span> final int end) {<a name="line.229"></a> +<span class="sourceLineNo">230</span> if(end - start < 1) {<a name="line.230"></a> +<span class="sourceLineNo">231</span> throw new IllegalArgumentException("Namespace name must not be empty");<a name="line.231"></a> +<span class="sourceLineNo">232</span> }<a name="line.232"></a> +<span class="sourceLineNo">233</span> String nsString = new String(namespaceName, start, (end - start), StandardCharsets.UTF_8);<a name="line.233"></a> +<span class="sourceLineNo">234</span> if (nsString.equals(DISALLOWED_TABLE_NAME)) {<a name="line.234"></a> +<span class="sourceLineNo">235</span> // Per https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel<a name="line.235"></a> +<span class="sourceLineNo">236</span> // A znode named "zookeeper" is disallowed by zookeeper.<a name="line.236"></a> +<span class="sourceLineNo">237</span> throw new IllegalArgumentException("Tables may not be named '" + DISALLOWED_TABLE_NAME + "'");<a name="line.237"></a> +<span class="sourceLineNo">238</span> }<a name="line.238"></a> +<span class="sourceLineNo">239</span> for (int i = 0; i < nsString.length(); i++) {<a name="line.239"></a> +<span class="sourceLineNo">240</span> // Treat the string as a char-array as some characters may be multi-byte<a name="line.240"></a> +<span class="sourceLineNo">241</span> char c = nsString.charAt(i);<a name="line.241"></a> +<span class="sourceLineNo">242</span> // ZooKeeper also has limitations, but Character.isAlphabetic omits those all<a name="line.242"></a> +<span class="sourceLineNo">243</span> // See https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel<a name="line.243"></a> +<span class="sourceLineNo">244</span> if (Character.isAlphabetic(c) || Character.isDigit(c)|| c == '_') {<a name="line.244"></a> +<span class="sourceLineNo">245</span> continue;<a name="line.245"></a> +<span class="sourceLineNo">246</span> }<a name="line.246"></a> +<span class="sourceLineNo">247</span> throw new IllegalArgumentException("Illegal character <" + c +<a name="line.247"></a> +<span class="sourceLineNo">248</span> "> at " + i + ". Namespaces may only contain " +<a name="line.248"></a> +<span class="sourceLineNo">249</span> "'alphanumeric characters' from any language and digits: " + nsString);<a name="line.249"></a> +<span class="sourceLineNo">250</span> }<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> public byte[] getName() {<a name="line.253"></a> +<span class="sourceLineNo">254</span> return name;<a name="line.254"></a> +<span class="sourceLineNo">255</span> }<a name="line.255"></a> +<span class="sourceLineNo">256</span><a name="line.256"></a> +<span class="sourceLineNo">257</span> public String getNameAsString() {<a name="line.257"></a> +<span class="sourceLineNo">258</span> return nameAsString;<a name="line.258"></a> +<span class="sourceLineNo">259</span> }<a name="line.259"></a> +<span class="sourceLineNo">260</span><a name="line.260"></a> +<span class="sourceLineNo">261</span> public byte[] getNamespace() {<a name="line.261"></a> +<span class="sourceLineNo">262</span> return namespace;<a name="line.262"></a> +<span class="sourceLineNo">263</span> }<a name="line.263"></a> +<span class="sourceLineNo">264</span><a name="line.264"></a> +<span class="sourceLineNo">265</span> public String getNamespaceAsString() {<a name="line.265"></a> +<span class="sourceLineNo">266</span> return namespaceAsString;<a name="line.266"></a> +<span class="sourceLineNo">267</span> }<a name="line.267"></a> +<span class="sourceLineNo">268</span><a name="line.268"></a> +<span class="sourceLineNo">269</span> /**<a name="line.269"></a> +<span class="sourceLineNo">270</span> * Ideally, getNameAsString should contain namespace within it,<a name="line.270"></a> +<span class="sourceLineNo">271</span> * but if the namespace is default, it just returns the name. This method<a name="line.271"></a> +<span class="sourceLineNo">272</span> * takes care of this corner case.<a name="line.272"></a> +<span class="sourceLineNo">273</span> */<a name="line.273"></a> +<span class="sourceLineNo">274</span> public String getNameWithNamespaceInclAsString() {<a name="line.274"></a> +<span class="sourceLineNo">275</span> if(getNamespaceAsString().equals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR)) {<a name="line.275"></a> +<span class="sourceLineNo">276</span> return NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR +<a name="line.276"></a> +<span class="sourceLineNo">277</span> TableName.NAMESPACE_DELIM + getNameAsString();<a name="line.277"></a> +<span class="sourceLineNo">278</span> }<a name="line.278"></a> +<span class="sourceLineNo">279</span> return getNameAsString();<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> public byte[] getQualifier() {<a name="line.282"></a> +<span class="sourceLineNo">283</span> return qualifier;<a name="line.283"></a> +<span class="sourceLineNo">284</span> }<a name="line.284"></a> +<span class="sourceLineNo">285</span><a name="line.285"></a> +<span class="sourceLineNo">286</span> public String getQualifierAsString() {<a name="line.286"></a> +<span class="sourceLineNo">287</span> return qualifierAsString;<a name="line.287"></a> +<span class="sourceLineNo">288</span> }<a name="line.288"></a> +<span class="sourceLineNo">289</span><a name="line.289"></a> +<span class="sourceLineNo">290</span> public byte[] toBytes() {<a name="line.290"></a> +<span class="sourceLineNo">291</span> return name;<a name="line.291"></a> +<span class="sourceLineNo">292</span> }<a name="line.292"></a> +<span class="sourceLineNo">293</span><a name="line.293"></a> +<span class="sourceLineNo">294</span> public boolean isSystemTable() {<a name="line.294"></a> +<span class="sourceLineNo">295</span> return systemTable;<a name="line.295"></a> +<span class="sourceLineNo">296</span> }<a name="line.296"></a> +<span class="sourceLineNo">297</span><a name="line.297"></a> +<span class="sourceLineNo">298</span> @Override<a name="line.298"></a> +<span class="sourceLineNo">299</span> public String toString() {<a name="line.299"></a> +<span class="sourceLineNo">300</span> return nameAsString;<a name="line.300"></a> +<span class="sourceLineNo">301</span> }<a name="line.301"></a> +<span class="sourceLineNo">302</span><a name="line.302"></a> +<span class="sourceLineNo">303</span> /**<a name="line.303"></a> +<span class="sourceLineNo">304</span> *<a name="line.304"></a> +<span class="sourceLineNo">305</span> * @throws IllegalArgumentException See {@link #valueOf(byte[])}<a name="line.305"></a> +<span class="sourceLineNo">306</span> */<a name="line.306"></a> +<span class="sourceLineNo">307</span> private TableName(ByteBuffer namespace, ByteBuffer qualifier) throws IllegalArgumentException {<a name="line.307"></a> +<span class="sourceLineNo">308</span> this.qualifier = new byte[qualifier.remaining()];<a name="line.308"></a> +<span class="sourceLineNo">309</span> qualifier.duplicate().get(this.qualifier);<a name="line.309"></a> +<span class="sourceLineNo">310</span> this.qualifierAsString = Bytes.toString(this.qualifier);<a name="line.310"></a> +<span class="sourceLineNo">311</span><a name="line.311"></a> +<span class="sourceLineNo">312</span> if (qualifierAsString.equals(OLD_ROOT_STR)) {<a name="line.312"></a> +<span class="sourceLineNo">313</span> throw new IllegalArgumentException(OLD_ROOT_STR + " has been deprecated.");<a name="line.313"></a> +<span class="sourceLineNo">314</span> }<a name="line.314"></a> +<span class="sourceLineNo">315</span> if (qualifierAsString.equals(OLD_META_STR)) {<a name="line.315"></a> +<span class="sourceLineNo">316</span> throw new IllegalArgumentException(OLD_META_STR + " no longer exists. The table has been " +<a name="line.316"></a> +<span class="sourceLineNo">317</span> "renamed to " + META_TABLE_NAME);<a name="line.317"></a> +<span class="sourceLineNo">318</span> }<a name="line.318"></a> +<span class="sourceLineNo">319</span><a name="line.319"></a> +<span class="sourceLineNo">320</span> if (Bytes.equals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME, namespace)) {<a name="line.320"></a> +<span class="sourceLineNo">321</span> // Using the same objects: this will make the comparison faster later<a name="line.321"></a> +<span class="sourceLineNo">322</span> this.namespace = NamespaceDescriptor.DEFAULT_NAMESPACE_NAME;<a name="line.322"></a> +<span class="sourceLineNo">323</span> this.namespaceAsString = NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR;<a name="line.323"></a> +<span class="sourceLineNo">324</span> this.systemTable = false;<a name="line.324"></a> +<span class="sourceLineNo">325</span><a name="line.325"></a> +<span class="sourceLineNo">326</span> // The name does not include the namespace when it's the default one.<a name="line.326"></a> +<span class="sourceLineNo">327</span> this.nameAsString = qualifierAsString;<a name="line.327"></a> +<span class="sourceLineNo">328</span> this.name = this.qualifier;<a name="line.328"></a> +<span class="sourceLineNo">329</span> } else {<a name="line.329"></a> +<span class="sourceLineNo">330</span> if (Bytes.equals(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME, namespace)) {<a name="line.330"></a> +<span class="sourceLineNo">331</span> this.namespace = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME;<a name="line.331"></a> +<span class="sourceLineNo">332</span> this.namespaceAsString = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR;<a name="line.332"></a> +<span class="sourceLineNo">333</span> this.systemTable = true;<a name="line.333"></a> +<span class="sourceLineNo">334</span> } else {<a name="line.334"></a> +<span class="sourceLineNo">335</span> this.namespace = new byte[namespace.remaining()];<a name="line.335"></a> +<span class="sourceLineNo">336</span> namespace.duplicate().get(this.namespace);<a name="line.336"></a> +<span class="sourceLineNo">337</span> this.namespaceAsString = Bytes.toString(this.namespace);<a name="line.337"></a> +<span class="sourceLineNo">338</span> this.systemTable = false;<a name="line.338"></a> +<span class="sourceLineNo">339</span> }<a name="line.339"></a> +<span class="sourceLineNo">340</span> this.nameAsString = namespaceAsString + NAMESPACE_DELIM + qualifierAsString;<a name="line.340"></a> +<span class="sourceLineNo">341</span> this.name = Bytes.toBytes(nameAsString);<a name="line.341"></a> +<span class="sourceLineNo">342</span> }<a name="line.342"></a> +<span class="sourceLineNo">343</span><a name="line.343"></a> +<span class="sourceLineNo">344</span> this.hashCode = nameAsString.hashCode();<a name="line.344"></a> +<span class="sourceLineNo">345</span><a name="line.345"></a> +<span class="sourceLineNo">346</span> isLegalNamespaceName(this.namespace);<a name="line.346"></a> +<span class="sourceLineNo">347</span> isLegalTableQualifierName(this.qualifier);<a name="line.347"></a> +<span class="sourceLineNo">348</span> }<a name="line.348"></a> +<span class="sourceLineNo">349</span><a name="line.349"></a> +<span class="sourceLineNo">350</span> /**<a name="line.350"></a> +<span class="sourceLineNo">351</span> * This is only for the old and meta tables.<a name="line.351"></a> +<span class="sourceLineNo">352</span> */<a name="line.352"></a> +<span class="sourceLineNo">353</span> private TableName(String qualifier) {<a name="line.353"></a> +<span class="sourceLineNo">354</span> this.qualifier = Bytes.toBytes(qualifier);<a name="line.354"></a> +<span class="sourceLineNo">355</span> this.qualifierAsString = qualifier;<a name="line.355"></a> +<span class="sourceLineNo">356</span><a name="line.356"></a> +<span class="sourceLineNo">357</span> this.namespace = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME;<a name="line.357"></a> +<span class="sourceLineNo">358</span> this.namespaceAsString = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR;<a name="line.358"></a> +<span class="sourceLineNo">359</span> this.systemTable = true;<a name="line.359"></a> +<span class="sourceLineNo">360</span><a name="line.360"></a> +<span class="sourceLineNo">361</span> // WARNING: nameAsString is different than name for old meta & root!<a name="line.361"></a> +<span class="sourceLineNo">362</span> // This is by design.<a name="line.362"></a> +<span class="sourceLineNo">363</span> this.nameAsString = namespaceAsString + NAMESPACE_DELIM + qualifierAsString;<a name="line.363"></a> +<span class="sourceLineNo">364</span> this.name = this.qualifier;<a name="line.364"></a> +<span class="sourceLineNo">365</span><a name="line.365"></a> +<span class="sourceLineNo">366</span> this.hashCode = nameAsString.hashCode();<a name="line.366"></a> +<span class="sourceLineNo">367</span> }<a name="line.367"></a> <span class="sourceLineNo">368</span><a name="line.368"></a> -<span class="sourceLineNo">369</span> /**<a name="line.369"></a> -<span class="sourceLineNo">370</span> * Check that the object does not exist already. There are two reasons for creating the objects<a name="line.370"></a> -<span class="sourceLineNo">371</span> * only once:<a name="line.371"></a> -<span class="sourceLineNo">372</span> * 1) With 100K regions, the table names take ~20MB.<a name="line.372"></a> -<span class="sourceLineNo">373</span> * 2) Equals becomes much faster as it's resolved with a reference and an int comparison.<a name="line.373"></a> -<span class="sourceLineNo">374</span> */<a name="line.374"></a> -<span class="sourceLineNo">375</span> private static TableName createTableNameIfNecessary(ByteBuffer bns, ByteBuffer qns) {<a name="line.375"></a> -<span class="sourceLineNo">376</span> for (TableName tn : tableCache) {<a name="line.376"></a> -<span class="sourceLineNo">377</span> if (Bytes.equals(tn.getQualifier(), qns) && Bytes.equals(tn.getNamespace(), bns)) {<a name="line.377"></a> -<span class="sourceLineNo">378</span> return tn;<a name="line.378"></a> -<span class="sourceLineNo">379</span> }<a name="line.379"></a> -<span class="sourceLineNo">380</span> }<a name="line.380"></a> -<span class="sourceLineNo">381</span><a name="line.381"></a> -<span class="sourceLineNo">382</span> TableName newTable = new TableName(bns, qns);<a name="line.382"></a> -<span class="sourceLineNo">383</span> if (tableCache.add(newTable)) { // Adds the specified element if it is not already present<a name="line.383"></a> -<span class="sourceLineNo">384</span> return newTable;<a name="line.384"></a> -<span class="sourceLineNo">385</span> }<a name="line.385"></a> -<span class="sourceLineNo">386</span><a name="line.386"></a> -<span class="sourceLineNo">387</span> // Someone else added it. Let's find it.<a name="line.387"></a> -<span class="sourceLineNo">388</span> for (TableName tn : tableCache) {<a name="line.388"></a> -<span class="sourceLineNo">389</span> if (Bytes.equals(tn.getQualifier(), qns) && Bytes.equals(tn.getNamespace(), bns)) {<a name="line.389"></a> -<span class="sourceLineNo">390</span> return tn;<a name="line.390"></a> -<span class="sourceLineNo">391</span> }<a name="line.391"></a> -<span class="sourceLineNo">392</span> }<a name="line.392"></a> -<span class="sourceLineNo">393</span> // this should never happen.<a name="line.393"></a> -<span class="sourceLineNo">394</span> throw new IllegalStateException(newTable + " was supposed to be in the cache");<a name="line.394"></a> -<span class="sourceLineNo">395</span> }<a name="line.395"></a> -<span class="sourceLineNo">396</span><a name="line.396"></a> +<span class="sourceLineNo">369</span><a name="line.369"></a> +<span class="sourceLineNo">370</span> /**<a name="line.370"></a> +<span class="sourceLineNo">371</span> * Check that the object does not exist already. There are two reasons for creating the objects<a name="line.371"></a> +<span class="sourceLineNo">372</span> * only once:<a name="line.372"></a> +<span class="sourceLineNo">373</span> * 1) With 100K regions, the table names take ~20MB.<a name="line.373"></a> +<span class="sourceLineNo">374</span> * 2) Equals becomes much faster as it's resolved with a reference and an int comparison.<a name="line.374"></a> +<span class="sourceLineNo">375</span> */<a name="line.375"></a> +<span class="sourceLineNo">376</span> private static TableName createTableNameIfNecessary(ByteBuffer bns, ByteBuffer qns) {<a name="line.376"></a> +<span class="sourceLineNo">377</span> for (TableName tn : tableCache) {<a name="line.377"></a> +<span class="sourceLineNo">378</span> if (Bytes.equals(tn.getQualifier(), qns) && Bytes.equals(tn.getNamespace(), bns)) {<a name="line.378"></a> +<span class="sourceLineNo">379</span> return tn;<a name="line.379"></a> +<span class="sourceLineNo">380</span> }<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> TableName newTable = new TableName(bns, qns);<a name="line.383"></a> +<span class="sourceLineNo">384</span> if (tableCache.add(newTable)) { // Adds the specified element if it is not already present<a name="line.384"></a> +<span class="sourceLineNo">385</span> return newTable;<a name="line.385"></a> +<span class="sourceLineNo">386</span> }<a name="line.386"></a> +<span class="sourceLineNo">387</span><a name="line.387"></a> +<span class="sourceLineNo">388</span> // Someone else added it. Let's find it.<a name="line.388"></a> +<span class="sourceLineNo">389</span> for (TableName tn : tableCache) {<a name="line.389"></a> +<span class="sourceLineNo">390</span> if (Bytes.equals(tn.getQualifier(), qns) && Bytes.equals(tn.getNamespace(), bns)) {<a name="line.390"></a> +<span class="sourceLineNo">391</span> return tn;<a name="line.391"></a> +<span class="sourceLineNo">392</span> }<a name="line.392"></a> +<span class="sourceLineNo">393</span> }<a name="line.393"></a> +<span class="sourceLineNo">394</span> // this should never happen.<a name="line.394"></a> +<span class="sourceLineNo">395</span> throw new IllegalStateException(newTable + " was supposed to be in the cache");<a name="line.395"></a> +<span class="sourceLineNo">396</span> }<a name="line.396"></a> <span class="sourceLineNo">397</span><a name="line.397"></a> -<span class="sourceLineNo">398</span> /**<a name="line.398"></a> -<span class="sourceLineNo">399</span> * It is used to create table names for old META, and ROOT table.<a name="line.399"></a> -<span class="sourceLineNo">400</span> * These tables are not really legal tables. They are not added into the cache.<a name="line.400"></a> -<span class="sourceLineNo">401</span> * @return a dummy TableName instance (with no validation) for the passed qualifier<a name="line.401"></a> -<span class="sourceLineNo">402</span> */<a name="line.402"></a> -<span class="sourceLineNo">403</span> private static TableName getADummyTableName(String qualifier) {<a name="line.403"></a> -<span class="sourceLineNo">404</span> return new TableName(qualifier);<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">398</span><a name="line.398"></a> +<span class="sourceLineNo">399</span> /**<a name="line.399"></a> +<span class="sourceLineNo">400</span> * It is used to create table names for old META, and ROOT table.<a name="line.400"></a> +<span class="sourceLineNo">401</span> * These tables are not really legal tables. They are not added into the cache.<a name="line.401"></a> +<span class="sourceLineNo">402</span> * @return a dummy TableName instance (with no validation) for the passed qualifier<a name="line.402"></a> +<span class="sourceLineNo">403</span> */<a name="line.403"></a> +<span class="sourceLineNo">404</span> private static TableName getADummyTableName(String qualifier) {<a name="line.404"></a> +<span class="sourceLineNo">405</span> return new TableName(qualifier);<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> public static TableName valueOf(String namespaceAsString, String qualifierAsString) {<a name="line.408"></a> -<span class="sourceLineNo">409</span> if (namespaceAsString == null || namespaceAsString.length() < 1) {<a name="line.409"></a> -<span class="sourceLineNo">410</span> namespaceAsString = NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR;<a name="line.410"></a> -<span class="sourceLineNo">411</span> }<a name="line.411"></a> -<span class="sourceLineNo">412</span><a name="line.412"></a> -<span class="sourceLineNo">413</span> for (TableName tn : tableCache) {<a name="line.413"></a> -<span class="sourceLineNo">414</span> if (qualifierAsString.equals(tn.getQualifierAsString()) &&<a name="line.414"></a> -<span class="sourceLineNo">415</span> namespaceAsString.equals(tn.getNameAsString())) {<a name="line.415"></a> -<span class="sourceLineNo">416</span> return tn;<a name="line.416"></a> -<span class="sourceLineNo">417</span> }<a name="line.417"></a> -<span class="sourceLineNo">418</span> }<a name="line.418"></a> -<span class="sourceLineNo">419</span><a name="line.419"></a> -<span class="sourceLineNo">420</span> return createTableNameIfNecessary(<a name="line.420"></a> -<span class="sourceLineNo">421</span> ByteBuffer.wrap(Bytes.toBytes(namespaceAsString)),<a name="line.421"></a> -<span class="sourceLineNo">422</span> ByteBuffer.wrap(Bytes.toBytes(qualifierAsString)));<a name="line.422"></a> -<span class="sourceLineNo">423</span> }<a name="line.423"></a> -<span class="sourceLineNo">424</span><a name="line.424"></a> +<span class="sourceLineNo">408</span><a name="line.408"></a> +<span class="sourceLineNo">409</span> public static TableName valueOf(String namespaceAsString, String qualifierAsString) {<a name="line.409"></a> +<span class="sourceLineNo">410</span> if (namespaceAsString == null || namespaceAsString.length() < 1) {<a name="line.410"></a> +<span class="sourceLineNo">411</span> namespaceAsString = NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR;<a name="line.411"></a> +<span class="sourceLineNo">412</span> }<a name="line.412"></a> +<span class="sourceLineNo">413</span><a name="line.413"></a> +<span class="sourceLineNo">414</span> for (TableName tn : tableCache) {<a name="line.414"></a> +<span class="sourceLineNo">415</span> if (qualifierAsString.equals(tn.getQualifierAsString()) &&<a name="line.415"></a> +<span class="sourceLineNo">416</span> namespaceAsString.equals(tn.getNameAsString())) {<a name="line.416"></a> +<span class="sourceLineNo">417</span> return tn;<a name="line.417"></a> +<span class="sourceLineNo">418</span> }<a name="line.418"></a> +<span class="sourceLineNo">419</span> }<a name="line.419"></a> +<span class="sourceLineNo">420</span><a name="line.420"></a> +<span class="sourceLineNo">421</span> return createTableNameIfNecessary(<a name="line.421"></a> +<span class="sourceLineNo">422</span> ByteBuffer.wrap(Bytes.toBytes(namespaceAsString)),<a name="line.422"></a> +<span class="sourceLineNo">423</span> ByteBuffer.wrap(Bytes.toBytes(qualifierAsString)));<a name="line.423"></a> +<span class="sourceLineNo">424</span> }<a name="line.424"></a> <span class="sourceLineNo">425</span><a name="line.425"></a> -<span class="sourceLineNo">426</span> /**<a name="line.426"></a> -<span class="sourceLineNo">427</span> * @throws IllegalArgumentException if fullName equals old root or old meta. Some code<a name="line.427"></a> -<span class="sourceLineNo">428</span> * depends on this. The test is buried in the table creation to save on array comparison<a name="line.428"></a> -<span class="sourceLineNo">429</span> * when we're creating a standard table object that will be in the cache.<a name="line.429"></a> -<span class="sourceLineNo">430</span> */<a name="line.430"></a> -<span class="sourceLineNo">431</span> public static TableName valueOf(byte[] fullName) throws IllegalArgumentException{<a name="line.431"></a> -<span class="sourceLineNo">432</span> for (TableName tn : tableCache) {<a name="line.432"></a> -<span class="sourceLineNo">433</span> if (Arrays.equals(tn.getName(), fullName)) {<a name="line.433"></a> -<span class="sourceLineNo">434</span> return tn;<a name="line.434"></a> -<span class="sourceLineNo">435</span> }<a name="line.435"></a> -<span class="sourceLineNo">436</span> }<a name="line.436"></a> -<span class="sourceLineNo">437</span><a name="line.437"></a> -<span class="sourceLineNo">438</span> int namespaceDelimIndex = com.google.common.primitives.Bytes.lastIndexOf(fullName,<a name="line.438"></a> -<span class="sourceLineNo">439</span> (byte) NAMESPACE_DELIM);<a name="line.439"></a> -<span class="sourceLineNo">440</span><a name="line.440"></a> -<span class="sourceLineNo">441</span> if (namespaceDelimIndex < 0) {<a name="line.441"></a> -<span class="sourceLineNo">442</span> return createTableNameIfNecessary(<a name="line.442"></a> -<span class="sourceLineNo">443</span> ByteBuffer.wrap(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME),<a name="line.443"></a> -<span class="sourceLineNo">444</span> ByteBuffer.wrap(fullName));<a name="line.444"></a> -<span class="sourceLineNo">445</span> } else {<a name="line.445"></a> -<span class="sourceLineNo">446</span> return createTableNameIfNecessary(<a name="line.446"></a> -<span class="sourceLineNo">447</span> ByteBuffer.wrap(fullName, 0, namespaceDelimIndex),<a name="line.447"></a> -<span class="sourceLineNo">448</span> ByteBuffer.wrap(fullName, namespaceDelimIndex + 1,<a name="line.448"></a> -<span class="sourceLineNo">449</span> fullName.length - (namespaceDelimIndex + 1)));<a name="line.449"></a> -<span class="sourceLineNo">450</span> }<a name="line.450"></a> -<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><a name="line.453"></a> -<span class="sourceLineNo">454</span> /**<a name="line.454"></a> -<span class="sourceLineNo">455</span> * @throws IllegalArgumentException if fullName equals old root or old meta. Some code<a name="line.455"></a> -<span class="sourceLineNo">456</span> * depends on this.<a name="line.456"></a> -<span class="sourceLineNo">457</span> */<a name="line.457"></a> -<span class="sourceLineNo">458</span> public static TableName valueOf(String name) {<a name="line.458"></a> -<span class="sourceLineNo">459</span> for (TableName tn : tableCache) {<a name="line.459"></a> -<span class="sourceLineNo">460</span> if (name.equals(tn.getNameAsString())) {<a name="line.460"></a> -<span class="sourceLineNo">461</span> return tn;<a name="line.461"></a> -<span class="sourceLineNo">462</span> }<a name="line.462"></a> -<span class="sourceLineNo">463</span> }<a name="line.463"></a> -<span class="sourceLineNo">464</span><a name="line.464"></a> -<span class="sourceLineNo">465</span> final int namespaceDelimIndex = name.indexOf(NAMESPACE_DELIM);<a name="line.465"></a> +<span class="sourceLineNo">426</span><a name="line.426"></a> +<span class="sourceLineNo">427</span> /**<a name="line.427"></a> +<span class="sourceLineNo">428</span> * @throws IllegalArgumentException if fullName equals old root or old meta. Some code<a name="line.428"></a> +<span class="sourceLineNo">429</span> * depends on this. The test is buried in the table creation to save on array comparison<a name="line.429"></a> +<span class="sourceLineNo">430</span> * when we're creating a standard table object that will be in the cache.<a name="line.430"></a> +<span class="sourceLineNo">431</span> */<a name="line.431"></a> +<span class="sourceLineNo">432</span> public static TableName valueOf(byte[] fullName) throws IllegalArgumentException{<a name="line.432"></a> +<span class="sourceLineNo">433</span> for (TableName tn : tableCache) {<a name="line.433"></a> +<span class="sourceLineNo">434</span> if (Arrays.equals(tn.getName(), fullName)) {<a name="line.434"></a> +<span class="sourceLineNo">435</span> return tn;<a name="line.435"></a> +<span class="sourceLineNo">436</span> }<a name="line.436"></a> +<span class="sourceLineNo">437</span> }<a name="line.437"></a> +<span class="sourceLineNo">438</span><a name="line.438"></a> +<span class="sourceLineNo">439</span> int namespaceDelimIndex =<a name="line.439"></a> +<span class="sourceLineNo">440</span> org.apache.hadoop.hbase.shaded.com.google.common.primitives.Bytes.lastIndexOf(fullName,<a name="line.440"></a> +<span class="sourceLineNo">441</span> (byte) NAMESPACE_DELIM);<a name="line.441"></a> +<span class="sourceLineNo">442</span><a name="line.442"></a> +<span class="sourceLineNo">443</span> if (namespaceDelimIndex < 0) {<a name="line.443"></a> +<span class="sourceLineNo">444</span> return createTableNameIfNecessary(<a name="line.444"></a> +<span class="sourceLineNo">445</span> ByteBuffer.wrap(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME),<a name="line.445"></a> +<span class="sourceLineNo">446</span> ByteBuffer.wrap(fullName));<a name="line.446"></a> +<span class="sourceLineNo">447</span> } else {<a name="line.447"></a> +<span class="sourceLineNo">448</span> return createTableNameIfNecessary(<a name="line.448"></a> +<span class="sourceLineNo">449</span> ByteBuffer.wrap(fullName, 0, namespaceDelimIndex),<a name="line.449"></a> +<span class="sourceLineNo">450</span> ByteBuffer.wrap(fullName, namespaceDelimIndex + 1,<a name="line.450"></a> +<span class="sourceLineNo">451</span> fullName.length - (namespaceDelimIndex + 1)));<a name="line.451"></a> +<span class="sourceLineNo">452</span> }<a name="line.452"></a> +<span class="sourceLineNo">453</span> }<a name="line.453"></a> +<span class="sourceLineNo">454</span><a name="line.454"></a> +<span class="sourceLineNo">455</span><a name="line.455"></a> +<span class="sourceLineNo">456</span> /**<a name="line.456"></a> +<span class="sourceLineNo">457</span> * @throws IllegalArgumentException if fullName equals old root or old meta. Some code<a name="line.457"></a> +<span class="sourceLineNo">458</span> * depends on this.<a name="line.458"></a> +<span class="sourceLineNo">459</span> */<a name="line.459"></a> +<span class="sourceLineNo">460</span> public static TableName valueOf(String name) {<a name="line.460"></a> +<span class="sourceLineNo">461</span> for (TableName tn : tableCache) {<a name="line.461"></a> +<span class="sourceLineNo">462</span> if (name.equals(tn.getNameAsString())) {<a name="line.462"></a> +<span class="sourceLineNo">463</span> return tn;<a name="line.463"></a> +<span class="sourceLineNo">464</span> }<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> if (namespaceDelimIndex < 0) {<a name="line.467"></a> -<span class="sourceLineNo">468</span> return createTableNameIfNecessary(<a name="line.468"></a> -<span class="sourceLineNo">469</span> ByteBuffer.wrap(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME),<a name="line.469"></a> -<span class="sourceLineNo">470</span> ByteBuffer.wrap(Bytes.toBytes(name)));<a name="line.470"></a> -<span class="sourceLineNo">471</span> } else {<a name="line.471"></a> -<span class="sourceLineNo">472</span> // indexOf is by character, not byte (consider multi-byte characters)<a name="line.472"></a> -<span class="sourceLineNo">473</span> String ns = name.substring(0, namespaceDelimIndex);<a name="line.473"></a> -<span class="sourceLineNo">474</span> String qualifier = name.substring(namespaceDelimIndex + 1);<a name="line.474"></a> -<span class="sourceLineNo">475</span> return createTableNameIfNecessary(<a name="line.475"></a> -<span class="sourceLineNo">476</span> ByteBuffer.wrap(Bytes.toBytes(ns)),<a name="line.476"></a> -<span class="sourceLineNo">477</span> ByteBuffer.wrap(Bytes.toBytes(qualifier)));<a name="line.477"></a> -<span class="sourceLineNo">478</span> }<a name="line.478"></a> -<span class="sourceLineNo">479</span> }<a name="line.479"></a> -<span class="sourceLineNo">480</span><a name="line.480"></a> -<span class="sourceLineNo">481</span><a name="line.481"></a> -<span class="sourceLineNo">482</span> public static TableName valueOf(byte[] namespace, byte[] qualifier) {<a name="line.482"></a> -<span class="sourceLineNo">483</span> if (namespace == null || namespace.length < 1) {<a name="line.483"></a> -<span class="sourceLineNo">484</span> namespace = NamespaceDescriptor.DEFAULT_NAMESPACE_NAME;<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> for (TableName tn : tableCache) {<a name="line.487"></a> -<span class="sourceLineNo">488</span> if (Arrays.equals(tn.getQualifier(), qualifier) &&<a name="line.488"></a> -<span class="sourceLineNo">489</span> Arrays.equals(tn.getNamespace(), namespace)) {<a name="line.489"></a> -<span class="sourceLineNo">490</span> return tn;<a name="line.490"></a> -<span class="sourceLineNo">491</span> }<a name="line.491"></a> -<span class="sourceLineNo">492</span> }<a name="line.492"></a> -<span class="sourceLineNo">493</span><a name="line.493"></a> -<span class="sourceLineNo">494</span> return createTableNameIfNecessary(<a name="line.494"></a> -<span class="sourceLineNo">495</span> ByteBuffer.wrap(namespace), ByteBuffer.wrap(qualifier));<a name="line.495"></a> -<span class="sourceLineNo">496</span> }<a name="line.496"></a> -<span class="sourceLineNo">497</span><a name="line.497"></a> -<span class="sourceLineNo">498</span> public static TableName valueOf(ByteBuffer namespace, ByteBuffer qualifier) {<a name="line.498"></a> -<span class="sourceLineNo">499</span> if (namespace == null || namespace.remaining() < 1) {<a name="line.499"></a> -<span class="sourceLineNo">500</span> return createTableNameIfNecessary(<a name="line.500"></a> -<span class="sourceLineNo">501</span> ByteBuffer.wrap(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME), qualifier);<a name="line.501"></a> -<span class="sourceLineNo">502</span> }<a name="line.502"></a> -<span class="sourceLineNo">503</span><a name="line.503"></a> -<span class="sourceLineNo">504</span> return createTableNameIfNecessary(namespace, qualifier);<a name="line.504"></a> -<span class="sourceLineNo">505</span> }<a name="line.505"></a> -<span class="sourceLineNo">506</span><a name="line.506"></a> -<span class="sourceLineNo">507</span> @Override<a name="line.507"></a> -<span class="sourceLineNo">508</span> public boolean equals(Object o) {<a name="line.508"></a> -<span class="sourceLineNo">509</span> if (this == o) return true;<a name="line.509"></a> -<span class="sourceLineNo">510</span> if (o == null || getClass() != o.getClass()) return false;<a name="line.510"></a> -<span class="sourceLineNo">511</span><a name="line.511"></a> -<span class="sourceLineNo">512</span> TableName tableName = (TableName) o;<a name="line.512"></a> +<span class="sourceLineNo">467</span> final int namespaceDelimIndex = name.indexOf(NAMESPACE_DELIM);<a name="line.467"></a> +<span class="sourceLineNo">468</span><a name="line.468"></a> +<span class="sourceLineNo">469</span> if (namespaceDelimIndex < 0) {<a name="line.469"></a> +<span class="sourceLineNo">470</span> return createTableNameIfNecessary(<a name="line.470"></a> +<span class="sourceLineNo">471</span> ByteBuffer.wrap(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME),<a name="line.471"></a> +<span class="sourceLineNo">472</span> ByteBuffer.wrap(Bytes.toBytes(name)));<a name="line.472"></a> +<span class="sourceLineNo">473</span> } else {<a name="line.473"></a> +<span class="sourceLineNo">474</span> // indexOf is by character, not byte (consider multi-byte characters)<a name="line.474"></a> +<span class="sourceLineNo">475</span> String ns = name.substring(0, namespaceDelimIndex);<a name="line.475"></a> +<span class="sourceLineNo">476</span> String qualifier = name.substring(namespaceDelimIndex + 1);<a name="line.476"></a> +<span class="sourceLineNo">477</span> return createTableNameIfNecessary(<a name="line.477"></a> +<span class="sourceLineNo">478</span> ByteBuffer.wrap(Bytes.toBytes(ns)),<a name="line.478"></a> +<span class="sourceLineNo">479</span> ByteBuffer.wrap(Bytes.toBytes(qualifier)));<a name="line.479"></a> +<span class="sourceLineNo">480</span> }<a name="line.480"></a> +<span class="sourceLineNo">481</span> }<a name="line.481"></a> +<span class="sourceLineNo">482</span><a name="line.482"></a> +<span class="sourceLineNo">483</span><a name="line.483"></a> +<span class="sourceLineNo">484</span> public static TableName valueOf(byte[] namespace, byte[] qualifier) {<a name="line.484"></a> +<span class="sourceLineNo">485</span> if (namespace == null || namespace.length < 1) {<a name="line.485"></a> +<span class="sourceLineNo">486</span> namespace = NamespaceDescriptor.DEFAULT_NAMESPACE_NAME;<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> for (TableName tn : tableCache) {<a name="line.489"></a> +<span class="sourceLineNo">490</span> if (Arrays.equals(tn.getQualifier(), qualifier) &&<a name="line.490"></a> +<span class="sourceLineNo">491</span> Arrays.equals(tn.getNamespace(), namespace)) {<a name="line.491"></a> +<span class="sourceLineNo">492</span> return tn;<a name="line.492"></a> +<span class="sourceLineNo">493</span> }<a name="line.493"></a> +<span class="sourceLineNo">494</span> }<a name="line.494"></a> +<span class="sourceLineNo">495</span><a name="line.495"></a> +<span class="sourceLineNo">496</span> return createTableNameIfNecessary(<a name="line.496"></a> +<span class="sourceLineNo">497</span> ByteBuffer.wrap(namespace), ByteBuffer.wrap(qualifier));<a name="line.497"></a> +<span class="sourceLineNo">498</span> }<a name="line.498"></a> +<span class="sourceLineNo">499</span><a name="line.499"></a> +<span class="sourceLineNo">500</span> public static TableName valueOf(ByteBuffer namespace, ByteBuffer qualifier) {<a name="line.500"></a> +<span class="sourceLineNo">501</span> if (namespace == null || namespace.remaining() < 1) {<a name="line.501"></a> +<span class="sourceLineNo">502</span> return createTableNameIfNecessary(<a name="line.502"></a> +<span class="sourceLineNo">503</span> ByteBuffer.wrap(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME), qualifier);<a name="line.503"></a> +<span class="sourceLineNo">504</span> }<a name="line.504"></a> +<span class="sourceLineNo">505</span><a name="line.505"></a> +<span class="sourceLineNo">506</span> return createTableNameIfNecessary(namespace, qualifier);<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> @Override<a name="line.509"></a> +<span class="sourceLineNo">510</span> public boolean equals(Object o) {<a name="line.510"></a> +<span class="sourceLineNo">511</span> if (this == o) return true;<a name="line.511"></a> +<span class="sourceLineNo">512</span> if (o == null || getClass() != o.getClass()) return false;<a name="line.512"></a> <span class="sourceLineNo">513</span><a name="line.513"></a> -<span class="sourceLineNo">514</span> return o.hashCode() == hashCode && nameAsString.equals(tableName.nameAsString);<a name="line.514"></a> -<span class="sourceLineNo">515</span> }<a name="line.515"></a> -<span class="sourceLineNo">516</span><a name="line.516"></a> -<span class="sourceLineNo">517</span> @Override<a name="line.517"></a> -<span class="sourceLineNo">518</span> public int hashCode() {<a name="line.518"></a> -<span class="sourceLineNo">519</span> return hashCode;<a name="line.519"></a> -<span class="sourceLineNo">520</span> }<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">523</span> * For performance reasons, the ordering is not lexicographic.<a name="line.523"></a> -<span class="sourceLineNo">524</span> */<a name="line.524"></a> -<span class="sourceLineNo">525</span> @Override<a name="line.525"></a> -<span class="sourceLineNo">526</span> public int compareTo(TableName tableName) {<a name="line.526"></a> -<span class="sourceLineNo">527</span> if (this == tableName) return 0;<a name="line.527"></a> -<span class="sourceLineNo">528</span> if (this.hashCode < tableName.hashCode()) {<a name="line.528"></a> -<span class="sourceLineNo">529</span> return -1;<a name="line.529"></a> -<span class="sourceLineNo">530</span> }<a name="line.530"></a> -<span class="sourceLineNo">531</span> if (this.hashCode > tableName.hashCode()) {<a name="line.531"></a> -<span class="sourceLineNo">532</span> return 1;<a name="line.532"></a> -<span class="sourceLineNo">533</span> }<a name="line.533"></a> -<span class="sourceLineNo">534</span> return this.nameAsString.compareTo(tableName.getNameAsString());<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> /**<a name="line.537"></a> -<span class="sourceLineNo">538</span> * Get the appropriate row comparator for this table.<a name="line.538"></a> -<span class="sourceLineNo">539</span> *<a name="line.539"></a> -<span class="sourceLineNo">540</span> * @return The comparator.<a name="line.540"></a> -<span class="sourceLineNo">541</span> * @deprecated The comparator is an internal property of the table. Should<a name="line.541"></a> -<span class="sourceLineNo">542</span> * not have been exposed here<a name="line.542"></a> -<span class="sourceLineNo">543</span> */<a name="line.543"></a> -<span class="sourceLineNo">544</span> @InterfaceAudience.Private<a name="line.544"></a> -<span class="sourceLineNo">545</span> @Deprecated<a name="line.545"></a> -<span class="sourceLineNo">546</span> public KVComparator getRowComparator() {<a name="line.546"></a> -<span class="sourceLineNo">547</span> if(TableName.META_TABLE_NAME.equals(this)) {<a name="line.547"></a> -<span class="sourceLineNo">548</span> return KeyValue.META_COMPARATOR;<a name="line.548"></a> -<span class="sourceLineNo">549</span> }<a name="line.549"></a> -<span class="sourceLineNo">550</span> return KeyValue.COMPARATOR;<a name="line.550"></a> -<span class="sourceLineNo">551</span> }<a name="line.551"></a> -<span class="sourceLineNo">552</span>}<a name="line.552"></a> +<span class="sourceLineNo">514</span> TableName tableName = (TableName) o;<a name="line.514"></a> +<span class="sourceLineNo">515</span><a name="line.515"></a> +<span class="sourceLineNo">516</span> return o.hashCode() == hashCode && nameAsString.equals(tableName.nameAsString);<a name="line.516"></a> +<span class="sourceLineNo">517</span> }<a name="line.517"></a> +<span class="sourceLineNo">518</span><a name="line.518"></a> +<span class="sourceLineNo">519</span> @Override<a name="line.519"></a> +<span class="sourceLineNo">520</span> public int hashCode() {<a name="line.520"></a> +<span class="sourceLineNo">521</span> return hashCode;<a name="line.521"></a> +<span class="sourceLineNo">522</span> }<a name="line.522"></a> +<span class="sourceLineNo">523</span><a name="line.523"></a> +<span class="sourceLineNo">524</span> /**<a name="line.524"></a> +<span class="sourceLineNo">525</span> * For performance reasons, the ordering is not lexicographic.<a name="line.525"></a> +<span class="sourceLineNo">526</span> */<a name="line.526"></a> +<span class="sourceLineNo">527</span> @Override<a name="line.527"></a> +<span class="sourceLineNo">528</span> public int compareTo(TableName tableName) {<a name="line.528"></a> +<span class="sourceLineNo">529</span> if (this == tableName) return 0;<a name="line.529"></a> +<span class="sourceLineNo">530</span> if (this.hashCode < tableName.hashCode()) {<a name="line.530"></a> +<span class="sourceLineNo">531</span> return -1;<a name="line.531"></a> +<span class="sourceLineNo">532</span> }<a name="line.532"></a> +<span class="sourceLineNo">533</span> if (this.hashCode > tableName.hashCode()) {<a name="line.533"></a> +<span class="sourceLineNo">534</span> return 1;<a name="line.534"></a> +<span class="sourceLineNo">535</span> }<a name="line.535"></a> +<span class="sourceLineNo">536</span> return this.nameAsString.compareTo(tableName.getNameAsString());<a name="line.536"></a> +<span class="sourceLineNo">537</span> }<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> * Get the appropriate row comparator for this table.<a name="line.540"></a> +<span class="sourceLineNo">541</span> *<a name="line.541"></a> +<span class="sourceLineNo">542</span> * @return The comparator.<a name="line.542"></a> +<span class="sourceLineNo">543</span> * @deprecated The comparator is an internal property of the table. Should<a name="line.543"></a> +<span class="sourceLineNo">544</span> * not have been exposed here<a name="line.544"></a> +<span class="sourceLineNo">545</span> */<a name="line.545"></a> +<span class="sourceLineNo">546</span> @InterfaceAudience.Private<a name="line.546"></a> +<span class="sourceLineNo">547</span> @Deprecated<a name="line.547"></a> +<span class="sourceLineNo">548</span> public KVComparator getRowComparator() {<a name="line.548"></a> +<span class="sourceLineNo">549</span> if(TableName.META_TABLE_NAME.equals(this)) {<a name="line.549"></a> +<span class="sourceLineNo">550</span> return KeyValue.META_COMPARATOR;<a name="line.550"></a> +<span class="sourceLineNo">551</span> }<a name="line.551"></a> +<span class="sourceLineNo">552</span> return KeyValue.COMPARATOR;<a name="line.552"></a> +<span class="sourceLineNo">553</span> }<a name="line.553"></a> +<span class="sourceLineNo">554</span>}<a name="line.554"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html b/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html index def5ec9..9905574 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html @@ -722,7 +722,7 @@ <span class="sourceLineNo">714</span> * @deprecated As of release 2.0.0.<a name="line.714"></a> <span class="sourceLineNo">715</span> * (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).<a name="line.715"></a> <span class="sourceLineNo">716</span> * This will be removed in HBase 3.0.0.<a name="line.716"></a> -<span class="sourceLineNo">717</span> * Use {@link #addColumnFamily(TableName, HColumnDescriptor)}.<a name="line.717"></a> +<span class="sourceLineNo">717</span> * Use {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)}.<a name="line.717"></a> <span class="sourceLineNo">718</span> */<a name="line.718"></a> <span class="sourceLineNo">719</span> @Deprecated<a name="line.719"></a> <span class="sourceLineNo">720</span> void addColumn(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.720"></a> @@ -735,7 +735,7 @@ <span class="sourceLineNo">727</span> * @param columnFamily column family descriptor of column family to be added<a name="line.727"></a> <span class="sourceLineNo">728</span> * @throws IOException if a remote or network exception occurs<a name="line.728"></a> <span class="sourceLineNo">729</span> */<a name="line.729"></a> -<span class="sourceLineNo">730</span> void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.730"></a> +<span class="sourceLineNo">730</span> void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.730"></a> <span class="sourceLineNo">731</span> throws IOException;<a name="line.731"></a> <span class="sourceLineNo">732</span><a name="line.732"></a> <span class="sourceLineNo">733</span> /**<a name="line.733"></a> @@ -751,7 +751,7 @@ <span class="sourceLineNo">743</span> * @return the result of the async add column family. You can use Future.get(long, TimeUnit) to<a name="line.743"></a> <span class="sourceLineNo">744</span> * wait on the operation to complete.<a name="line.744"></a> <span class="sourceLineNo">745</span> */<a name="line.745"></a> -<span class="sourceLineNo">746</span> Future<Void> addColumnFamilyAsync(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.746"></a> +<span class="sourceLineNo">746</span> Future<Void> addColumnFamilyAsync(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.746"></a> <span class="sourceLineNo">747</span> throws IOException;<a name="line.747"></a> <span class="sourceLineNo">748</span><a name="line.748"></a> <span class="sourceLineNo">749</span> /**<a name="line.749"></a> @@ -802,7 +802,7 @@ <span class="sourceLineNo">794</span> * @deprecated As of release 2.0.0.<a name="line.794"></a> <span class="sourceLineNo">795</span> * (<a href="https://issues.apache.org/jira/browse/HBASE-1989">HBASE-1989</a>).<a name="line.795"></a> <span class="sourceLineNo">796</span> * This will be removed in HBase 3.0.0.<a name="line.796"></a> -<span class="sourceLineNo">797</span> * Use {@link #modifyColumnFamily(TableName, HColumnDescriptor)}.<a name="line.797"></a> +<span class="sourceLineNo">797</span> * Use {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)}.<a name="line.797"></a> <span class="sourceLineNo">798</span> */<a name="line.798"></a> <span class="sourceLineNo">799</span> @Deprecated<a name="line.799"></a> <span class="sourceLineNo">800</span> void modifyColumn(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.800"></a> @@ -815,7 +815,7 @@ <span class="sourceLineNo">807</span> * @param columnFamily new column family descriptor to use<a name="line.807"></a> <span class="sourceLineNo">808</span> * @throws IOException if a remote or network exception occurs<a name="line.808"></a> <span class="sourceLineNo">809</span> */<a name="line.809"></a> -<span class="sourceLineNo">810</span> void modifyColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.810"></a> +<span class="sourceLineNo">810</span> void modifyColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.810"></a> <span class="sourceLineNo">811</span> throws IOException;<a name="line.811"></a> <span class="sourceLineNo">812</span><a name="line.812"></a> <span class="sourceLineNo">813</span> /**<a name="line.813"></a> @@ -831,7 +831,7 @@ <span class="sourceLineNo">823</span> * @return the result of the async modify column family. You can use Future.get(long, TimeUnit) to<a name="line.823"></a> <span class="sourceLineNo">824</span> * wait on the operation to complete.<a name="line.824"></a> <span class="sourceLineNo">825</span> */<a name="line.825"></a> -<span class="sourceLineNo">826</span> Future<Void> modifyColumnFamilyAsync(TableName tableName, HColumnDescriptor columnFamily)<a name="line.826"></a> +<span class="sourceLineNo">826</span> Future<Void> modifyColumnFamilyAsync(TableName tableName, ColumnFamilyDescriptor columnFamily)<a name="line.826"></a> <span class="sourceLineNo">827</span> throws IOException;<a name="line.827"></a> <span class="sourceLineNo">828</span><a name="line.828"></a> <span class="sourceLineNo">829</span><a name="line.829"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html b/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html index da6c0fb..8a2ddbd 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/AsyncTableBase.html @@ -29,7 +29,7 @@ <span class="sourceLineNo">021</span>import static org.apache.hadoop.hbase.client.ConnectionUtils.allOf;<a name="line.21"></a> <span class="sourceLineNo">022</span>import static org.apache.hadoop.hbase.client.ConnectionUtils.toCheckExistenceOnly;<a name="line.22"></a> <span class="sourceLineNo">023</span><a name="line.23"></a> -<span class="sourceLineNo">024</span>import com.google.common.base.Preconditions;<a name="line.24"></a> +<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a name="line.24"></a> <span class="sourceLineNo">025</span><a name="line.25"></a> <span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a> <span class="sourceLineNo">027</span>import java.util.concurrent.CompletableFuture;<a name="line.27"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/apidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html b/apidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html index ececdc0..41de383 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.html @@ -25,7 +25,7 @@ <span class="sourceLineNo">017</span> */<a name="line.17"></a> <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a name="line.18"></a> <span class="sourceLineNo">019</span><a name="line.19"></a> -<span class="sourceLineNo">020</span>import com.google.common.base.Preconditions;<a name="line.20"></a> +<span class="sourceLineNo">020</span>import org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a name="line.20"></a> <span class="sourceLineNo">021</span>import java.io.IOException;<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.HashMap;<a name="line.23"></a>
