From 4efca96bb3edfc8f4699d0e5f55770b1a58dd3da Mon Sep 17 00:00:00 2001 From: Ankit Gupta Date: Mon, 7 Jul 2014 12:18:55 -0700 Subject: [PATCH] Change enum type from int to byte --- java/org/rocksdb/CompressionType.java | 18 +++++++++--------- java/org/rocksdb/Options.java | 4 ++-- java/rocksjni/options.cc | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/java/org/rocksdb/CompressionType.java b/java/org/rocksdb/CompressionType.java index e93e7ee90..c5d6253a9 100644 --- a/java/org/rocksdb/CompressionType.java +++ b/java/org/rocksdb/CompressionType.java @@ -6,20 +6,20 @@ package org.rocksdb; public enum CompressionType { - NO_COMPRESSION(0), - SNAPPY_COMPRESSION(1), - ZLIB_COMPRESSION(2), - BZLIB2_COMPRESSION(3), - LZ4_COMPRESSION(4), - LZ4HC_COMPRESSION(5); + NO_COMPRESSION((byte) 0), + SNAPPY_COMPRESSION((byte) 1), + ZLIB_COMPRESSION((byte) 2), + BZLIB2_COMPRESSION((byte) 3), + LZ4_COMPRESSION((byte) 4), + LZ4HC_COMPRESSION((byte) 5); - private final int value_; + private final byte value_; - private CompressionType(int value) { + private CompressionType(byte value) { value_ = value; } - public int getValue() { + public byte getValue() { return value_; } } diff --git a/java/org/rocksdb/Options.java b/java/org/rocksdb/Options.java index b441d49e4..7e06a50c6 100644 --- a/java/org/rocksdb/Options.java +++ b/java/org/rocksdb/Options.java @@ -1328,7 +1328,7 @@ public class Options extends RocksObject { public CompressionType compressionType() { return CompressionType.values()[compressionType(nativeHandle_)]; } - private native int compressionType(long handle); + private native byte compressionType(long handle); /** * Compress blocks using the specified compression algorithm. This @@ -1352,7 +1352,7 @@ public class Options extends RocksObject { setCompressionType(nativeHandle_, compressionType.getValue()); return this; } - private native void setCompressionType(long handle, int compressionType); + private native void setCompressionType(long handle, byte compressionType); /** * If true, place whole keys in the filter (not just prefixes). diff --git a/java/rocksjni/options.cc b/java/rocksjni/options.cc index 16d13f8c9..7a2bea828 100644 --- a/java/rocksjni/options.cc +++ b/java/rocksjni/options.cc @@ -941,7 +941,7 @@ void Java_org_rocksdb_Options_setBlockRestartInterval( * Signature: (JI)V */ void Java_org_rocksdb_Options_setCompressionType( - JNIEnv* env, jobject jobj, jlong jhandle, jint compression) { + JNIEnv* env, jobject jobj, jlong jhandle, jbyte compression) { reinterpret_cast(jhandle)->compression = static_cast(compression); } @@ -951,7 +951,7 @@ void Java_org_rocksdb_Options_setCompressionType( * Method: compressionType * Signature: (J)I */ -jint Java_org_rocksdb_Options_compressionType( +jbyte Java_org_rocksdb_Options_compressionType( JNIEnv* env, jobject jobj, jlong jhandle) { return reinterpret_cast(jhandle)->compression; }