3be9b36453
Summary: This PR comments out the rest of the unused arguments which allow us to turn on the -Wunused-parameter flag. This is the second part of a codemod relating to https://github.com/facebook/rocksdb/pull/3557. Closes https://github.com/facebook/rocksdb/pull/3662 Differential Revision: D7426121 Pulled By: Dayvedde fbshipit-source-id: 223994923b42bd4953eb016a0129e47560f7e352
115 lines
3.9 KiB
C++
115 lines
3.9 KiB
C++
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
|
// This source code is licensed under both the GPLv2 (found in the
|
|
// COPYING file in the root directory) and Apache 2.0 License
|
|
// (found in the LICENSE.Apache file in the root directory).
|
|
//
|
|
// This file implements the "bridge" between Java and C++ and enables
|
|
// calling C++ rocksdb::OptionsUtil methods from Java side.
|
|
|
|
#include <jni.h>
|
|
|
|
#include "include/org_rocksdb_OptionsUtil.h"
|
|
|
|
#include "rocksdb/db.h"
|
|
#include "rocksdb/env.h"
|
|
#include "rocksdb/utilities/options_util.h"
|
|
#include "rocksjni/portal.h"
|
|
|
|
void build_column_family_descriptor_list(
|
|
JNIEnv* env, jobject jcfds,
|
|
std::vector<rocksdb::ColumnFamilyDescriptor>& cf_descs) {
|
|
jmethodID add_mid = rocksdb::ListJni::getListAddMethodId(env);
|
|
if (add_mid == nullptr) {
|
|
// exception occurred accessing method
|
|
return;
|
|
}
|
|
|
|
// Column family descriptor
|
|
for (rocksdb::ColumnFamilyDescriptor& cfd : cf_descs) {
|
|
// Construct a ColumnFamilyDescriptor java object
|
|
jobject jcfd = rocksdb::ColumnFamilyDescriptorJni::construct(env, &cfd);
|
|
if (env->ExceptionCheck()) {
|
|
// exception occurred constructing object
|
|
if (jcfd != nullptr) {
|
|
env->DeleteLocalRef(jcfd);
|
|
}
|
|
return;
|
|
}
|
|
|
|
// Add the object to java list.
|
|
jboolean rs = env->CallBooleanMethod(jcfds, add_mid, jcfd);
|
|
if (env->ExceptionCheck() || rs == JNI_FALSE) {
|
|
// exception occurred calling method, or could not add
|
|
if (jcfd != nullptr) {
|
|
env->DeleteLocalRef(jcfd);
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Class: org_rocksdb_OptionsUtil
|
|
* Method: loadLatestOptions
|
|
* Signature: (Ljava/lang/String;JLjava/util/List;Z)V
|
|
*/
|
|
void Java_org_rocksdb_OptionsUtil_loadLatestOptions(
|
|
JNIEnv* env, jclass /*jcls*/, jstring jdbpath, jlong jenv_handle,
|
|
jlong jdb_opts_handle, jobject jcfds, jboolean ignore_unknown_options) {
|
|
const char* db_path = env->GetStringUTFChars(jdbpath, nullptr);
|
|
std::vector<rocksdb::ColumnFamilyDescriptor> cf_descs;
|
|
rocksdb::Status s = rocksdb::LoadLatestOptions(
|
|
db_path, reinterpret_cast<rocksdb::Env*>(jenv_handle),
|
|
reinterpret_cast<rocksdb::DBOptions*>(jdb_opts_handle), &cf_descs,
|
|
ignore_unknown_options);
|
|
env->ReleaseStringUTFChars(jdbpath, db_path);
|
|
|
|
if (!s.ok()) {
|
|
rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
|
|
}
|
|
|
|
build_column_family_descriptor_list(env, jcfds, cf_descs);
|
|
}
|
|
|
|
/*
|
|
* Class: org_rocksdb_OptionsUtil
|
|
* Method: loadOptionsFromFile
|
|
* Signature: (Ljava/lang/String;JJLjava/util/List;Z)V
|
|
*/
|
|
void Java_org_rocksdb_OptionsUtil_loadOptionsFromFile(
|
|
JNIEnv* env, jclass /*jcls*/, jstring jopts_file_name, jlong jenv_handle,
|
|
jlong jdb_opts_handle, jobject jcfds, jboolean ignore_unknown_options) {
|
|
const char* opts_file_name = env->GetStringUTFChars(jopts_file_name, nullptr);
|
|
std::vector<rocksdb::ColumnFamilyDescriptor> cf_descs;
|
|
rocksdb::Status s = rocksdb::LoadOptionsFromFile(
|
|
opts_file_name, reinterpret_cast<rocksdb::Env*>(jenv_handle),
|
|
reinterpret_cast<rocksdb::DBOptions*>(jdb_opts_handle), &cf_descs,
|
|
ignore_unknown_options);
|
|
env->ReleaseStringUTFChars(jopts_file_name, opts_file_name);
|
|
|
|
if (!s.ok()) {
|
|
rocksdb::RocksDBExceptionJni::ThrowNew(env, s);
|
|
}
|
|
|
|
build_column_family_descriptor_list(env, jcfds, cf_descs);
|
|
}
|
|
|
|
/*
|
|
* Class: org_rocksdb_OptionsUtil
|
|
* Method: getLatestOptionsFileName
|
|
* Signature: (Ljava/lang/String;J)Ljava/lang/String;
|
|
*/
|
|
jstring Java_org_rocksdb_OptionsUtil_getLatestOptionsFileName(
|
|
JNIEnv* env, jclass /*jcls*/, jstring jdbpath, jlong jenv_handle) {
|
|
const char* db_path = env->GetStringUTFChars(jdbpath, nullptr);
|
|
std::string options_file_name;
|
|
if (db_path != nullptr) {
|
|
rocksdb::GetLatestOptionsFileName(
|
|
db_path, reinterpret_cast<rocksdb::Env*>(jenv_handle),
|
|
&options_file_name);
|
|
}
|
|
env->ReleaseStringUTFChars(jdbpath, db_path);
|
|
|
|
return env->NewStringUTF(options_file_name.c_str());
|
|
}
|