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

HBASE-23837 Removed deprecated isLegalFamilyName(byte[]) from HColumnDescriptor 

Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
Jan Hentschel 2020-02-15 21:19:51 +01:00 committed by GitHub
parent 0e96638898
commit ae781e569c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
View File

@ -155,23 +155,6 @@ public class HColumnDescriptor implements ColumnFamilyDescriptor, Comparable<HCo
this.delegatee = delegate; this.delegatee = delegate;
} }
/**
* @param b Family name.
* @return <code>b</code>
* @throws IllegalArgumentException If not null and not a legitimate family
* name: i.e. 'printable' and ends in a ':' (Null passes are allowed because
* <code>b</code> can be null when deserializing). Cannot start with a '.'
* either. Also Family can not be an empty value or equal "recovered.edits".
* @deprecated since 2.0.0 and will be removed in 3.0.0. Use
* {@link ColumnFamilyDescriptorBuilder#isLegalColumnFamilyName(byte[])} instead.
* @see ColumnFamilyDescriptorBuilder#isLegalColumnFamilyName(byte[])
* @see <a href="https://issues.apache.org/jira/browse/HBASE-18008">HBASE-18008</a>
*/
@Deprecated
public static byte [] isLegalFamilyName(final byte [] b) {
return ColumnFamilyDescriptorBuilder.isLegalColumnFamilyName(b);
}
/** /**
* @return Name of this column family * @return Name of this column family
*/ */

3
hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
View File

@ -66,6 +66,7 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HDFSBlocksDistribution; import org.apache.hadoop.hbase.HDFSBlocksDistribution;
import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionInfoBuilder; import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.exceptions.DeserializationException;
@ -1080,7 +1081,7 @@ public abstract class FSUtils extends CommonFSUtils {
protected boolean accept(Path p, @CheckForNull Boolean isDir) { protected boolean accept(Path p, @CheckForNull Boolean isDir) {
try { try {
// throws IAE if invalid // throws IAE if invalid
HColumnDescriptor.isLegalFamilyName(Bytes.toBytes(p.getName())); ColumnFamilyDescriptorBuilder.isLegalColumnFamilyName(Bytes.toBytes(p.getName()));
} catch (IllegalArgumentException iae) { } catch (IllegalArgumentException iae) {
// path name is an invalid family name and thus is excluded. // path name is an invalid family name and thus is excluded.
return false; return false;