From 2faec9e8b543cbf8aace84820ce42f7d47dd34af Mon Sep 17 00:00:00 2001 From: fredia Date: Fri, 18 Oct 2024 14:52:10 +0800 Subject: [PATCH] [FLINK-35928][build] Rename jclass to forst in *.cc --- java/forstjni/checkpoint.cc | 2 +- java/forstjni/columnfamilyhandle.cc | 2 +- java/forstjni/compact_range_options.cc | 2 +- java/forstjni/compaction_filter.cc | 2 +- java/forstjni/compaction_job_info.cc | 2 +- java/forstjni/env.cc | 2 +- java/forstjni/flink_compactionfilterjni.cc | 10 +++++----- java/forstjni/jnicallback.cc | 2 +- java/forstjni/options.cc | 4 ++-- java/forstjni/options_util.cc | 2 +- java/forstjni/rocks_callback_object.cc | 2 +- java/forstjni/rocksjni.cc | 8 ++++---- java/forstjni/slice.cc | 6 +++--- java/forstjni/statistics.cc | 2 +- java/forstjni/table_filter.cc | 2 +- java/forstjni/transaction.cc | 2 +- java/forstjni/transaction_db.cc | 2 +- java/forstjni/transaction_log.cc | 2 +- java/forstjni/ttl.cc | 2 +- java/forstjni/write_batch.cc | 2 +- java/forstjni/write_batch_with_index.cc | 4 ++-- utilities/flink/flink_compaction_filter_test.cc | 4 ++-- 22 files changed, 34 insertions(+), 34 deletions(-) diff --git a/java/forstjni/checkpoint.cc b/java/forstjni/checkpoint.cc index dd689b5aa..7a2fd3b8d 100644 --- a/java/forstjni/checkpoint.cc +++ b/java/forstjni/checkpoint.cc @@ -73,7 +73,7 @@ void Java_org_forstdb_Checkpoint_createCheckpoint(JNIEnv* env, jobject /*jobj*/, /* * Class: org_forstdb_Checkpoint * Method: exportColumnFamily - * Signature: (JJLjava/lang/String;)Lorg/rocksdb/ExportImportFilesMetaData; + * Signature: (JJLjava/lang/String;)Lorg/forstdb/ExportImportFilesMetaData; */ jlong Java_org_forstdb_Checkpoint_exportColumnFamily( JNIEnv* env, jobject /*jobj*/, jlong jcheckpoint_handle, diff --git a/java/forstjni/columnfamilyhandle.cc b/java/forstjni/columnfamilyhandle.cc index abca5ff5f..e548a1674 100644 --- a/java/forstjni/columnfamilyhandle.cc +++ b/java/forstjni/columnfamilyhandle.cc @@ -42,7 +42,7 @@ jint Java_org_forstdb_ColumnFamilyHandle_getID(JNIEnv* /*env*/, /* * Class: org_forstdb_ColumnFamilyHandle * Method: getDescriptor - * Signature: (J)Lorg/rocksdb/ColumnFamilyDescriptor; + * Signature: (J)Lorg/forstdb/ColumnFamilyDescriptor; */ jobject Java_org_forstdb_ColumnFamilyHandle_getDescriptor(JNIEnv* env, jobject /*jobj*/, diff --git a/java/forstjni/compact_range_options.cc b/java/forstjni/compact_range_options.cc index 89d8a9156..6f3e1c84e 100644 --- a/java/forstjni/compact_range_options.cc +++ b/java/forstjni/compact_range_options.cc @@ -280,7 +280,7 @@ void Java_org_forstdb_CompactRangeOptions_setFullHistoryTSLow(JNIEnv*, jobject, /* * Class: org_forstdb_CompactRangeOptions * Method: fullHistoryTSLow - * Signature: (J)Lorg/rocksdb/CompactRangeOptions/Timestamp; + * Signature: (J)Lorg/forstdb/CompactRangeOptions/Timestamp; */ jobject Java_org_forstdb_CompactRangeOptions_fullHistoryTSLow(JNIEnv* env, jobject, diff --git a/java/forstjni/compaction_filter.cc b/java/forstjni/compaction_filter.cc index f45234896..739447f96 100644 --- a/java/forstjni/compaction_filter.cc +++ b/java/forstjni/compaction_filter.cc @@ -12,7 +12,7 @@ #include "include/org_forstdb_AbstractCompactionFilter.h" -// +// /* * Class: org_forstdb_AbstractCompactionFilter diff --git a/java/forstjni/compaction_job_info.cc b/java/forstjni/compaction_job_info.cc index b6bef26e1..4097876ba 100644 --- a/java/forstjni/compaction_job_info.cc +++ b/java/forstjni/compaction_job_info.cc @@ -51,7 +51,7 @@ jbyteArray Java_org_forstdb_CompactionJobInfo_columnFamilyName(JNIEnv* env, /* * Class: org_forstdb_CompactionJobInfo * Method: status - * Signature: (J)Lorg/rocksdb/Status; + * Signature: (J)Lorg/forstdb/Status; */ jobject Java_org_forstdb_CompactionJobInfo_status(JNIEnv* env, jclass, jlong jhandle) { diff --git a/java/forstjni/env.cc b/java/forstjni/env.cc index bde4ed574..32a9bbe01 100644 --- a/java/forstjni/env.cc +++ b/java/forstjni/env.cc @@ -123,7 +123,7 @@ void Java_org_forstdb_Env_lowerThreadPoolCPUPriority(JNIEnv*, jobject, /* * Class: org_forstdb_Env * Method: getThreadList - * Signature: (J)[Lorg/rocksdb/ThreadStatus; + * Signature: (J)[Lorg/forstdb/ThreadStatus; */ jobjectArray Java_org_forstdb_Env_getThreadList(JNIEnv* env, jobject, jlong jhandle) { diff --git a/java/forstjni/flink_compactionfilterjni.cc b/java/forstjni/flink_compactionfilterjni.cc index 793c56698..0f17cd4b3 100644 --- a/java/forstjni/flink_compactionfilterjni.cc +++ b/java/forstjni/flink_compactionfilterjni.cc @@ -39,7 +39,7 @@ class JavaListElementFilter JavaListElementFilter(JNIEnv* env, jobject jlist_filter) : JniCallbackBase(env, jlist_filter) { jclass jclazz = ROCKSDB_NAMESPACE::JavaClass::getJClass( - env, "org/rocksdb/FlinkCompactionFilter$ListElementFilter"); + env, "org/forstdb/FlinkCompactionFilter$ListElementFilter"); if (jclazz == nullptr) { // exception occurred accessing class return; @@ -82,14 +82,14 @@ class JavaListElemenFilterFactory JavaListElemenFilterFactory(JNIEnv* env, jobject jlist_filter_factory) : JniCallbackBase(env, jlist_filter_factory) { jclass jclazz = ROCKSDB_NAMESPACE::JavaClass::getJClass( - env, "org/rocksdb/FlinkCompactionFilter$ListElementFilterFactory"); + env, "org/forstdb/FlinkCompactionFilter$ListElementFilterFactory"); if (jclazz == nullptr) { // exception occurred accessing class return; } m_jcreate_filter_methodid = env->GetMethodID( jclazz, "createListElementFilter", - "()Lorg/rocksdb/FlinkCompactionFilter$ListElementFilter;"); + "()Lorg/forstdb/FlinkCompactionFilter$ListElementFilter;"); assert(m_jcreate_filter_methodid != nullptr); } @@ -117,7 +117,7 @@ class JavaTimeProvider JavaTimeProvider(JNIEnv* env, jobject jtime_provider) : JniCallbackBase(env, jtime_provider) { jclass jclazz = ROCKSDB_NAMESPACE::JavaClass::getJClass( - env, "org/rocksdb/FlinkCompactionFilter$TimeProvider"); + env, "org/forstdb/FlinkCompactionFilter$TimeProvider"); if (jclazz == nullptr) { // exception occurred accessing class return; @@ -214,7 +214,7 @@ jlong Java_org_forstdb_FlinkCompactionFilter_createNewFlinkCompactionFilter0( /* * Class: org_forstdb_FlinkCompactionFilter * Method: configureFlinkCompactionFilter - * Signature: (JIIJJILorg/rocksdb/FlinkCompactionFilter$ListElementFilter;)Z + * Signature: (JIIJJILorg/forstdb/FlinkCompactionFilter$ListElementFilter;)Z */ jboolean Java_org_forstdb_FlinkCompactionFilter_configureFlinkCompactionFilter( JNIEnv* env, jclass /* jcls */, jlong handle, jint ji_state_type, diff --git a/java/forstjni/jnicallback.cc b/java/forstjni/jnicallback.cc index 51fe1f04c..29db5b960 100644 --- a/java/forstjni/jnicallback.cc +++ b/java/forstjni/jnicallback.cc @@ -4,7 +4,7 @@ // (found in the LICENSE.Apache file in the root directory). // // This file implements the callback "bridge" between Java and C++ for -// JNI Callbacks from C++ to sub-classes or org.rocksdb.RocksCallbackObject +// JNI Callbacks from C++ to sub-classes or org.forstdb.RocksCallbackObject #include "forstjni/jnicallback.h" diff --git a/java/forstjni/options.cc b/java/forstjni/options.cc index bc61f470d..02690f60f 100644 --- a/java/forstjni/options.cc +++ b/java/forstjni/options.cc @@ -1784,7 +1784,7 @@ static jobjectArray rocksdb_get_event_listeners_helper( /* * Class: org_forstdb_Options * Method: eventListeners - * Signature: (J)[Lorg/rocksdb/AbstractEventListener; + * Signature: (J)[Lorg/forstdb/AbstractEventListener; */ jobjectArray Java_org_forstdb_Options_eventListeners(JNIEnv* env, jclass, jlong jhandle) { @@ -7220,7 +7220,7 @@ void Java_org_forstdb_DBOptions_setEventListeners(JNIEnv* env, jclass, /* * Class: org_forstdb_DBOptions * Method: eventListeners - * Signature: (J)[Lorg/rocksdb/AbstractEventListener; + * Signature: (J)[Lorg/forstdb/AbstractEventListener; */ jobjectArray Java_org_forstdb_DBOptions_eventListeners(JNIEnv* env, jclass, jlong jhandle) { diff --git a/java/forstjni/options_util.cc b/java/forstjni/options_util.cc index 99c8328a1..8074c8411 100644 --- a/java/forstjni/options_util.cc +++ b/java/forstjni/options_util.cc @@ -141,7 +141,7 @@ jstring Java_org_forstdb_OptionsUtil_getLatestOptionsFileName( /* * Class: org_forstdb_OptionsUtil * Method: readTableFormatConfig - * Signature: (J)Lorg/rocksdb/TableFormatConfig; + * Signature: (J)Lorg/forstdb/TableFormatConfig; */ jobject Java_org_forstdb_OptionsUtil_readTableFormatConfig(JNIEnv* env, jclass, jlong jcf_options) { diff --git a/java/forstjni/rocks_callback_object.cc b/java/forstjni/rocks_callback_object.cc index 19a32866a..19e8fe948 100644 --- a/java/forstjni/rocks_callback_object.cc +++ b/java/forstjni/rocks_callback_object.cc @@ -4,7 +4,7 @@ // (found in the LICENSE.Apache file in the root directory). // // This file implements the "bridge" between Java and C++ for -// JNI Callbacks from C++ to sub-classes or org.rocksdb.RocksCallbackObject +// JNI Callbacks from C++ to sub-classes or org.forstdb.RocksCallbackObject #include diff --git a/java/forstjni/rocksjni.cc b/java/forstjni/rocksjni.cc index e9c9b7915..52767ece4 100644 --- a/java/forstjni/rocksjni.cc +++ b/java/forstjni/rocksjni.cc @@ -2210,7 +2210,7 @@ jobjectArray Java_org_forstdb_RocksDB_multiGet__JJ_3_3B_3I_3I_3J( * Class: org_forstdb_RocksDB * Method: multiGet * Signature: - * (JJ[J[Ljava/nio/ByteBuffer;[I[I[Ljava/nio/ByteBuffer;[I[Lorg/rocksdb/Status;)V + * (JJ[J[Ljava/nio/ByteBuffer;[I[I[Ljava/nio/ByteBuffer;[I[Lorg/forstdb/Status;)V */ void Java_org_forstdb_RocksDB_multiGet__JJ_3J_3Ljava_nio_ByteBuffer_2_3I_3I_3Ljava_nio_ByteBuffer_2_3I_3Lorg_forstdb_Status_2( JNIEnv* env, jobject jdb, jlong jdb_handle, jlong jropt_handle, @@ -3587,7 +3587,7 @@ jobjectArray Java_org_forstdb_RocksDB_getLiveFiles(JNIEnv* env, jobject, /* * Class: org_forstdb_RocksDB * Method: getSortedWalFiles - * Signature: (J)[Lorg/rocksdb/LogFile; + * Signature: (J)[Lorg/forstdb/LogFile; */ jobjectArray Java_org_forstdb_RocksDB_getSortedWalFiles(JNIEnv* env, jobject, jlong jdb_handle) { @@ -3674,7 +3674,7 @@ void Java_org_forstdb_RocksDB_deleteFile(JNIEnv* env, jobject, jlong jdb_handle, /* * Class: org_forstdb_RocksDB * Method: getLiveFilesMetaData - * Signature: (J)[Lorg/rocksdb/LiveFileMetaData; + * Signature: (J)[Lorg/forstdb/LiveFileMetaData; */ jobjectArray Java_org_forstdb_RocksDB_getLiveFilesMetaData(JNIEnv* env, jobject, jlong jdb_handle) { @@ -3721,7 +3721,7 @@ jobjectArray Java_org_forstdb_RocksDB_getLiveFilesMetaData(JNIEnv* env, jobject, /* * Class: org_forstdb_RocksDB * Method: getColumnFamilyMetaData - * Signature: (JJ)Lorg/rocksdb/ColumnFamilyMetaData; + * Signature: (JJ)Lorg/forstdb/ColumnFamilyMetaData; */ jobject Java_org_forstdb_RocksDB_getColumnFamilyMetaData(JNIEnv* env, jobject, jlong jdb_handle, diff --git a/java/forstjni/slice.cc b/java/forstjni/slice.cc index 3d447562c..a72fa3f24 100644 --- a/java/forstjni/slice.cc +++ b/java/forstjni/slice.cc @@ -20,7 +20,7 @@ #include "forstjni/cplusplus_to_java_convert.h" #include "forstjni/portal.h" -// /* * Class: org_forstdb_AbstractSlice @@ -125,7 +125,7 @@ void Java_org_forstdb_AbstractSlice_disposeInternal(JNIEnv* /*env*/, // -// /* * Class: org_forstdb_Slice @@ -257,7 +257,7 @@ void Java_org_forstdb_Slice_disposeInternalBuf(JNIEnv* /*env*/, // -// /* * Class: org_forstdb_DirectSlice diff --git a/java/forstjni/statistics.cc b/java/forstjni/statistics.cc index c6d0c8257..eff45a3c3 100644 --- a/java/forstjni/statistics.cc +++ b/java/forstjni/statistics.cc @@ -180,7 +180,7 @@ jlong Java_org_forstdb_Statistics_getAndResetTickerCount(JNIEnv*, jobject, /* * Class: org_forstdb_Statistics * Method: getHistogramData - * Signature: (JB)Lorg/rocksdb/HistogramData; + * Signature: (JB)Lorg/forstdb/HistogramData; */ jobject Java_org_forstdb_Statistics_getHistogramData(JNIEnv* env, jobject, jlong jhandle, diff --git a/java/forstjni/table_filter.cc b/java/forstjni/table_filter.cc index ac234d889..208aca21a 100644 --- a/java/forstjni/table_filter.cc +++ b/java/forstjni/table_filter.cc @@ -4,7 +4,7 @@ // (found in the LICENSE.Apache file in the root directory). // // This file implements the "bridge" between Java and C++ for -// org.rocksdb.AbstractTableFilter. +// org.forstdb.AbstractTableFilter. #include diff --git a/java/forstjni/transaction.cc b/java/forstjni/transaction.cc index 5212d2ad8..7b64a7458 100644 --- a/java/forstjni/transaction.cc +++ b/java/forstjni/transaction.cc @@ -1700,7 +1700,7 @@ jboolean Java_org_forstdb_Transaction_isDeadlockDetect(JNIEnv* /*env*/, /* * Class: org_forstdb_Transaction * Method: getWaitingTxns - * Signature: (J)Lorg/rocksdb/Transaction/WaitingTransactions; + * Signature: (J)Lorg/forstdb/Transaction/WaitingTransactions; */ jobject Java_org_forstdb_Transaction_getWaitingTxns(JNIEnv* env, jobject jtransaction_obj, diff --git a/java/forstjni/transaction_db.cc b/java/forstjni/transaction_db.cc index 0d8ae20c6..e7df93ebd 100644 --- a/java/forstjni/transaction_db.cc +++ b/java/forstjni/transaction_db.cc @@ -357,7 +357,7 @@ jobject Java_org_forstdb_TransactionDB_getLockStatusData(JNIEnv* env, jobject, /* * Class: org_forstdb_TransactionDB * Method: getDeadlockInfoBuffer - * Signature: (J)[Lorg/rocksdb/TransactionDB/DeadlockPath; + * Signature: (J)[Lorg/forstdb/TransactionDB/DeadlockPath; */ jobjectArray Java_org_forstdb_TransactionDB_getDeadlockInfoBuffer( JNIEnv* env, jobject jobj, jlong jhandle) { diff --git a/java/forstjni/transaction_log.cc b/java/forstjni/transaction_log.cc index 8ddc64322..1a4719d75 100644 --- a/java/forstjni/transaction_log.cc +++ b/java/forstjni/transaction_log.cc @@ -68,7 +68,7 @@ void Java_org_forstdb_TransactionLogIterator_status(JNIEnv* env, /* * Class: org_forstdb_TransactionLogIterator * Method: getBatch - * Signature: (J)Lorg/rocksdb/TransactionLogIterator$BatchResult + * Signature: (J)Lorg/forstdb/TransactionLogIterator$BatchResult */ jobject Java_org_forstdb_TransactionLogIterator_getBatch(JNIEnv* env, jobject /*jobj*/, diff --git a/java/forstjni/ttl.cc b/java/forstjni/ttl.cc index 4621c245f..98cd83b20 100644 --- a/java/forstjni/ttl.cc +++ b/java/forstjni/ttl.cc @@ -179,7 +179,7 @@ void Java_org_forstdb_TtlDB_closeDatabase(JNIEnv* /* env */, jclass, /* * Class: org_forstdb_TtlDB * Method: createColumnFamilyWithTtl - * Signature: (JLorg/rocksdb/ColumnFamilyDescriptor;[BJI)J; + * Signature: (JLorg/forstdb/ColumnFamilyDescriptor;[BJI)J; */ jlong Java_org_forstdb_TtlDB_createColumnFamilyWithTtl(JNIEnv* env, jobject, jlong jdb_handle, diff --git a/java/forstjni/write_batch.cc b/java/forstjni/write_batch.cc index d9dc5557a..aa6c5f226 100644 --- a/java/forstjni/write_batch.cc +++ b/java/forstjni/write_batch.cc @@ -639,7 +639,7 @@ void Java_org_forstdb_WriteBatch_markWalTerminationPoint(JNIEnv* /*env*/, /* * Class: org_forstdb_WriteBatch * Method: getWalTerminationPoint - * Signature: (J)Lorg/rocksdb/WriteBatch/SavePoint; + * Signature: (J)Lorg/forstdb/WriteBatch/SavePoint; */ jobject Java_org_forstdb_WriteBatch_getWalTerminationPoint(JNIEnv* env, jobject /*jobj*/, diff --git a/java/forstjni/write_batch_with_index.cc b/java/forstjni/write_batch_with_index.cc index e4ed9a449..e13c750e1 100644 --- a/java/forstjni/write_batch_with_index.cc +++ b/java/forstjni/write_batch_with_index.cc @@ -486,7 +486,7 @@ void Java_org_forstdb_WriteBatchWithIndex_setMaxBytes(JNIEnv* /*env*/, /* * Class: org_forstdb_WriteBatchWithIndex * Method: getWriteBatch - * Signature: (J)Lorg/rocksdb/WriteBatch; + * Signature: (J)Lorg/forstdb/WriteBatch; */ jobject Java_org_forstdb_WriteBatchWithIndex_getWriteBatch(JNIEnv* env, jobject /*jobj*/, @@ -898,7 +898,7 @@ jlongArray Java_org_forstdb_WBWIRocksIterator_entry1(JNIEnv* env, results[0] = ROCKSDB_NAMESPACE::WriteTypeJni::toJavaWriteType(we.type); // NOTE: key_slice and value_slice will be freed by - // org.rocksdb.DirectSlice#close + // org.forstdb.DirectSlice#close auto* key_slice = new ROCKSDB_NAMESPACE::Slice(we.key.data(), we.key.size()); results[1] = GET_CPLUSPLUS_POINTER(key_slice); diff --git a/utilities/flink/flink_compaction_filter_test.cc b/utilities/flink/flink_compaction_filter_test.cc index 26613ae68..192191cd3 100644 --- a/utilities/flink/flink_compaction_filter_test.cc +++ b/utilities/flink/flink_compaction_filter_test.cc @@ -131,8 +131,8 @@ void Deinit() { delete filter; } TEST(FlinkStateTtlTest, CheckStateTypeEnumOrder) { // NOLINT // if the order changes it also needs to be adjusted in Java client: - // in org.rocksdb.FlinkCompactionFilter - // and in org.rocksdb.FlinkCompactionFilterTest + // in org.forstdb.FlinkCompactionFilter + // and in org.forstdb.FlinkCompactionFilterTest EXPECT_EQ(DISABLED, 0); EXPECT_EQ(VALUE, 1); EXPECT_EQ(LIST, 2);