native static should be static native

facebook · Dec 20, 2023 · f1f69f3 · f1f69f3
1 parent 512b302
commit f1f69f3
Show file tree

Hide file tree

Showing 5 changed files with 152 additions and 191 deletions.
diff --git a/java/rocksjni/rocksjni.cc b/java/rocksjni/rocksjni.cc
@@ -3245,8 +3245,7 @@ jstring Java_org_rocksdb_RocksDB_getDBOptions(JNIEnv* env, jclass,
  * Method:    setPerfLevel
  * Signature: (JB)V
  */
-void Java_org_rocksdb_RocksDB_setPerfLevel(JNIEnv*, jclass,
-                                           jbyte jperf_level) {
+void Java_org_rocksdb_RocksDB_setPerfLevel(JNIEnv*, jclass, jbyte jperf_level) {
   rocksdb::SetPerfLevel(
       ROCKSDB_NAMESPACE::PerfLevelTypeJni::toCppPerfLevelType(jperf_level));
 }

diff --git a/java/rocksjni/transaction.cc b/java/rocksjni/transaction.cc
@@ -591,8 +591,8 @@ jobjectArray Java_org_rocksdb_Transaction_multiGetForUpdate__JJ_3_3B(
  * Method:    getIterator
  * Signature: (JJJ)J
  */
-jlong Java_org_rocksdb_Transaction_getIterator(JNIEnv* /*env*/,
-                                               jclass, jlong jhandle,
+jlong Java_org_rocksdb_Transaction_getIterator(JNIEnv* /*env*/, jclass,
+                                               jlong jhandle,
                                                jlong jread_options_handle,
                                                jlong jcolumn_family_handle) {
   auto* txn = reinterpret_cast<ROCKSDB_NAMESPACE::Transaction*>(jhandle);
@@ -611,9 +611,9 @@ jlong Java_org_rocksdb_Transaction_getIterator(JNIEnv* /*env*/,
  * Signature: (J[BII[BIIJZ)V
  */
 void Java_org_rocksdb_Transaction_put__J_3BII_3BIIJZ(
-    JNIEnv* env, jclass, jlong jhandle, jbyteArray jkey,
-    jint jkey_off, jint jkey_part_len, jbyteArray jval, jint jval_off,
-    jint jval_len, jlong jcolumn_family_handle, jboolean jassume_tracked) {
+    JNIEnv* env, jclass, jlong jhandle, jbyteArray jkey, jint jkey_off,
+    jint jkey_part_len, jbyteArray jval, jint jval_off, jint jval_len,
+    jlong jcolumn_family_handle, jboolean jassume_tracked) {
   auto* txn = reinterpret_cast<ROCKSDB_NAMESPACE::Transaction*>(jhandle);
   auto* column_family_handle =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyHandle*>(
@@ -635,9 +635,8 @@ void Java_org_rocksdb_Transaction_put__J_3BII_3BIIJZ(
  * Signature: (J[BII[BII)V
  */
 void Java_org_rocksdb_Transaction_put__J_3BII_3BII(
-    JNIEnv* env, jclass /*jobj*/, jlong jhandle, jbyteArray jkey,
-    jint jkey_off, jint jkey_part_len, jbyteArray jval, jint jval_off,
-    jint jval_len) {
+    JNIEnv* env, jclass /*jobj*/, jlong jhandle, jbyteArray jkey, jint jkey_off,
+    jint jkey_part_len, jbyteArray jval, jint jval_off, jint jval_len) {
   auto* txn = reinterpret_cast<ROCKSDB_NAMESPACE::Transaction*>(jhandle);
   try {
     ROCKSDB_NAMESPACE::JByteArraySlice key(env, jkey, jkey_off, jkey_part_len);
@@ -845,9 +844,9 @@ void Java_org_rocksdb_Transaction_put__J_3_3BI_3_3BI(
  * Signature: (J[BII[BIIJZ)V
  */
 void Java_org_rocksdb_Transaction_merge__J_3BII_3BIIJZ(
-    JNIEnv* env, jclass, jlong jhandle, jbyteArray jkey,
-    jint jkey_off, jint jkey_part_len, jbyteArray jval, jint jval_off,
-    jint jval_len, jlong jcolumn_family_handle, jboolean jassume_tracked) {
+    JNIEnv* env, jclass, jlong jhandle, jbyteArray jkey, jint jkey_off,
+    jint jkey_part_len, jbyteArray jval, jint jval_off, jint jval_len,
+    jlong jcolumn_family_handle, jboolean jassume_tracked) {
   auto* txn = reinterpret_cast<ROCKSDB_NAMESPACE::Transaction*>(jhandle);
   auto* column_family_handle =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyHandle*>(
@@ -869,9 +868,8 @@ void Java_org_rocksdb_Transaction_merge__J_3BII_3BIIJZ(
  * Signature: (J[BII[BII)V
  */
 void Java_org_rocksdb_Transaction_merge__J_3BII_3BII(
-    JNIEnv* env, jclass /*jobj*/, jlong jhandle, jbyteArray jkey,
-    jint jkey_off, jint jkey_part_len, jbyteArray jval, jint jval_off,
-    jint jval_len) {
+    JNIEnv* env, jclass /*jobj*/, jlong jhandle, jbyteArray jkey, jint jkey_off,
+    jint jkey_part_len, jbyteArray jval, jint jval_off, jint jval_len) {
   auto* txn = reinterpret_cast<ROCKSDB_NAMESPACE::Transaction*>(jhandle);
   try {
     ROCKSDB_NAMESPACE::JByteArraySlice key(env, jkey, jkey_off, jkey_part_len);
@@ -1255,9 +1253,9 @@ void Java_org_rocksdb_Transaction_putUntracked__J_3_3BI_3_3BI(
  * Signature: (J[BII[BIIJ)V
  */
 void Java_org_rocksdb_Transaction_mergeUntracked(
-    JNIEnv* env, jclass, jlong jhandle, jbyteArray jkey,
-    jint jkey_off, jint jkey_part_len, jbyteArray jval, jint jval_off,
-    jint jval_len, jlong jcolumn_family_handle) {
+    JNIEnv* env, jclass, jlong jhandle, jbyteArray jkey, jint jkey_off,
+    jint jkey_part_len, jbyteArray jval, jint jval_off, jint jval_len,
+    jlong jcolumn_family_handle) {
   auto* txn = reinterpret_cast<ROCKSDB_NAMESPACE::Transaction*>(jhandle);
   auto* column_family_handle =
       reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyHandle*>(

diff --git a/java/src/main/java/org/rocksdb/OptionsUtil.java b/java/src/main/java/org/rocksdb/OptionsUtil.java
@@ -110,5 +110,5 @@ private static native void loadOptionsFromFile(long cfgHandle, String optionsFil
   private static native String getLatestOptionsFileName(String dbPath, long envHandle)
       throws RocksDBException;
 
-  private native static TableFormatConfig readTableFormatConfig(final long nativeHandle_);
+  private static native TableFormatConfig readTableFormatConfig(final long nativeHandle_);
 }