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
69 lines
2.2 KiB
C++
69 lines
2.2 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++ for
|
|
// rocksdb::Comparator.
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <jni.h>
|
|
#include <string>
|
|
#include <functional>
|
|
|
|
#include "include/org_rocksdb_AbstractComparator.h"
|
|
#include "include/org_rocksdb_Comparator.h"
|
|
#include "include/org_rocksdb_DirectComparator.h"
|
|
#include "rocksjni/comparatorjnicallback.h"
|
|
#include "rocksjni/portal.h"
|
|
|
|
// <editor-fold desc="org.rocksdb.AbstractComparator>
|
|
|
|
/*
|
|
* Class: org_rocksdb_AbstractComparator
|
|
* Method: disposeInternal
|
|
* Signature: (J)V
|
|
*/
|
|
void Java_org_rocksdb_AbstractComparator_disposeInternal(
|
|
JNIEnv* env, jobject jobj, jlong handle) {
|
|
auto* bcjc = reinterpret_cast<rocksdb::BaseComparatorJniCallback*>(handle);
|
|
assert(bcjc != nullptr);
|
|
delete bcjc;
|
|
}
|
|
// </editor-fold>
|
|
|
|
// <editor-fold desc="org.rocksdb.Comparator>
|
|
|
|
/*
|
|
* Class: org_rocksdb_Comparator
|
|
* Method: createNewComparator0
|
|
* Signature: ()J
|
|
*/
|
|
jlong Java_org_rocksdb_Comparator_createNewComparator0(
|
|
JNIEnv* env, jobject jobj, jlong copt_handle) {
|
|
const rocksdb::ComparatorJniCallbackOptions* copt =
|
|
reinterpret_cast<rocksdb::ComparatorJniCallbackOptions*>(copt_handle);
|
|
const rocksdb::ComparatorJniCallback* c =
|
|
new rocksdb::ComparatorJniCallback(env, jobj, copt);
|
|
return reinterpret_cast<jlong>(c);
|
|
}
|
|
// </editor-fold>
|
|
|
|
// <editor-fold desc="org.rocksdb.DirectComparator>
|
|
|
|
/*
|
|
* Class: org_rocksdb_DirectComparator
|
|
* Method: createNewDirectComparator0
|
|
* Signature: ()J
|
|
*/
|
|
jlong Java_org_rocksdb_DirectComparator_createNewDirectComparator0(
|
|
JNIEnv* env, jobject jobj, jlong copt_handle) {
|
|
const rocksdb::ComparatorJniCallbackOptions* copt =
|
|
reinterpret_cast<rocksdb::ComparatorJniCallbackOptions*>(copt_handle);
|
|
const rocksdb::DirectComparatorJniCallback* c =
|
|
new rocksdb::DirectComparatorJniCallback(env, jobj, copt);
|
|
return reinterpret_cast<jlong>(c);
|
|
}
|
|
// </editor-fold>
|