Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-25512 May throw StringIndexOutOfBoundsException when construct illegal tablename error #2884 

This revert of a revert reapplies the PR; the original application was
missing the HBASE JIRA #; thats why it was reverted and then reapplied
w/ the JIRA # added.

This reverts commit 16fe1e95ec.
This commit is contained in:
stack 2021-02-08 14:34:54 -08:00
parent 16fe1e95ec
commit 8a4c3b066b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
View File

@ -192,16 +192,14 @@ public final class TableName implements Comparable<TableName> {
if(end - start < 1) { if(end - start < 1) {
throw new IllegalArgumentException(isSnapshot ? "Snapshot" : "Table" + " qualifier must not be empty"); throw new IllegalArgumentException(isSnapshot ? "Snapshot" : "Table" + " qualifier must not be empty");
} }
String qualifierString = Bytes.toString(qualifierName, start, end - start);
if (qualifierName[start] == '.' || qualifierName[start] == '-') { if (qualifierName[start] == '.' || qualifierName[start] == '-') {
throw new IllegalArgumentException("Illegal first character <" + qualifierName[start] + throw new IllegalArgumentException("Illegal first character <" + qualifierName[start] +
"> at 0. " + (isSnapshot ? "Snapshot" : "User-space table") + "> at 0. " + (isSnapshot ? "Snapshot" : "User-space table") +
" qualifiers can only start with 'alphanumeric " + " qualifiers can only start with 'alphanumeric " +
"characters' from any language: " + "characters' from any language: " +
Bytes.toString(qualifierName, start, end)); qualifierString);
} }
// Treat the bytes as UTF-8
String qualifierString = new String(
qualifierName, start, (end - start), StandardCharsets.UTF_8);
if (qualifierString.equals(DISALLOWED_TABLE_NAME)) { if (qualifierString.equals(DISALLOWED_TABLE_NAME)) {
// Per https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel // Per https://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#ch_zkDataModel
// A znode named "zookeeper" is disallowed by zookeeper. // A znode named "zookeeper" is disallowed by zookeeper.

2
hbase-common/src/test/java/org/apache/hadoop/hbase/TestTableName.java
View File

@ -137,7 +137,7 @@ public class TestTableName {
@Test public void testIllegalHTableNames() { @Test public void testIllegalHTableNames() {
for (String tn : illegalTableNames) { for (String tn : illegalTableNames) {
assertThrows(Exception.class, assertThrows(IllegalArgumentException.class,
() -> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn))); () -> TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn)));
} }
} }