NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[RocksJava] Integrated changes from D33165

Browse Source
main
fyrz 10 years ago
parent 677d02427f
commit 5e8e453d59
1 changed files with 10 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      java/rocksjni/rocksjni.cc

20
java/rocksjni/rocksjni.cc
Unescape View File

@ -92,8 +92,8 @@ jobject
jobject jcf_descriptor = env->CallObjectMethod(iteratorObj, jobject jcf_descriptor = env->CallObjectMethod(iteratorObj,
rocksdb::ListJni::getNextMethod(env)); rocksdb::ListJni::getNextMethod(env));
// get ColumnFamilyName // get ColumnFamilyName
jbyteArray byteArray = static_cast<jbyteArray>(env->CallObjectMethod( jbyteArray cf_name_in_byte_array = static_cast<jbyteArray>(
jcf_descriptor, env->CallObjectMethod(jcf_descriptor,
rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod( rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod(
env))); env)));
// get CF Options // get CF Options
@ -103,12 +103,12 @@ jobject
rocksdb::ColumnFamilyOptions* cfOptions = rocksdb::ColumnFamilyOptions* cfOptions =
rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj); rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj);
jbyte* cfname = env->GetByteArrayElements(byteArray, 0); jbyte* cfname = env->GetByteArrayElements(cf_name_in_byte_array, 0);
const int len = env->GetArrayLength(byteArray); const int len = env->GetArrayLength(cf_name_in_byte_array);
// free allocated cfnames after call to open // free allocated cfnames after call to open
cfnames_to_free.push_back(cfname); cfnames_to_free.push_back(cfname);
jcfnames_for_free.push_back(byteArray); jcfnames_for_free.push_back(cf_name_in_byte_array);
column_families.push_back(rocksdb::ColumnFamilyDescriptor( column_families.push_back(rocksdb::ColumnFamilyDescriptor(
std::string(reinterpret_cast<char *>(cfname), len), *cfOptions)); std::string(reinterpret_cast<char *>(cfname), len), *cfOptions));
} }
@ -177,8 +177,8 @@ jobject Java_org_rocksdb_RocksDB_open__JLjava_lang_String_2Ljava_util_List_2I(
jobject jcf_descriptor = env->CallObjectMethod(iteratorObj, jobject jcf_descriptor = env->CallObjectMethod(iteratorObj,
rocksdb::ListJni::getNextMethod(env)); rocksdb::ListJni::getNextMethod(env));
// get ColumnFamilyName // get ColumnFamilyName
jbyteArray byteArray = static_cast<jbyteArray>(env->CallObjectMethod( jbyteArray cf_name_in_byte_array = static_cast<jbyteArray>(
jcf_descriptor, env->CallObjectMethod(jcf_descriptor,
rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod( rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod(
env))); env)));
// get CF Options // get CF Options
@ -188,12 +188,12 @@ jobject Java_org_rocksdb_RocksDB_open__JLjava_lang_String_2Ljava_util_List_2I(
rocksdb::ColumnFamilyOptions* cfOptions = rocksdb::ColumnFamilyOptions* cfOptions =
rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj); rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj);
jbyte* cfname = env->GetByteArrayElements(byteArray, 0); jbyte* cfname = env->GetByteArrayElements(cf_name_in_byte_array, 0);
const int len = env->GetArrayLength(byteArray); const int len = env->GetArrayLength(cf_name_in_byte_array);
// free allocated cfnames after call to open // free allocated cfnames after call to open
cfnames_to_free.push_back(cfname); cfnames_to_free.push_back(cfname);
jcfnames_for_free.push_back(byteArray); jcfnames_for_free.push_back(cf_name_in_byte_array);
column_families.push_back(rocksdb::ColumnFamilyDescriptor( column_families.push_back(rocksdb::ColumnFamilyDescriptor(
std::string(reinterpret_cast<char *>(cfname), len), *cfOptions)); std::string(reinterpret_cast<char *>(cfname), len), *cfOptions));
} }

Write Preview
Loading…
Cancel
Save