andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

RocksJava must compile on JDK7 (#4768)

Browse Source 
Summary:
Fixes some RocksJava regressions recently introduced, whereby RocksJava would not build on JDK 7.
These should have been visible on Travis-CI!
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4768

Differential Revision: D13418173

Pulled By: sagar0

fbshipit-source-id: 57bf223188887f84d9e072031af2e0d2c8a69c30
This commit is contained in:
Adam Retter 2018-12-11 11:04:39 -08:00 committed by Facebook Github Bot
parent dde3ef1116
commit d3daa0db8b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/main/java/org/rocksdb/MemoryUsageType.java
View File

@ -54,9 +54,9 @@ public enum MemoryUsageType {
* cannot be found * cannot be found
*/ */
public static MemoryUsageType getMemoryUsageType(final byte byteIdentifier) { public static MemoryUsageType getMemoryUsageType(final byte byteIdentifier) {
for (final MemoryUsageType MemoryUsageType : MemoryUsageType.values()) { for (final MemoryUsageType memoryUsageType : MemoryUsageType.values()) {
if (MemoryUsageType.getValue() == byteIdentifier) { if (memoryUsageType.getValue() == byteIdentifier) {
return MemoryUsageType; return memoryUsageType;
} }
} }
@ -64,7 +64,7 @@ public enum MemoryUsageType {
"Illegal value provided for MemoryUsageType."); "Illegal value provided for MemoryUsageType.");
} }
private MemoryUsageType(byte value) { MemoryUsageType(byte value) {
value_ = value; value_ = value;
} }

4
java/src/test/java/org/rocksdb/MergeTest.java
View File

@ -46,13 +46,13 @@ public class MergeTest {
} }
private byte[] longToByteArray(long l) { private byte[] longToByteArray(long l) {
ByteBuffer buf = ByteBuffer.allocate(Long.BYTES); ByteBuffer buf = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
buf.putLong(l); buf.putLong(l);
return buf.array(); return buf.array();
} }
private long longFromByteArray(byte[] a) { private long longFromByteArray(byte[] a) {
ByteBuffer buf = ByteBuffer.allocate(Long.BYTES); ByteBuffer buf = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
buf.put(a); buf.put(a);
buf.flip(); buf.flip();
return buf.getLong(); return buf.getLong();