diff --git a/.gitignore b/.gitignore index 9b8d3be1884b41a394c248ac289cc7f01cb14b76..f2440b4f3dbdb548da0e5d9b336cdae1793a5505 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ unittest/**/*_test unittest/**/**/test_* unittest/**/**/*_test unittest/**/unittest_* +unittest/obproxy/foo_client +unittest/obproxy/foo_server !unittest/**/test_*.* !unittest/**/**/test_*.* !unittest/**/unittest_*.* @@ -173,6 +175,8 @@ tools/deploy/focus_* src/.idea/* src/cmake-build-debug/* CMakeLists.txt +*.gz +obproxy-tmp* .DS_Store src/.DS_Store unittest/.DS_Store diff --git a/build.sh b/build.sh index 8b79cb3d8c23ead838b8a329a6c64bd9b2adbce4..c93bc75a43cec6388d41ad0378bf49a16f6d17dd 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ TOPDIR="$(dirname $(readlink -f "$0"))" DEP_DIR=${TOPDIR}/deps/3rd/usr/local/oceanbase/deps/devel TOOLS_DIR=${TOPDIR}/deps/3rd/usr/local/oceanbase/devtools -RUNTIME_DIR=${TOPDIR}/deps/3rd/home/admin/oceanbase +RUNTIME_DIR=${TOPDIR}/deps/3rd/usr CPU_CORES=`grep -c ^processor /proc/cpuinfo` MAKE_ARGS=(-j $CPU_CORES) diff --git a/deps/3rd/dep_create.sh b/deps/3rd/dep_create.sh index d8a75cf93e5889d18b6efabe3dd486f7eb5716e5..6ea9d22955b76aaee739e23c39c720e2e2028cda 100644 --- a/deps/3rd/dep_create.sh +++ b/deps/3rd/dep_create.sh @@ -76,10 +76,11 @@ function get_os_release() { elif [[ "${OS_ARCH}x" == "aarch64x" ]]; then case "$ID" in alios) + version_ge "8.0" && compat_centos8 && return version_ge "7.0" && compat_centos7 && return ;; centos) - version_ge "8.0" && compat_centos7 && return + version_ge "8.0" && OS_RELEASE=8 && return version_ge "7.0" && OS_RELEASE=7 && return ;; esac diff --git a/deps/3rd/obproxy.el7.aarch64.deps b/deps/3rd/obproxy.el7.aarch64.deps new file mode 100644 index 0000000000000000000000000000000000000000..7da7a80a8af15ce8c9e59dc5cfbc98c3e50a73d2 --- /dev/null +++ b/deps/3rd/obproxy.el7.aarch64.deps @@ -0,0 +1,21 @@ +[target] +os=7 +arch=aarch64 +repo=https://mirrors.aliyun.com/oceanbase/development-kit/el/7/aarch64/ + +[deps] +devdeps-openssl-static-1.0.1e-3.el7.aarch64.rpm +devdeps-libcurl-static-7.29.0-3.el7.aarch64.rpm +devdeps-mariadb-connector-c-3.1.12-3.el7.aarch64.rpm +devdeps-gtest-1.8.0-3.el7.aarch64.rpm +devdeps-prometheus-cpp-0.8.0-2.el7.aarch64.rpm +devdeps-grpc-1.20.1-8.el7.aarch64.rpm + +[tools] +obdevtools-gcc-5.2.0-3.el7.aarch64.rpm +obdevtools-bintuils-2.30-3.el7.aarch64.rpm +obdevtools-bison-2.4.1-3.el7.aarch64.rpm +obdevtools-flex-2.5.35-3.el7.aarch64.rpm + +[release] +oceanbase-ce-devel-3.1.3-10000102022030411.el7.aarch64.rpm diff --git a/deps/3rd/obproxy.el7.x86_64.deps b/deps/3rd/obproxy.el7.x86_64.deps index 5ebd3a446d9b73ee783976936e6f528dc2ab3912..4004e36df4aab3d0d2bc73382bf556b5f4eff7b1 100644 --- a/deps/3rd/obproxy.el7.x86_64.deps +++ b/deps/3rd/obproxy.el7.x86_64.deps @@ -17,4 +17,4 @@ obdevtools-bison-2.4.1-3.el7.x86_64.rpm obdevtools-flex-2.5.35-3.el7.x86_64.rpm [release] -oceanbase-ce-sql-parser-3.1.0-1.el7.x86_64.rpm +oceanbase-ce-devel-3.1.3-10000102022030411.el7.x86_64.rpm diff --git a/deps/3rd/obproxy.el8.aarch64.deps b/deps/3rd/obproxy.el8.aarch64.deps new file mode 100644 index 0000000000000000000000000000000000000000..28270b280c626d1eccd07e6f5bd99100a596795e --- /dev/null +++ b/deps/3rd/obproxy.el8.aarch64.deps @@ -0,0 +1,21 @@ +[target] +os=8 +arch=aarch64 +repo=https://mirrors.aliyun.com/oceanbase/development-kit/el/8/aarch64/ + +[deps] +devdeps-openssl-static-1.0.1e-12.el8.aarch64.rpm +devdeps-libcurl-static-7.29.0-16.el8.aarch64.rpm +devdeps-mariadb-connector-c-3.1.12-16.el8.aarch64.rpm +devdeps-gtest-1.8.0-16.el8.aarch64.rpm +devdeps-prometheus-cpp-0.8.0-2.el8.aarch64.rpm +devdeps-grpc-1.20.1-8.el8.aarch64.rpm + +[tools] +obdevtools-gcc-5.2.0-15.el8.aarch64.rpm +obdevtools-binutils-2.30-7.el8.aarch64.rpm +obdevtools-bison-2.4.1-9.el8.aarch64.rpm +obdevtools-flex-2.5.35-10.el8.aarch64.rpm + +[release] +oceanbase-ce-devel-3.1.3-10000102022030411.el8.aarch64.rpm diff --git a/deps/3rd/obproxy.el8.x86_64.deps b/deps/3rd/obproxy.el8.x86_64.deps index 358b6bc28c9dea297c7a45a976e79489d933f3f8..0a8cb46ad28c0c7a4ba1597f0889daa812dcf79c 100644 --- a/deps/3rd/obproxy.el8.x86_64.deps +++ b/deps/3rd/obproxy.el8.x86_64.deps @@ -17,4 +17,4 @@ obdevtools-bison-2.4.1-3.el8.x86_64.rpm obdevtools-flex-2.5.35-3.el8.x86_64.rpm [release] -oceanbase-ce-sql-parser-3.1.0-1.el8.x86_64.rpm +oceanbase-ce-devel-3.1.3-10000102022030411.el8.x86_64.rpm