MCS uses libmarias3, which, for some reason, uses autotools. Neither MCS itself, MariaDB Server, nor Connector/C need autotools. Furthermore, MariaDB Server builds Aria/S3 engine, which uses libmarias3 without autotools. MCS should do the same, the following patch implements it:
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
--- a/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
@@ -311,11 +311,6 @@ SET (ENGINE_COMMON_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${L
|
|
ADD_SUBDIRECTORY(utils)
|
|
-add_library(marias3 SHARED IMPORTED)
|
-set_target_properties(marias3 PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2)
|
-add_dependencies(marias3 ms3)
|
-
|
-
|
ADD_SUBDIRECTORY(oam/oamcpp)
|
ADD_SUBDIRECTORY(dbcon/execplan)
|
ADD_SUBDIRECTORY(dbcon/joblist)
|
diff --git a/storage-manager/CMakeLists.txt b/storage-manager/CMakeLists.txt
|
--- a/storage-manager/CMakeLists.txt
|
+++ b/storage-manager/CMakeLists.txt
|
@@ -1,7 +1,7 @@
|
cmake_minimum_required(VERSION 2.8.12)
|
project(storagemanager)
|
|
-include_directories(include ${CMAKE_BINARY_DIR}/include ${ENGINE_UTILS_COMMON_INCLUDE})
|
+include_directories(include ${CMAKE_BINARY_DIR}/include ${ENGINE_UTILS_COMMON_INCLUDE} ${S3API_DIR})
|
|
set(storagemanager_SRCS
|
src/AppendTask.cpp
|
diff --git a/utils/libmarias3/CMakeLists.txt b/utils/libmarias3/CMakeLists.txt
|
--- a/utils/libmarias3/CMakeLists.txt
|
+++ b/utils/libmarias3/CMakeLists.txt
|
@@ -16,22 +16,19 @@ if(GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git)
|
endif()
|
endif()
|
|
-include(ExternalProject)
|
-ExternalProject_Add(ms3
|
- SOURCE_DIR ${S3API_DIR}
|
- CONFIGURE_COMMAND autoreconf -fi ${S3API_DIR} && ${S3API_DIR}/configure --enable-shared --disable-static --prefix=${CMAKE_BINARY_DIR} ${S3_CONFIGURE_OPT}
|
- BUILD_COMMAND make
|
- BUILD_IN_SOURCE 0
|
- EXCLUDE_FROM_ALL TRUE
|
- BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2
|
-)
|
+SET(S3_SOURCES ${S3API_DIR}/src/debug.c ${S3API_DIR}/src/error.c
|
+ ${S3API_DIR}/src/marias3.c ${S3API_DIR}/src/request.c ${S3API_DIR}/src/response.c
|
+ ${S3API_DIR}/src/sha256.c ${S3API_DIR}/src/sha256-internal.c)
|
+
|
+ADD_LIBRARY(marias3 SHARED ${S3_SOURCES})
|
+FIND_PACKAGE(LibXml2 REQUIRED)
|
+FIND_PACKAGE(CURL REQUIRED)
|
+TARGET_LINK_LIBRARIES(marias3 curl xml2)
|
+INCLUDE_DIRECTORIES(${S3API_DIR} ${LIBXML2_INCLUDE_DIR})
|
|
-set(S3API_DEPS marias3 curl xml2 CACHE INTERNAL "S3API_DEPS")
|
+set(S3API_DEPS marias3 CACHE INTERNAL "S3API_DEPS")
|
|
-install(PROGRAMS
|
- ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2
|
- ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3
|
- ${CMAKE_BINARY_DIR}/lib/libmarias3.so
|
+install(TARGETS marias3
|
DESTINATION ${ENGINE_LIBDIR}
|
COMPONENT columnstore-platform
|
)
|
Note, while I did test that it builds, I did not run MCS nor I tested packaging or installation.
- blocks
-
MDEV-22197
test columnstore for 10.5
-
-
Closed
{"report":{"fcp":7170.699999809265,"ttfb":6374.899999856949,"pageVisibility":"visible","entityId":86440,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":0,"journeyId":"93af6a88-5f65-4767-bebe-941a38fd8da1","navigationType":0,"readyForUser":7259.099999904633,"redirectCount":0,"resourceLoadedEnd":7055.5,"resourceLoadedStart":6383,"resourceTiming":[{"duration":129.5,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2cib/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":6383,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":6383,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":6512.5,"responseStart":0,"secureConnectionStart":0},{"duration":129.5,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2cib/820016/12ta74/494e4c556ecbb29f90a3d3b4f09cb99c/_/download/contextbatch/css/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true&whisper-enabled=true","startTime":6383.299999952316,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":6383.299999952316,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":6512.799999952316,"responseStart":0,"secureConnectionStart":0},{"duration":361.5,"initiatorType":"script","name":"https://jira.mariadb.org/s/0917945aaa57108d00c5076fea35e069-CDN/lu2cib/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":6383.5,"connectEnd":6383.5,"connectStart":6383.5,"domainLookupEnd":6383.5,"domainLookupStart":6383.5,"fetchStart":6383.5,"redirectEnd":0,"redirectStart":0,"requestStart":6629.299999952316,"responseEnd":6745,"responseStart":6658.299999952316,"secureConnectionStart":6383.5},{"duration":480.7000000476837,"initiatorType":"script","name":"https://jira.mariadb.org/s/2d8175ec2fa4c816e8023260bd8c1786-CDN/lu2cib/820016/12ta74/494e4c556ecbb29f90a3d3b4f09cb99c/_/download/contextbatch/js/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&locale=en&slack-enabled=true&whisper-enabled=true","startTime":6383.599999904633,"connectEnd":6383.599999904633,"connectStart":6383.599999904633,"domainLookupEnd":6383.599999904633,"domainLookupStart":6383.599999904633,"fetchStart":6383.599999904633,"redirectEnd":0,"redirectStart":0,"requestStart":6630,"responseEnd":6864.299999952316,"responseStart":6659.699999809265,"secureConnectionStart":6383.599999904633},{"duration":285.40000009536743,"initiatorType":"script","name":"https://jira.mariadb.org/s/a9324d6758d385eb45c462685ad88f1d-CDN/lu2cib/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":6383.699999809265,"connectEnd":6383.699999809265,"connectStart":6383.699999809265,"domainLookupEnd":6383.699999809265,"domainLookupStart":6383.699999809265,"fetchStart":6383.699999809265,"redirectEnd":0,"redirectStart":0,"requestStart":6630.899999856949,"responseEnd":6669.099999904633,"responseStart":6661.199999809265,"secureConnectionStart":6383.699999809265},{"duration":286,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":6383.899999856949,"connectEnd":6383.899999856949,"connectStart":6383.899999856949,"domainLookupEnd":6383.899999856949,"domainLookupStart":6383.899999856949,"fetchStart":6383.899999856949,"redirectEnd":0,"redirectStart":0,"requestStart":6636.899999856949,"responseEnd":6669.899999856949,"responseStart":6661.899999856949,"secureConnectionStart":6383.899999856949},{"duration":286.09999990463257,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":6384.099999904633,"connectEnd":6384.099999904633,"connectStart":6384.099999904633,"domainLookupEnd":6384.099999904633,"domainLookupStart":6384.099999904633,"fetchStart":6384.099999904633,"redirectEnd":0,"redirectStart":0,"requestStart":6637.5,"responseEnd":6670.199999809265,"responseStart":6662.599999904633,"secureConnectionStart":6384.099999904633},{"duration":252.70000004768372,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2cib/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":6384.399999856949,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":6384.399999856949,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":6637.099999904633,"responseStart":0,"secureConnectionStart":0},{"duration":286.5,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":6384.5,"connectEnd":6384.5,"connectStart":6384.5,"domainLookupEnd":6384.5,"domainLookupStart":6384.5,"fetchStart":6384.5,"redirectEnd":0,"redirectStart":0,"requestStart":6641.299999952316,"responseEnd":6671,"responseStart":6663.699999809265,"secureConnectionStart":6384.5},{"duration":255,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2cib/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/css/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.css?jira.create.linked.issue=true","startTime":6384.699999809265,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":6384.699999809265,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":6639.699999809265,"responseStart":0,"secureConnectionStart":0},{"duration":286.7000000476837,"initiatorType":"script","name":"https://jira.mariadb.org/s/5d5e8fe91fbc506585e83ea3b62ccc4b-CDN/lu2cib/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/js/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.js?jira.create.linked.issue=true&locale=en","startTime":6384.899999856949,"connectEnd":6384.899999856949,"connectStart":6384.899999856949,"domainLookupEnd":6384.899999856949,"domainLookupStart":6384.899999856949,"fetchStart":6384.899999856949,"redirectEnd":0,"redirectStart":0,"requestStart":6642.299999952316,"responseEnd":6671.599999904633,"responseStart":6664.799999952316,"secureConnectionStart":6384.899999856949},{"duration":488.90000009536743,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":6387.599999904633,"connectEnd":6387.599999904633,"connectStart":6387.599999904633,"domainLookupEnd":6387.599999904633,"domainLookupStart":6387.599999904633,"fetchStart":6387.599999904633,"redirectEnd":0,"redirectStart":0,"requestStart":6777,"responseEnd":6876.5,"responseStart":6873.5,"secureConnectionStart":6387.599999904633},{"duration":667.7000000476837,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":6387.799999952316,"connectEnd":6387.799999952316,"connectStart":6387.799999952316,"domainLookupEnd":6387.799999952316,"domainLookupStart":6387.799999952316,"fetchStart":6387.799999952316,"redirectEnd":0,"redirectStart":0,"requestStart":7042.899999856949,"responseEnd":7055.5,"responseStart":7054.699999809265,"secureConnectionStart":6387.799999952316},{"duration":203.79999995231628,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":6890.5,"connectEnd":6890.5,"connectStart":6890.5,"domainLookupEnd":6890.5,"domainLookupStart":6890.5,"fetchStart":6890.5,"redirectEnd":0,"redirectStart":0,"requestStart":7056.199999809265,"responseEnd":7094.299999952316,"responseStart":7093.399999856949,"secureConnectionStart":6890.5}],"fetchStart":0,"domainLookupStart":41,"domainLookupEnd":6064,"connectStart":6064,"connectEnd":6087,"secureConnectionStart":6074,"requestStart":6088,"responseStart":6375,"responseEnd":6385,"domLoading":6378,"domInteractive":7362,"domContentLoadedEventStart":7362,"domContentLoadedEventEnd":7423,"domComplete":7989,"loadEventStart":7989,"loadEventEnd":7990,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":7342},{"name":"bigPipe.sidebar-id.end","time":7342.899999856949},{"name":"bigPipe.activity-panel-pipe-id.start","time":7343},{"name":"bigPipe.activity-panel-pipe-id.end","time":7344.099999904633},{"name":"activityTabFullyLoaded","time":7437.599999904633}],"measures":[],"correlationId":"c5118c48b74ae9","effectiveType":"4g","downlink":9.3,"rtt":0,"serverDuration":102,"dbReadsTimeInMs":11,"dbConnsTimeInMs":20,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}
Plz review.