MDEV-30432 replace curl rest connector with libcurl usage

debian/control

@@ -1034,8 +1034,6 @@ Depends:
  unixodbc,
  ${misc:Depends},
  ${shlibs:Depends},
-Recommends:
- curl,
 Breaks:
  mariadb-connect-engine-10.0,
  mariadb-connect-engine-10.1,

storage/connect/CMakeLists.txt

@@ -360,31 +360,21 @@ ENDIF(CONNECT_WITH_MONGO)
 OPTION(CONNECT_WITH_REST "Compile CONNECT storage engine with REST support" ON)
 
 IF(CONNECT_WITH_REST)
-# MESSAGE(STATUS "=====> REST support is ON")
-  SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp tabrest.h)
-  add_definitions(-DREST_SUPPORT)
-#  FIND_PACKAGE(cpprestsdk QUIET)
-#  IF (cpprestsdk_FOUND)
-#	IF(UNIX)
-##     INCLUDE_DIRECTORIES(${CPPRESTSDK_INCLUDE_DIR})
-##     If needed edit next line to set the path to libcpprest.so
-#      SET(REST_LIBRARY -lcpprest)
-#      MESSAGE (STATUS ${REST_LIBRARY})
-#	ELSE(NOT UNIX)
-##     Next line sets debug compile mode matching cpprest_2_10d.dll
-##     when it was binary installed (can be change later in Visual Studio)
-##     Comment it out if not needed depending on your cpprestsdk installation.
-#	  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-#	ENDIF(UNIX)
-##   IF(REST_LIBRARY)     why this? how about Windows
-#    SET(CONNECT_SOURCES ${CONNECT_SOURCES} restget.cpp)
-#    add_definitions(-DREST_SOURCE)
-##   ENDIF()
-## ELSE(NOT cpprestsdk_FOUND)
-#   MESSAGE(STATUS "=====> cpprestsdk package not found")
-#  ENDIF (cpprestsdk_FOUND)
+  SET(REST_LIBRARY)
+  find_package(CURL)
+  SET_PACKAGE_PROPERTIES(Curl PROPERTIES TYPE REQUIRED
+    PURPOSE "Required for the CONNECT_WITH_REST feature")
+  IF (CURL_FOUND)
+    SET(REST_LIBRARY ${CURL_LIBRARIES})
+    MESSAGE (STATUS ${REST_LIBRARY})
+    SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp tabrest.h)
+    add_definitions(-DREST_SUPPORT)
+    ADD_FEATURE_INFO(CONNECT_REST "ON" "Support for REST API in the CONNECT storage engine")
+  ELSE()
+    MESSAGE_ONCE(CONNECT_NO_CURL "libcurl-dev header not found.")
+    ADD_FEATURE_INFO(CONNECT_REST "OFF" "Support for REST API in the CONNECT storage engine")
+  ENDIF()
 ENDIF(CONNECT_WITH_REST)
-ADD_FEATURE_INFO(CONNECT_REST CONNECT_WITH_REST "Support for REST API in the CONNECT storage engine")
 
 #
 # XMAP

storage/connect/mysql-test/connect/t/rest.test

@@ -12,6 +12,5 @@ SELECT * FROM t1;
 DROP TABLE t1;
 
 #
-# Clean up
+# Clean up is done automatically
 #
---remove_file $MYSQLD_DATADIR/test/users.json

storage/connect/plgdbsem.h

@@ -404,7 +404,6 @@ typedef class VCTDEF     *PVCTDEF;
 typedef class PIVOTDEF   *PPIVOTDEF;
 typedef class DOMDEF     *PDOMDEF;
 typedef class DIRDEF     *PDIRDEF;
-typedef class RESTDEF    *PRESTDEF;
 typedef class OEMDEF     *POEMDEF;
 typedef class COLCRT     *PCOLCRT;
 typedef class COLDEF     *PCOLDEF;