Skip to content

Commit

Permalink
[build] Fixing ci error
Browse files Browse the repository at this point in the history
  • Loading branch information
Zakelly committed Oct 24, 2024
1 parent 7ad01ec commit f94d124
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
which java && java -version
which javac && javac -version
- name: Test RocksDBJava
run: scl enable devtoolset-7 'DISABLE_WARNING_AS_ERROR=1 make V=1 J=8 -j8 jtest'
run: scl enable devtoolset-7 'DISABLE_WARNING_AS_ERROR=1 DISABLE_PERF_CONTEXT=0 make V=1 J=8 -j8 jtest'
# NOTE: post-steps skipped because of compatibility issues with docker image
build-linux-java-static:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
which java && java -version
which javac && javac -version
- name: Test RocksDBJava
run: DISABLE_WARNING_AS_ERROR=1 make V=1 J=16 -j16 jtest
run: DISABLE_WARNING_AS_ERROR=1 DISABLE_PERF_CONTEXT=0 make V=1 J=16 -j16 jtest
- uses: "./.github/actions/post-steps"
build-macos-java-static:
runs-on: macos-13
Expand Down
2 changes: 1 addition & 1 deletion build_tools/format-diff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ uncommitted_code=`git diff HEAD`
if [ -z "$uncommitted_code" ]
then
# Attempt to get name of facebook/rocksdb.git remote.
[ "$FORMAT_REMOTE" ] || FORMAT_REMOTE="$(LC_ALL=POSIX LANG=POSIX git remote -v | grep 'facebook/rocksdb.git' | head -n 1 | cut -f 1)"
[ "$FORMAT_REMOTE" ] || FORMAT_REMOTE="$(LC_ALL=POSIX LANG=POSIX git remote -v | grep 'ververica/ForSt.git' | head -n 1 | cut -f 1)"
# Fall back on 'origin' if that fails
[ "$FORMAT_REMOTE" ] || FORMAT_REMOTE=origin
# Use main branch from that remote
Expand Down
6 changes: 3 additions & 3 deletions java/forstjni/portal.h
Original file line number Diff line number Diff line change
Expand Up @@ -7743,7 +7743,7 @@ class ExportImportFilesMetaDataJni : public JavaClass {
}

jmethodID mid = env->GetMethodID(jclazz, "<init>",
"([B[Lorg/rocksdb/LiveFileMetaData;)V");
"([B[Lorg/forstdb/LiveFileMetaData;)V");
if (mid == nullptr) {
// exception thrown: NoSuchMethodException or OutOfMemoryError
return nullptr;
Expand Down Expand Up @@ -7795,7 +7795,7 @@ class ExportImportFilesMetaDataJni : public JavaClass {
}

static jclass getJClass(JNIEnv* env) {
return JavaClass::getJClass(env, "org/rocksdb/ExportImportFilesMetaData");
return JavaClass::getJClass(env, "org/forstdb/ExportImportFilesMetaData");
}
};

Expand Down Expand Up @@ -8651,7 +8651,7 @@ class FlushJobInfoJni : public JavaClass {
static jmethodID getConstructorMethodId(JNIEnv* env, jclass clazz) {
return env->GetMethodID(clazz, "<init>",
"(JLjava/lang/String;Ljava/lang/String;JIZZJJLorg/"
"rocksdb/TableProperties;B)V");
"forstdb/TableProperties;B)V");
}
};

Expand Down
4 changes: 2 additions & 2 deletions tools/check_format_compatible.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ tmp_origin=_tmp_origin
set -e
git remote remove $tmp_origin 2>/dev/null || true
if [ "$USE_SSH" ]; then
git remote add $tmp_origin "[email protected]:facebook/rocksdb.git"
git remote add $tmp_origin "[email protected]:ververica/ForSt.git"
else
git remote add $tmp_origin "https://github.com/facebook/rocksdb.git"
git remote add $tmp_origin "https://github.com/ververica/ForSt.git"
fi
git fetch $tmp_origin

Expand Down

0 comments on commit f94d124

Please sign in to comment.