AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Much improved ByteArray, with unsigned compareTo() & "raw" renamed to "value"

Browse Source
This commit is contained in:
catbref 2019-09-26 17:23:46 +01:00
parent 40d879813d
commit 344b9436ca
1 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/org/qora/utils/ByteArray.java
View File

@ -1,23 +1,12 @@
package org.qora.utils; package org.qora.utils;
import java.util.Comparator;
import com.google.common.hash.HashCode;
public class ByteArray implements Comparable<ByteArray> { public class ByteArray implements Comparable<ByteArray> {
private static final Comparator<ByteArray> COMPARATOR; private int hash;
static { public final byte[] value;
COMPARATOR = Comparator.comparing(byteArray -> byteArray.comparable);
}
private final String comparable; public ByteArray(byte[] value) {
this.value = value;
public final byte[] raw;
public ByteArray(byte[] content) {
this.comparable = HashCode.fromBytes(content).toString();
this.raw = content;
} }
@Override @Override
@ -25,22 +14,53 @@ public class ByteArray implements Comparable<ByteArray> {
if (this == other) if (this == other)
return true; return true;
if (!(other instanceof ByteArray)) if (other instanceof ByteArray)
return this.compareTo((ByteArray) other) == 0;
if (other instanceof byte[])
return this.compareTo((byte[]) other) == 0;
return false; return false;
ByteArray otherByteArray = (ByteArray) other;
return this.comparable.equals(otherByteArray.comparable);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return this.comparable.hashCode(); int h = hash;
if (h == 0 && value.length > 0) {
byte val[] = value;
for (int i = 0; i < val.length; ++i)
h = 31 * h + val[i];
hash = h;
}
return h;
} }
@Override @Override
public int compareTo(ByteArray other) { public int compareTo(ByteArray other) {
return COMPARATOR.compare(this, other); return this.compareTo(other.value);
}
public int compareTo(byte[] otherValue) {
byte[] val = value;
if (val.length < otherValue.length)
return -1;
if (val.length > otherValue.length)
return 1;
for (int i = 0; i < val.length; ++i) {
int a = val[i] & 0xFF;
int b = otherValue[i] & 0xFF;
if (a < b)
return -1;
if (b > a)
return 1;
}
return 0;
} }
} }