From 23ad5f401a3fac0cc88e00f84a5b2a2295f87804 Mon Sep 17 00:00:00 2001 From: fyrz Date: Sat, 10 Jan 2015 20:52:03 +0100 Subject: [PATCH] [RocksJava] Incorporated changes for D30525 --- java/org/rocksdb/ColumnFamilyDescriptor.java | 6 ++++-- java/rocksjni/rocksjni.cc | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/java/org/rocksdb/ColumnFamilyDescriptor.java b/java/org/rocksdb/ColumnFamilyDescriptor.java index 193865e55..4c0954740 100644 --- a/java/org/rocksdb/ColumnFamilyDescriptor.java +++ b/java/org/rocksdb/ColumnFamilyDescriptor.java @@ -16,7 +16,8 @@ public class ColumnFamilyDescriptor { * options,

* * @param columnFamilyName name of column family. - * @deprecated will be removed in RocksDB 3.10.0. Use {} + * @deprecated will be removed in RocksDB 3.10.0. Use + * {@link #ColumnFamilyDescriptor(byte[])} instead. */ @Deprecated public ColumnFamilyDescriptor(final String columnFamilyName){ @@ -41,7 +42,8 @@ public class ColumnFamilyDescriptor { * @param columnFamilyName name of column family. * @param columnFamilyOptions options to be used with * column family. - * @deprecated will be removed in RocksDB 3.10.0. Use {} + * @deprecated will be removed in RocksDB 3.10.0. Use + * {@link #ColumnFamilyDescriptor(byte[], ColumnFamilyOptions)} instead. */ @Deprecated public ColumnFamilyDescriptor(final String columnFamilyName, diff --git a/java/rocksjni/rocksjni.cc b/java/rocksjni/rocksjni.cc index 2a536b104..be70670ae 100644 --- a/java/rocksjni/rocksjni.cc +++ b/java/rocksjni/rocksjni.cc @@ -93,11 +93,11 @@ jobject jbyteArray byteArray = static_cast(env->CallObjectMethod( jcf_descriptor, rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod( - env))); + env))); // get CF Options jobject jcf_opt_obj = env->CallObjectMethod(jcf_descriptor, rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyOptionsMethod( - env)); + env)); rocksdb::ColumnFamilyOptions* cfOptions = rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj); @@ -178,11 +178,11 @@ jobject Java_org_rocksdb_RocksDB_open__JLjava_lang_String_2Ljava_util_List_2I( jbyteArray byteArray = static_cast(env->CallObjectMethod( jcf_descriptor, rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod( - env))); + env))); // get CF Options jobject jcf_opt_obj = env->CallObjectMethod(jcf_descriptor, rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyOptionsMethod( - env)); + env)); rocksdb::ColumnFamilyOptions* cfOptions = rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj); @@ -1189,11 +1189,11 @@ jlong Java_org_rocksdb_RocksDB_createColumnFamily( jbyteArray byteArray = static_cast(env->CallObjectMethod( jcf_descriptor, rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod( - env))); + env))); // get CF Options jobject jcf_opt_obj = env->CallObjectMethod(jcf_descriptor, rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyOptionsMethod( - env)); + env)); rocksdb::ColumnFamilyOptions* cfOptions = rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj);