Skip to content

Commit cf9d1d2

Browse files
zchovanmartongreber
authored andcommitted
Revert "[rest] add oat++ framework to kudu"
This reverts commit dda2587. Since the Oat++ framework was never used in any features, and the Oat++ based rest api was abandoned, this revert removes the library as a dependency. Change-Id: Ie589074b67ed5ed23d4f83ccea8e3351caef5e7f Reviewed-on: http://gerrit.cloudera.org:8080/22040 Reviewed-by: Marton Greber <[email protected]> Tested-by: Marton Greber <[email protected]> Reviewed-by: Gabriella Lotz <[email protected]>
1 parent 9a06aeb commit cf9d1d2

9 files changed

+0
-306
lines changed

CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,18 +1144,6 @@ include_directories(SYSTEM ${MUSTACHE_INCLUDE_DIR})
11441144
ADD_THIRDPARTY_LIB(mustache
11451145
STATIC_LIB "${MUSTACHE_STATIC_LIB}")
11461146

1147-
## Oatpp
1148-
find_package(Oatpp REQUIRED)
1149-
include_directories(SYSTEM ${OATPP_INCLUDE_DIR})
1150-
ADD_THIRDPARTY_LIB(oatpp
1151-
STATIC_LIB "${OATPP_STATIC_LIB}")
1152-
1153-
## Oatpp-swagger
1154-
find_package(OatppSwagger REQUIRED)
1155-
include_directories(SYSTEM ${OATPP_SWAGGER_INCLUDE_DIR})
1156-
ADD_THIRDPARTY_LIB(oatpp-swagger
1157-
STATIC_LIB "${OATPP_SWAGGER_STATIC_LIB}")
1158-
11591147
## jwt-cpp
11601148
find_package(JwtCpp REQUIRED)
11611149
include_directories(${JWT_CPP_INCLUDE_DIR})

cmake_modules/FindOatpp.cmake

Lines changed: 0 additions & 38 deletions
This file was deleted.

cmake_modules/FindOatppSwagger.cmake

Lines changed: 0 additions & 37 deletions
This file was deleted.

thirdparty/build-definitions.sh

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,37 +1178,6 @@ build_postgres() {
11781178
popd
11791179
}
11801180

1181-
build_oatpp(){
1182-
OATPP_BUILD_DIR=$TP_BUILD_DIR/$OATPP_NAME$MODE_SUFFIX
1183-
mkdir -p $OATPP_BUILD_DIR
1184-
pushd $OATPP_BUILD_DIR
1185-
cmake \
1186-
-DCMAKE_BUILD_TYPE=release \
1187-
-DCMAKE_INSTALL_PREFIX=$PREFIX \
1188-
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
1189-
-DBUILD_SHARED_LIBS=OFF \
1190-
-DOATPP_DISABLE_ENV_OBJECT_COUNTERS=ON \
1191-
-DOATPP_BUILD_TESTS=OFF \
1192-
$OATPP_SOURCE
1193-
make -j$PARALLEL install
1194-
popd
1195-
}
1196-
1197-
build_oatpp_swagger(){
1198-
OATPP_SWAGGER_BUILD_DIR=$TP_BUILD_DIR/$OATPP_SWAGGER_NAME$MODE_SUFFIX
1199-
mkdir -p $OATPP_SWAGGER_BUILD_DIR
1200-
pushd $OATPP_SWAGGER_BUILD_DIR
1201-
cmake \
1202-
-DCMAKE_BUILD_TYPE=release \
1203-
-DCMAKE_INSTALL_PREFIX=$PREFIX \
1204-
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
1205-
-DBUILD_SHARED_LIBS=OFF \
1206-
-DOATPP_BUILD_TESTS=OFF \
1207-
-DOATPP_INSTALL=ON \
1208-
$OATPP_SWAGGER_SOURCE
1209-
make -j$PARALLEL install
1210-
popd
1211-
}
12121181

12131182
build_jwt_cpp() {
12141183
JWT_CPP_BUILD_DIR=$TP_BUILD_DIR/$JWT_CPP_NAME$MODE_SUFFIX

thirdparty/build-thirdparty.sh

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ else
108108
"postgres") F_POSTGRES=1 ;;
109109
"psql-jdbc") F_POSTGRES_JDBC=1 ;;
110110
"ranger") F_RANGER=1 ;;
111-
"oatpp") F_OATPP=1 ;;
112-
"oatpp-swagger") F_OATPP_SWAGGER=1 ;;
113111
"jwt-cpp") F_JWT_CPP=1 ;;
114112
"ranger-kms") F_RANGER_KMS=1 ;;
115113
"rocksdb") F_ROCKSDB=1 ;;
@@ -441,14 +439,6 @@ if [ -n "$F_UNINSTRUMENTED" -o -n "$F_GUMBO_QUERY" ]; then
441439
build_gumbo_query
442440
fi
443441

444-
if [ -n "$F_UNINSTRUMENTED" -o -n "$F_OATPP" ]; then
445-
build_oatpp
446-
fi
447-
448-
if [ -n "$F_UNINSTRUMENTED" -o -n "$F_OATPP_SWAGGER" ]; then
449-
build_oatpp_swagger
450-
fi
451-
452442
if [ -n "$F_UNINSTRUMENTED" -o -n "$F_JWT_CPP" ]; then
453443
build_jwt_cpp
454444
fi
@@ -639,14 +629,6 @@ if [ -n "$F_TSAN" -o -n "$F_GUMBO_QUERY" ]; then
639629
build_gumbo_query
640630
fi
641631

642-
if [ -n "$F_TSAN" -o -n "$F_OATPP" ]; then
643-
build_oatpp
644-
fi
645-
646-
if [ -n "$F_TSAN" -o -n "$F_OATPP_SWAGGER" ]; then
647-
build_oatpp_swagger
648-
fi
649-
650632
if [ -n "$F_TSAN" -o -n "$F_JWT_CPP" ]; then
651633
build_jwt_cpp
652634
fi

thirdparty/download-thirdparty.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -466,20 +466,6 @@ fetch_and_patch \
466466
$RANGER_PATCHLEVEL \
467467
"patch -p0 < $TP_DIR/patches/ranger-fixscripts.patch"
468468

469-
OATPP_PATCHLEVEL=1
470-
fetch_and_patch \
471-
$OATPP_NAME.tar.gz \
472-
$OATPP_SOURCE \
473-
$OATPP_PATCHLEVEL \
474-
"patch -p1 < $TP_DIR/patches/oatpp-remove-version-from-path.patch"
475-
476-
OATPP_SWAGGER_PATCHLEVEL=1
477-
fetch_and_patch \
478-
$OATPP_SWAGGER_NAME.tar.gz \
479-
$OATPP_SWAGGER_SOURCE \
480-
$OATPP_SWAGGER_PATCHLEVEL \
481-
"patch -p1 < $TP_DIR/patches/oatpp-swagger-remove-version-from-path.patch"
482-
483469
JWT_CPP_PATCHLEVEL=0
484470
fetch_and_patch \
485471
$JWT_CPP_NAME.tar.gz \

thirdparty/patches/oatpp-remove-version-from-path.patch

Lines changed: 0 additions & 65 deletions
This file was deleted.

thirdparty/patches/oatpp-swagger-remove-version-from-path.patch

Lines changed: 0 additions & 83 deletions
This file was deleted.

thirdparty/vars.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,14 +263,6 @@ RANGER_KMS_VERSION=2.1.0 # this probably should match the ranger version
263263
RANGER_KMS_NAME=ranger-$RANGER_KMS_VERSION-kms
264264
RANGER_KMS_SOURCE=$TP_SOURCE_DIR/$RANGER_KMS_NAME
265265

266-
OATPP_VERSION=1.2.5
267-
OATPP_NAME=oatpp-$OATPP_VERSION
268-
OATPP_SOURCE=$TP_SOURCE_DIR/$OATPP_NAME
269-
270-
OATPP_SWAGGER_VERSION=1.2.5
271-
OATPP_SWAGGER_NAME=oatpp-swagger-$OATPP_SWAGGER_VERSION
272-
OATPP_SWAGGER_SOURCE=$TP_SOURCE_DIR/$OATPP_SWAGGER_NAME
273-
274266
JWT_CPP_VERSION=3bd600762a70faccc7ec1c2dacb999cba6c6ef5e
275267
JWT_CPP=jwt-cpp
276268
JWT_CPP_NAME=$JWT_CPP-$JWT_CPP_VERSION

0 commit comments

Comments
 (0)