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

Restore Java 7 Compatibility (#9103)

Browse Source 
Summary:
RocksDB should still compile on Java 7.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/9103

Reviewed By: pdillinger

Differential Revision: D32067561

Pulled By: mrambacher

fbshipit-source-id: bbe9c18c8007ab3e113de4add56a84c9bde61c8e
This commit is contained in:
Adam Retter 2021-11-08 08:19:54 -08:00 committed by sdong
parent 7c25388623
commit 52626f10b1
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/main/java/org/rocksdb/AbstractMutableOptions.java
View File

@ -341,11 +341,8 @@ public abstract class AbstractMutableOptions {
return setIntArray(key, value); return setIntArray(key, value);
case ENUM: case ENUM:
final Optional<CompressionType> compressionType = final CompressionType compressionType = CompressionType.getFromInternal(valueStr);
CompressionType.getFromInternal(valueStr); return setEnum(key, compressionType);
if (compressionType.isPresent()) {
return setEnum(key, compressionType.get());
}
} }
throw new IllegalStateException(key + " has unknown value type: " + key.getValueType()); throw new IllegalStateException(key + " has unknown value type: " + key.getValueType());

10
java/src/main/java/org/rocksdb/CompressionType.java
View File

@ -5,8 +5,6 @@
package org.rocksdb; package org.rocksdb;
import java.util.Optional;
/** /**
* Enum CompressionType * Enum CompressionType
* *
@ -81,13 +79,15 @@ public enum CompressionType {
* *
* @return CompressionType instance (optional) * @return CompressionType instance (optional)
*/ */
public static Optional<CompressionType> getFromInternal(final String internalName) { static CompressionType getFromInternal(final String internalName) {
for (final CompressionType compressionType : CompressionType.values()) { for (final CompressionType compressionType : CompressionType.values()) {
if (compressionType.internalName_.equals(internalName)) { if (compressionType.internalName_.equals(internalName)) {
return Optional.of(compressionType); return compressionType;
} }
} }
return Optional.empty();
throw new IllegalArgumentException(
"Illegal internalName '" + internalName + " ' provided for CompressionType.");
} }
/** /**