c6d464a9da
Summary: I have manually audited the entire RocksJava code base. Sorry for the large pull-request, I have broken it down into many small atomic commits though. My initial intention was to fix the warnings that appear when running RocksJava on Java 8 with `-Xcheck:jni`, for example when running `make jtest` you would see many errors similar to: ``` WARNING in native method: JNI call made without checking exceptions when required to from CallObjectMethod WARNING in native method: JNI call made without checking exceptions when required to from CallVoidMethod WARNING in native method: JNI call made without checking exceptions when required to from CallStaticVoidMethod ... ``` A few of those warnings still remain, however they seem to come directly from the JVM and are not directly related to RocksJava; I am in contact with the OpenJDK hostpot-dev mailing list about these - http://mail.openjdk.java.net/pipermail/hotspot-dev/2017-February/025981.html. As a result of fixing these, I realised we were not r Closes https://github.com/facebook/rocksdb/pull/1890 Differential Revision: D4591758 Pulled By: siying fbshipit-source-id: 7f7fdf4
40 lines
1.3 KiB
C++
40 lines
1.3 KiB
C++
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
|
// This source code is licensed under the BSD-style license found in the
|
|
// LICENSE file in the root directory of this source tree. An additional grant
|
|
// of patent rights can be found in the PATENTS file in the same directory.
|
|
//
|
|
// This file implements the "bridge" between Java and C++ and enables
|
|
// calling c++ rocksdb::RestoreBackupableDB and rocksdb::RestoreOptions methods
|
|
// from Java side.
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <jni.h>
|
|
#include <string>
|
|
|
|
#include "include/org_rocksdb_RestoreOptions.h"
|
|
#include "rocksjni/portal.h"
|
|
#include "rocksdb/utilities/backupable_db.h"
|
|
/*
|
|
* Class: org_rocksdb_RestoreOptions
|
|
* Method: newRestoreOptions
|
|
* Signature: (Z)J
|
|
*/
|
|
jlong Java_org_rocksdb_RestoreOptions_newRestoreOptions(JNIEnv* env,
|
|
jclass jcls, jboolean keep_log_files) {
|
|
auto* ropt = new rocksdb::RestoreOptions(keep_log_files);
|
|
return reinterpret_cast<jlong>(ropt);
|
|
}
|
|
|
|
/*
|
|
* Class: org_rocksdb_RestoreOptions
|
|
* Method: disposeInternal
|
|
* Signature: (J)V
|
|
*/
|
|
void Java_org_rocksdb_RestoreOptions_disposeInternal(JNIEnv* env, jobject jobj,
|
|
jlong jhandle) {
|
|
auto* ropt = reinterpret_cast<rocksdb::RestoreOptions*>(jhandle);
|
|
assert(ropt);
|
|
delete ropt;
|
|
}
|