Skip to content

Commit

Permalink
[FLINK-35928][build] Rename jclass to forst in *.cc
Browse files Browse the repository at this point in the history
  • Loading branch information
fredia committed Oct 18, 2024
1 parent eef75e6 commit 2faec9e
Show file tree
Hide file tree
Showing 22 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion java/forstjni/checkpoint.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/columnfamilyhandle.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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*/,
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/compact_range_options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/compaction_filter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "include/org_forstdb_AbstractCompactionFilter.h"

// <editor-fold desc="org.rocksdb.AbstractCompactionFilter">
// <editor-fold desc="org.forstdb.AbstractCompactionFilter">

/*
* Class: org_forstdb_AbstractCompactionFilter
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/compaction_job_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/env.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions java/forstjni/flink_compactionfilterjni.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/jnicallback.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions java/forstjni/options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/options_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/rocks_callback_object.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <jni.h>

Expand Down
8 changes: 4 additions & 4 deletions java/forstjni/rocksjni.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions java/forstjni/slice.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "forstjni/cplusplus_to_java_convert.h"
#include "forstjni/portal.h"

// <editor-fold desc="org.rocksdb.AbstractSlice>
// <editor-fold desc="org.forstdb.AbstractSlice>

/*
* Class: org_forstdb_AbstractSlice
Expand Down Expand Up @@ -125,7 +125,7 @@ void Java_org_forstdb_AbstractSlice_disposeInternal(JNIEnv* /*env*/,

// </editor-fold>

// <editor-fold desc="org.rocksdb.Slice>
// <editor-fold desc="org.forstdb.Slice>

/*
* Class: org_forstdb_Slice
Expand Down Expand Up @@ -257,7 +257,7 @@ void Java_org_forstdb_Slice_disposeInternalBuf(JNIEnv* /*env*/,

// </editor-fold>

// <editor-fold desc="org.rocksdb.DirectSlice>
// <editor-fold desc="org.forstdb.DirectSlice>

/*
* Class: org_forstdb_DirectSlice
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/statistics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/table_filter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <jni.h>

Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/transaction.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/transaction_db.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/transaction_log.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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*/,
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/ttl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion java/forstjni/write_batch.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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*/,
Expand Down
4 changes: 2 additions & 2 deletions java/forstjni/write_batch_with_index.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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*/,
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions utilities/flink/flink_compaction_filter_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2faec9e

Please sign in to comment.