diff --git a/java/rocksjni/iterator.cc b/java/rocksjni/iterator.cc index 7b83991c736807897f85a4ccf966e0b25f9970ec..f23ca1d87b6bebaed774202a128468392461a1b4 100644 --- a/java/rocksjni/iterator.cc +++ b/java/rocksjni/iterator.cc @@ -21,8 +21,7 @@ */ jboolean Java_org_rocksdb_Iterator_isValid0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); - return it->Valid(); + return reinterpret_cast(handle)->Valid(); } /* @@ -32,8 +31,7 @@ jboolean Java_org_rocksdb_Iterator_isValid0( */ void Java_org_rocksdb_Iterator_seekToFirst0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); - it->SeekToFirst(); + reinterpret_cast(handle)->SeekToFirst(); } /* @@ -43,8 +41,7 @@ void Java_org_rocksdb_Iterator_seekToFirst0( */ void Java_org_rocksdb_Iterator_seekToLast0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); - it->SeekToLast(); + reinterpret_cast(handle)->SeekToLast(); } /* @@ -54,8 +51,7 @@ void Java_org_rocksdb_Iterator_seekToLast0( */ void Java_org_rocksdb_Iterator_next0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); - it->Next(); + reinterpret_cast(handle)->Next(); } /* @@ -65,8 +61,7 @@ void Java_org_rocksdb_Iterator_next0( */ void Java_org_rocksdb_Iterator_prev0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); - it->Prev(); + reinterpret_cast(handle)->Prev(); } /* @@ -76,7 +71,7 @@ void Java_org_rocksdb_Iterator_prev0( */ jbyteArray Java_org_rocksdb_Iterator_key0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); + auto it = reinterpret_cast(handle); rocksdb::Slice key_slice = it->key(); jbyteArray jkey = env->NewByteArray(key_slice.size()); @@ -93,7 +88,7 @@ jbyteArray Java_org_rocksdb_Iterator_key0( */ jbyteArray Java_org_rocksdb_Iterator_value0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); + auto it = reinterpret_cast(handle); rocksdb::Slice value_slice = it->value(); jbyteArray jvalue = env->NewByteArray(value_slice.size()); @@ -111,7 +106,7 @@ jbyteArray Java_org_rocksdb_Iterator_value0( void Java_org_rocksdb_Iterator_seek0( JNIEnv* env, jobject jobj, jlong handle, jbyteArray jtarget, jint jtarget_len) { - auto it = rocksdb::IteratorJni::getIterator(handle); + auto it = reinterpret_cast(handle); jbyte* target = env->GetByteArrayElements(jtarget, 0); rocksdb::Slice target_slice( reinterpret_cast(target), jtarget_len); @@ -128,7 +123,7 @@ void Java_org_rocksdb_Iterator_seek0( */ void Java_org_rocksdb_Iterator_status0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); + auto it = reinterpret_cast(handle); rocksdb::Status s = it->status(); if (s.ok()) { @@ -145,7 +140,7 @@ void Java_org_rocksdb_Iterator_status0( */ void Java_org_rocksdb_Iterator_close0( JNIEnv* env, jobject jobj, jlong handle) { - auto it = rocksdb::IteratorJni::getIterator(handle); + auto it = reinterpret_cast(handle); delete it; rocksdb::IteratorJni::setHandle(env, jobj, nullptr); diff --git a/java/rocksjni/portal.h b/java/rocksjni/portal.h index fea01bcc52474111cf9feb1adbaa5cef3ace0ab3..a4e2dc21ac967a5ba7d156d0195e42bc34ecb444 100644 --- a/java/rocksjni/portal.h +++ b/java/rocksjni/portal.h @@ -245,14 +245,6 @@ class IteratorJni { jobj, getHandleFieldID(env), reinterpret_cast(op)); } - - // Cast long to rocksdb::Iterator pointer. - static rocksdb::Iterator* getIterator(jlong handle) { - auto it = reinterpret_cast(handle); - assert(it != nullptr); - - return it; - } }; } // namespace rocksdb #endif // JAVA_ROCKSJNI_PORTAL_H_