big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "HADOOP-15852. Refactor QuotaUsage. Contributed by Beluga Behr."

Browse Source 
This reverts commit fb9deed41d.
This commit is contained in:
Giovanni Matteo Fumarola 2018-12-04 12:57:28 -08:00
parent e89941fdbb
commit aa89492f29
1 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/QuotaUsage.java
View File

@ -40,12 +40,14 @@ public class QuotaUsage {
/** Builder class for QuotaUsage. */
public static class Builder {
public Builder() {
this.quota = -1L;
this.spaceQuota = -1L;
this.quota = -1;
this.spaceQuota = -1;
typeConsumed = new long[StorageType.values().length];
typeQuota = new long[StorageType.values().length];
Arrays.fill(typeQuota, -1L);
for (int i = 0; i < typeQuota.length; i++) {
typeQuota[i] = -1;
}
}
public Builder fileAndDirectoryCount(long count) {
@ -69,8 +71,9 @@ public Builder spaceQuota(long spaceQuota) {
}
public Builder typeConsumed(long[] typeConsumed) {
System.arraycopy(typeConsumed, 0, this.typeConsumed, 0,
typeConsumed.length);
for (int i = 0; i < typeConsumed.length; i++) {
this.typeConsumed[i] = typeConsumed[i];
}
return this;
}
@ -85,8 +88,9 @@ public Builder typeConsumed(StorageType type, long consumed) {
}
public Builder typeQuota(long[] typeQuota) {
System.arraycopy(typeQuota, 0, this.typeQuota, 0,
typeQuota.length);
for (int i = 0; i < typeQuota.length; i++) {
this.typeQuota[i] = typeQuota[i];
}
return this;
}
@ -149,12 +153,22 @@ public long getSpaceQuota() {
/** Return storage type quota. */
public long getTypeQuota(StorageType type) {
return (typeQuota != null) ? typeQuota[type.ordinal()] : -1L;
return (typeQuota != null) ? typeQuota[type.ordinal()] : -1;
}
/** Return storage type consumed. */
public long getTypeConsumed(StorageType type) {
return (typeConsumed != null) ? typeConsumed[type.ordinal()] : 0L;
return (typeConsumed != null) ? typeConsumed[type.ordinal()] : 0;
}
/** Return storage type quota. */
private long[] getTypesQuota() {
return typeQuota;
}
/** Return storage type quota. */
private long[] getTypesConsumed() {
return typeConsumed;
}
/** Return true if any storage type quota has been set. */
@ -163,7 +177,7 @@ public boolean isTypeQuotaSet() {
return false;
}
for (StorageType t : StorageType.getTypesSupportingQuota()) {
if (typeQuota[t.ordinal()] > 0L) {
if (typeQuota[t.ordinal()] > 0) {
return true;
}
}
@ -176,58 +190,41 @@ public boolean isTypeConsumedAvailable() {
return false;
}
for (StorageType t : StorageType.getTypesSupportingQuota()) {
if (typeConsumed[t.ordinal()] > 0L) {
if (typeConsumed[t.ordinal()] > 0) {
return true;
}
}
return false;
}
@Override
public boolean equals(Object to) {
return (this == to || (to instanceof QuotaUsage &&
getFileAndDirectoryCount() ==
((QuotaUsage) to).getFileAndDirectoryCount() &&
getQuota() == ((QuotaUsage) to).getQuota() &&
getSpaceConsumed() == ((QuotaUsage) to).getSpaceConsumed() &&
getSpaceQuota() == ((QuotaUsage) to).getSpaceQuota() &&
Arrays.equals(getTypesQuota(), ((QuotaUsage) to).getTypesQuota()) &&
Arrays.equals(getTypesConsumed(),
((QuotaUsage) to).getTypesConsumed())));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result
+ (int) (fileAndDirectoryCount ^ (fileAndDirectoryCount >>> 32));
result = prime * result + (int) (quota ^ (quota >>> 32));
result = prime * result + (int) (spaceConsumed ^ (spaceConsumed >>> 32));
result = prime * result + (int) (spaceQuota ^ (spaceQuota >>> 32));
result = prime * result + Arrays.hashCode(typeConsumed);
result = prime * result + Arrays.hashCode(typeQuota);
return result;
long result = (getFileAndDirectoryCount() ^ getQuota() ^
getSpaceConsumed() ^ getSpaceQuota());
if (getTypesQuota() != null) {
for (long quota : getTypesQuota()) {
result ^= quota;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
if (getTypesConsumed() != null) {
for (long consumed : getTypesConsumed()) {
result ^= consumed;
}
if (getClass() != obj.getClass()) {
return false;
}
QuotaUsage other = (QuotaUsage) obj;
if (fileAndDirectoryCount != other.fileAndDirectoryCount) {
return false;
}
if (quota != other.quota) {
return false;
}
if (spaceConsumed != other.spaceConsumed) {
return false;
}
if (spaceQuota != other.spaceQuota) {
return false;
}
if (!Arrays.equals(typeConsumed, other.typeConsumed)) {
return false;
}
if (!Arrays.equals(typeQuota, other.typeQuota)) {
return false;
}
return true;
return (int)result;
}
/**
@ -295,11 +292,11 @@ protected String getQuotaUsage(boolean hOption) {
String spaceQuotaStr = QUOTA_NONE;
String spaceQuotaRem = QUOTA_INF;
if (quota > 0L) {
if (quota > 0) {
quotaStr = formatSize(quota, hOption);
quotaRem = formatSize(quota-fileAndDirectoryCount, hOption);
}
if (spaceQuota >= 0L) {
if (spaceQuota >= 0) {
spaceQuotaStr = formatSize(spaceQuota, hOption);
spaceQuotaRem = formatSize(spaceQuota - spaceConsumed, hOption);
}
@ -310,7 +307,7 @@ protected String getQuotaUsage(boolean hOption) {
protected String getTypesQuotaUsage(boolean hOption,
List<StorageType> types) {
StringBuilder content = new StringBuilder();
StringBuffer content = new StringBuffer();
for (StorageType st : types) {
long typeQuota = getTypeQuota(st);
long typeConsumed = getTypeConsumed(st);
@ -335,12 +332,13 @@ protected String getTypesQuotaUsage(boolean hOption,
* @return storage header string
*/
public static String getStorageTypeHeader(List<StorageType> storageTypes) {
StringBuilder header = new StringBuilder();
StringBuffer header = new StringBuffer();
for (StorageType st : storageTypes) {
/* the field length is 13/17 for quota and remain quota
* as the max length for quota name is ARCHIVE_QUOTA
* and remain quota name REM_ARCHIVE_QUOTA */
final String storageName = st.toString();
String storageName = st.toString();
header.append(String.format(STORAGE_TYPE_SUMMARY_FORMAT,
storageName + "_QUOTA", "REM_" + storageName + "_QUOTA"));
}