Skip to content

Commit 2faec9e

Browse files
committed
[FLINK-35928][build] Rename jclass to forst in *.cc
1 parent eef75e6 commit 2faec9e

22 files changed

+34
-34
lines changed

java/forstjni/checkpoint.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void Java_org_forstdb_Checkpoint_createCheckpoint(JNIEnv* env, jobject /*jobj*/,
7373
/*
7474
* Class: org_forstdb_Checkpoint
7575
* Method: exportColumnFamily
76-
* Signature: (JJLjava/lang/String;)Lorg/rocksdb/ExportImportFilesMetaData;
76+
* Signature: (JJLjava/lang/String;)Lorg/forstdb/ExportImportFilesMetaData;
7777
*/
7878
jlong Java_org_forstdb_Checkpoint_exportColumnFamily(
7979
JNIEnv* env, jobject /*jobj*/, jlong jcheckpoint_handle,

java/forstjni/columnfamilyhandle.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jint Java_org_forstdb_ColumnFamilyHandle_getID(JNIEnv* /*env*/,
4242
/*
4343
* Class: org_forstdb_ColumnFamilyHandle
4444
* Method: getDescriptor
45-
* Signature: (J)Lorg/rocksdb/ColumnFamilyDescriptor;
45+
* Signature: (J)Lorg/forstdb/ColumnFamilyDescriptor;
4646
*/
4747
jobject Java_org_forstdb_ColumnFamilyHandle_getDescriptor(JNIEnv* env,
4848
jobject /*jobj*/,

java/forstjni/compact_range_options.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void Java_org_forstdb_CompactRangeOptions_setFullHistoryTSLow(JNIEnv*, jobject,
280280
/*
281281
* Class: org_forstdb_CompactRangeOptions
282282
* Method: fullHistoryTSLow
283-
* Signature: (J)Lorg/rocksdb/CompactRangeOptions/Timestamp;
283+
* Signature: (J)Lorg/forstdb/CompactRangeOptions/Timestamp;
284284
*/
285285
jobject Java_org_forstdb_CompactRangeOptions_fullHistoryTSLow(JNIEnv* env,
286286
jobject,

java/forstjni/compaction_filter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "include/org_forstdb_AbstractCompactionFilter.h"
1414

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

1717
/*
1818
* Class: org_forstdb_AbstractCompactionFilter

java/forstjni/compaction_job_info.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jbyteArray Java_org_forstdb_CompactionJobInfo_columnFamilyName(JNIEnv* env,
5151
/*
5252
* Class: org_forstdb_CompactionJobInfo
5353
* Method: status
54-
* Signature: (J)Lorg/rocksdb/Status;
54+
* Signature: (J)Lorg/forstdb/Status;
5555
*/
5656
jobject Java_org_forstdb_CompactionJobInfo_status(JNIEnv* env, jclass,
5757
jlong jhandle) {

java/forstjni/env.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void Java_org_forstdb_Env_lowerThreadPoolCPUPriority(JNIEnv*, jobject,
123123
/*
124124
* Class: org_forstdb_Env
125125
* Method: getThreadList
126-
* Signature: (J)[Lorg/rocksdb/ThreadStatus;
126+
* Signature: (J)[Lorg/forstdb/ThreadStatus;
127127
*/
128128
jobjectArray Java_org_forstdb_Env_getThreadList(JNIEnv* env, jobject,
129129
jlong jhandle) {

java/forstjni/flink_compactionfilterjni.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class JavaListElementFilter
3939
JavaListElementFilter(JNIEnv* env, jobject jlist_filter)
4040
: JniCallbackBase(env, jlist_filter) {
4141
jclass jclazz = ROCKSDB_NAMESPACE::JavaClass::getJClass(
42-
env, "org/rocksdb/FlinkCompactionFilter$ListElementFilter");
42+
env, "org/forstdb/FlinkCompactionFilter$ListElementFilter");
4343
if (jclazz == nullptr) {
4444
// exception occurred accessing class
4545
return;
@@ -82,14 +82,14 @@ class JavaListElemenFilterFactory
8282
JavaListElemenFilterFactory(JNIEnv* env, jobject jlist_filter_factory)
8383
: JniCallbackBase(env, jlist_filter_factory) {
8484
jclass jclazz = ROCKSDB_NAMESPACE::JavaClass::getJClass(
85-
env, "org/rocksdb/FlinkCompactionFilter$ListElementFilterFactory");
85+
env, "org/forstdb/FlinkCompactionFilter$ListElementFilterFactory");
8686
if (jclazz == nullptr) {
8787
// exception occurred accessing class
8888
return;
8989
}
9090
m_jcreate_filter_methodid = env->GetMethodID(
9191
jclazz, "createListElementFilter",
92-
"()Lorg/rocksdb/FlinkCompactionFilter$ListElementFilter;");
92+
"()Lorg/forstdb/FlinkCompactionFilter$ListElementFilter;");
9393
assert(m_jcreate_filter_methodid != nullptr);
9494
}
9595

@@ -117,7 +117,7 @@ class JavaTimeProvider
117117
JavaTimeProvider(JNIEnv* env, jobject jtime_provider)
118118
: JniCallbackBase(env, jtime_provider) {
119119
jclass jclazz = ROCKSDB_NAMESPACE::JavaClass::getJClass(
120-
env, "org/rocksdb/FlinkCompactionFilter$TimeProvider");
120+
env, "org/forstdb/FlinkCompactionFilter$TimeProvider");
121121
if (jclazz == nullptr) {
122122
// exception occurred accessing class
123123
return;
@@ -214,7 +214,7 @@ jlong Java_org_forstdb_FlinkCompactionFilter_createNewFlinkCompactionFilter0(
214214
/*
215215
* Class: org_forstdb_FlinkCompactionFilter
216216
* Method: configureFlinkCompactionFilter
217-
* Signature: (JIIJJILorg/rocksdb/FlinkCompactionFilter$ListElementFilter;)Z
217+
* Signature: (JIIJJILorg/forstdb/FlinkCompactionFilter$ListElementFilter;)Z
218218
*/
219219
jboolean Java_org_forstdb_FlinkCompactionFilter_configureFlinkCompactionFilter(
220220
JNIEnv* env, jclass /* jcls */, jlong handle, jint ji_state_type,

java/forstjni/jnicallback.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// (found in the LICENSE.Apache file in the root directory).
55
//
66
// This file implements the callback "bridge" between Java and C++ for
7-
// JNI Callbacks from C++ to sub-classes or org.rocksdb.RocksCallbackObject
7+
// JNI Callbacks from C++ to sub-classes or org.forstdb.RocksCallbackObject
88

99
#include "forstjni/jnicallback.h"
1010

java/forstjni/options.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,7 @@ static jobjectArray rocksdb_get_event_listeners_helper(
17841784
/*
17851785
* Class: org_forstdb_Options
17861786
* Method: eventListeners
1787-
* Signature: (J)[Lorg/rocksdb/AbstractEventListener;
1787+
* Signature: (J)[Lorg/forstdb/AbstractEventListener;
17881788
*/
17891789
jobjectArray Java_org_forstdb_Options_eventListeners(JNIEnv* env, jclass,
17901790
jlong jhandle) {
@@ -7220,7 +7220,7 @@ void Java_org_forstdb_DBOptions_setEventListeners(JNIEnv* env, jclass,
72207220
/*
72217221
* Class: org_forstdb_DBOptions
72227222
* Method: eventListeners
7223-
* Signature: (J)[Lorg/rocksdb/AbstractEventListener;
7223+
* Signature: (J)[Lorg/forstdb/AbstractEventListener;
72247224
*/
72257225
jobjectArray Java_org_forstdb_DBOptions_eventListeners(JNIEnv* env, jclass,
72267226
jlong jhandle) {

java/forstjni/options_util.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jstring Java_org_forstdb_OptionsUtil_getLatestOptionsFileName(
141141
/*
142142
* Class: org_forstdb_OptionsUtil
143143
* Method: readTableFormatConfig
144-
* Signature: (J)Lorg/rocksdb/TableFormatConfig;
144+
* Signature: (J)Lorg/forstdb/TableFormatConfig;
145145
*/
146146
jobject Java_org_forstdb_OptionsUtil_readTableFormatConfig(JNIEnv* env, jclass,
147147
jlong jcf_options) {

java/forstjni/rocks_callback_object.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// (found in the LICENSE.Apache file in the root directory).
55
//
66
// This file implements the "bridge" between Java and C++ for
7-
// JNI Callbacks from C++ to sub-classes or org.rocksdb.RocksCallbackObject
7+
// JNI Callbacks from C++ to sub-classes or org.forstdb.RocksCallbackObject
88

99
#include <jni.h>
1010

java/forstjni/rocksjni.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -2210,7 +2210,7 @@ jobjectArray Java_org_forstdb_RocksDB_multiGet__JJ_3_3B_3I_3I_3J(
22102210
* Class: org_forstdb_RocksDB
22112211
* Method: multiGet
22122212
* Signature:
2213-
* (JJ[J[Ljava/nio/ByteBuffer;[I[I[Ljava/nio/ByteBuffer;[I[Lorg/rocksdb/Status;)V
2213+
* (JJ[J[Ljava/nio/ByteBuffer;[I[I[Ljava/nio/ByteBuffer;[I[Lorg/forstdb/Status;)V
22142214
*/
22152215
void Java_org_forstdb_RocksDB_multiGet__JJ_3J_3Ljava_nio_ByteBuffer_2_3I_3I_3Ljava_nio_ByteBuffer_2_3I_3Lorg_forstdb_Status_2(
22162216
JNIEnv* env, jobject jdb, jlong jdb_handle, jlong jropt_handle,
@@ -3587,7 +3587,7 @@ jobjectArray Java_org_forstdb_RocksDB_getLiveFiles(JNIEnv* env, jobject,
35873587
/*
35883588
* Class: org_forstdb_RocksDB
35893589
* Method: getSortedWalFiles
3590-
* Signature: (J)[Lorg/rocksdb/LogFile;
3590+
* Signature: (J)[Lorg/forstdb/LogFile;
35913591
*/
35923592
jobjectArray Java_org_forstdb_RocksDB_getSortedWalFiles(JNIEnv* env, jobject,
35933593
jlong jdb_handle) {
@@ -3674,7 +3674,7 @@ void Java_org_forstdb_RocksDB_deleteFile(JNIEnv* env, jobject, jlong jdb_handle,
36743674
/*
36753675
* Class: org_forstdb_RocksDB
36763676
* Method: getLiveFilesMetaData
3677-
* Signature: (J)[Lorg/rocksdb/LiveFileMetaData;
3677+
* Signature: (J)[Lorg/forstdb/LiveFileMetaData;
36783678
*/
36793679
jobjectArray Java_org_forstdb_RocksDB_getLiveFilesMetaData(JNIEnv* env, jobject,
36803680
jlong jdb_handle) {
@@ -3721,7 +3721,7 @@ jobjectArray Java_org_forstdb_RocksDB_getLiveFilesMetaData(JNIEnv* env, jobject,
37213721
/*
37223722
* Class: org_forstdb_RocksDB
37233723
* Method: getColumnFamilyMetaData
3724-
* Signature: (JJ)Lorg/rocksdb/ColumnFamilyMetaData;
3724+
* Signature: (JJ)Lorg/forstdb/ColumnFamilyMetaData;
37253725
*/
37263726
jobject Java_org_forstdb_RocksDB_getColumnFamilyMetaData(JNIEnv* env, jobject,
37273727
jlong jdb_handle,

java/forstjni/slice.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "forstjni/cplusplus_to_java_convert.h"
2121
#include "forstjni/portal.h"
2222

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

2525
/*
2626
* Class: org_forstdb_AbstractSlice
@@ -125,7 +125,7 @@ void Java_org_forstdb_AbstractSlice_disposeInternal(JNIEnv* /*env*/,
125125

126126
// </editor-fold>
127127

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

130130
/*
131131
* Class: org_forstdb_Slice
@@ -257,7 +257,7 @@ void Java_org_forstdb_Slice_disposeInternalBuf(JNIEnv* /*env*/,
257257

258258
// </editor-fold>
259259

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

262262
/*
263263
* Class: org_forstdb_DirectSlice

java/forstjni/statistics.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jlong Java_org_forstdb_Statistics_getAndResetTickerCount(JNIEnv*, jobject,
180180
/*
181181
* Class: org_forstdb_Statistics
182182
* Method: getHistogramData
183-
* Signature: (JB)Lorg/rocksdb/HistogramData;
183+
* Signature: (JB)Lorg/forstdb/HistogramData;
184184
*/
185185
jobject Java_org_forstdb_Statistics_getHistogramData(JNIEnv* env, jobject,
186186
jlong jhandle,

java/forstjni/table_filter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// (found in the LICENSE.Apache file in the root directory).
55
//
66
// This file implements the "bridge" between Java and C++ for
7-
// org.rocksdb.AbstractTableFilter.
7+
// org.forstdb.AbstractTableFilter.
88

99
#include <jni.h>
1010

java/forstjni/transaction.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1700,7 +1700,7 @@ jboolean Java_org_forstdb_Transaction_isDeadlockDetect(JNIEnv* /*env*/,
17001700
/*
17011701
* Class: org_forstdb_Transaction
17021702
* Method: getWaitingTxns
1703-
* Signature: (J)Lorg/rocksdb/Transaction/WaitingTransactions;
1703+
* Signature: (J)Lorg/forstdb/Transaction/WaitingTransactions;
17041704
*/
17051705
jobject Java_org_forstdb_Transaction_getWaitingTxns(JNIEnv* env,
17061706
jobject jtransaction_obj,

java/forstjni/transaction_db.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ jobject Java_org_forstdb_TransactionDB_getLockStatusData(JNIEnv* env, jobject,
357357
/*
358358
* Class: org_forstdb_TransactionDB
359359
* Method: getDeadlockInfoBuffer
360-
* Signature: (J)[Lorg/rocksdb/TransactionDB/DeadlockPath;
360+
* Signature: (J)[Lorg/forstdb/TransactionDB/DeadlockPath;
361361
*/
362362
jobjectArray Java_org_forstdb_TransactionDB_getDeadlockInfoBuffer(
363363
JNIEnv* env, jobject jobj, jlong jhandle) {

java/forstjni/transaction_log.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void Java_org_forstdb_TransactionLogIterator_status(JNIEnv* env,
6868
/*
6969
* Class: org_forstdb_TransactionLogIterator
7070
* Method: getBatch
71-
* Signature: (J)Lorg/rocksdb/TransactionLogIterator$BatchResult
71+
* Signature: (J)Lorg/forstdb/TransactionLogIterator$BatchResult
7272
*/
7373
jobject Java_org_forstdb_TransactionLogIterator_getBatch(JNIEnv* env,
7474
jobject /*jobj*/,

java/forstjni/ttl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void Java_org_forstdb_TtlDB_closeDatabase(JNIEnv* /* env */, jclass,
179179
/*
180180
* Class: org_forstdb_TtlDB
181181
* Method: createColumnFamilyWithTtl
182-
* Signature: (JLorg/rocksdb/ColumnFamilyDescriptor;[BJI)J;
182+
* Signature: (JLorg/forstdb/ColumnFamilyDescriptor;[BJI)J;
183183
*/
184184
jlong Java_org_forstdb_TtlDB_createColumnFamilyWithTtl(JNIEnv* env, jobject,
185185
jlong jdb_handle,

java/forstjni/write_batch.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ void Java_org_forstdb_WriteBatch_markWalTerminationPoint(JNIEnv* /*env*/,
639639
/*
640640
* Class: org_forstdb_WriteBatch
641641
* Method: getWalTerminationPoint
642-
* Signature: (J)Lorg/rocksdb/WriteBatch/SavePoint;
642+
* Signature: (J)Lorg/forstdb/WriteBatch/SavePoint;
643643
*/
644644
jobject Java_org_forstdb_WriteBatch_getWalTerminationPoint(JNIEnv* env,
645645
jobject /*jobj*/,

java/forstjni/write_batch_with_index.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ void Java_org_forstdb_WriteBatchWithIndex_setMaxBytes(JNIEnv* /*env*/,
486486
/*
487487
* Class: org_forstdb_WriteBatchWithIndex
488488
* Method: getWriteBatch
489-
* Signature: (J)Lorg/rocksdb/WriteBatch;
489+
* Signature: (J)Lorg/forstdb/WriteBatch;
490490
*/
491491
jobject Java_org_forstdb_WriteBatchWithIndex_getWriteBatch(JNIEnv* env,
492492
jobject /*jobj*/,
@@ -898,7 +898,7 @@ jlongArray Java_org_forstdb_WBWIRocksIterator_entry1(JNIEnv* env,
898898
results[0] = ROCKSDB_NAMESPACE::WriteTypeJni::toJavaWriteType(we.type);
899899

900900
// NOTE: key_slice and value_slice will be freed by
901-
// org.rocksdb.DirectSlice#close
901+
// org.forstdb.DirectSlice#close
902902

903903
auto* key_slice = new ROCKSDB_NAMESPACE::Slice(we.key.data(), we.key.size());
904904
results[1] = GET_CPLUSPLUS_POINTER(key_slice);

utilities/flink/flink_compaction_filter_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ void Deinit() { delete filter; }
131131

132132
TEST(FlinkStateTtlTest, CheckStateTypeEnumOrder) { // NOLINT
133133
// if the order changes it also needs to be adjusted in Java client:
134-
// in org.rocksdb.FlinkCompactionFilter
135-
// and in org.rocksdb.FlinkCompactionFilterTest
134+
// in org.forstdb.FlinkCompactionFilter
135+
// and in org.forstdb.FlinkCompactionFilterTest
136136
EXPECT_EQ(DISABLED, 0);
137137
EXPECT_EQ(VALUE, 1);
138138
EXPECT_EQ(LIST, 2);

0 commit comments

Comments
 (0)