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

HADOOP-11221. IdentityHashStore assumes System.identityHashCode() is non-negative. Contributed by Jinghui Wang

Browse Source
This commit is contained in:
Tsz-Wo Nicholas Sze 2014-10-30 10:58:26 -07:00
parent b811212f23
commit a3dacc07e2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -1034,6 +1034,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-11250. fix endmacro of set_find_shared_library_without_version in HADOOP-11250. fix endmacro of set_find_shared_library_without_version in
CMakeLists (Yi Liu via Colin P. McCabe) CMakeLists (Yi Liu via Colin P. McCabe)
HADOOP-11221. IdentityHashStore assumes System.identityHashCode() is
non-negative. (Jinghui Wang via szetszwo)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

14
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/IdentityHashStore.java
View File

@ -92,9 +92,10 @@ private void realloc(int newCapacity) {
} }
private void putInternal(Object k, Object v) { private void putInternal(Object k, Object v) {
int hash = System.identityHashCode(k); final int hash = System.identityHashCode(k);
final int numEntries = buffer.length / 2; final int numEntries = buffer.length >> 1;
int index = hash % numEntries; //computing modulo with the assumption buffer.length is power of 2
int index = hash & (numEntries-1);
while (true) { while (true) {
if (buffer[2 * index] == null) { if (buffer[2 * index] == null) {
buffer[2 * index] = k; buffer[2 * index] = k;
@ -127,9 +128,10 @@ private int getElementIndex(K k) {
if (buffer == null) { if (buffer == null) {
return -1; return -1;
} }
final int numEntries = buffer.length / 2; final int numEntries = buffer.length >> 1;
int hash = System.identityHashCode(k); final int hash = System.identityHashCode(k);
int index = hash % numEntries; //computing modulo with the assumption buffer.length is power of 2
int index = hash & (numEntries -1);
int firstIndex = index; int firstIndex = index;
do { do {
if (buffer[2 * index] == k) { if (buffer[2 * index] == k) {