Merge branch columnstore-23.02.1-1 into develop-23.02 (#2778)

* cmake fixes:

* set build byproducts (otherwise ninja cannot build)
* exclude thrift from "all" target, it should only be buit as a dependency
  (otherwise it builds - and pulls in boost - when columnstore is disabled)
* move test-only external project into tests/ (because it requires git)
  and into storage/columnstore (where thrift and boost already are)

* Update drone to use 10.6-enterprise server branch. (#2763)

---------

Co-authored-by: Sergei Golubchik <serg@mariadb.com>

.drone.jsonnet

@@ -1,8 +1,8 @@
 local events = ['pull_request', 'cron'];
 
 local servers = {
-  develop: ['10.6-MENT-1667'],
+  develop: ['10.6-enterprise'],
-  'develop-22.08': ['10.6-MENT-1667'],
+  'develop-22.08': ['10.6-enterprise'],
 };
 
 local platforms = {
@@ -108,7 +108,7 @@ local testPreparation(platform) =
   platform_map[platform];
 
 
-local Pipeline(branch, platform, event, arch='amd64', server='10.6-MENT-1667') = {
+local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise') = {
   local pkg_format = if (std.split(platform, ':')[0] == 'centos' || std.split(platform, ':')[0] == 'rockylinux') then 'rpm' else 'deb',
   local init = if (pkg_format == 'rpm') then '/usr/lib/systemd/systemd' else 'systemd',
   local mtr_path = if (pkg_format == 'rpm') then '/usr/share/mysql-test' else '/usr/share/mysql/mysql-test',
@@ -125,7 +125,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-MENT-1667') =
   local container_tags = if (event == 'cron') then [brancht + std.strReplace(event, '_', '-') + '${DRONE_BUILD_NUMBER}', brancht] else [brancht + std.strReplace(event, '_', '-') + '${DRONE_BUILD_NUMBER}'],
   local container_version = branchp + event + '/${DRONE_BUILD_NUMBER}/' + server + '/' + arch,
 
-  local server_remote = if (std.endsWith(server, 'enterprise') || std.endsWith(server, '10.6-MENT-1667')) then 'https://github.com/mariadb-corporation/MariaDBEnterprise' else 'https://github.com/MariaDB/server',
+  local server_remote = if (std.endsWith(server, 'enterprise')) then 'https://github.com/mariadb-corporation/MariaDBEnterprise' else 'https://github.com/MariaDB/server',
 
   local sccache_arch = if (arch == 'amd64') then 'x86_64' else 'aarch64',
   local get_sccache = 'curl -L -o sccache.tar.gz https://github.com/mozilla/sccache/releases/download/v0.3.0/sccache-v0.3.0-' + sccache_arch + '-unknown-linux-musl.tar.gz ' +
@@ -693,8 +693,8 @@ local FinalPipeline(branch, event) = {
       'failure',
     ],
   } + (if event == 'cron' then { cron: ['nightly-' + std.strReplace(branch, '.', '-')] } else {}),
-  depends_on: std.map(function(p) std.join(' ', [branch, p, event, 'amd64', '10.6-MENT-1667']), platforms.develop) +
+  depends_on: std.map(function(p) std.join(' ', [branch, p, event, 'amd64', '10.6-enterprise']), platforms.develop) +
-              std.map(function(p) std.join(' ', [branch, p, event, 'arm64', '10.6-MENT-1667']), platforms_arm.develop),
+              std.map(function(p) std.join(' ', [branch, p, event, 'arm64', '10.6-enterprise']), platforms_arm.develop),
 };
 
 
@@ -719,10 +719,10 @@ local FinalPipeline(branch, event) = {
 ] +
 
 [
-  Pipeline(any_branch, p, 'custom', 'amd64', '10.6-MENT-1667')
+  Pipeline(any_branch, p, 'custom', 'amd64', '10.6-enterprise')
   for p in platforms_custom
 ] +
 [
-  Pipeline(any_branch, p, 'custom', 'arm64', '10.6-MENT-1667')
+  Pipeline(any_branch, p, 'custom', 'arm64', '10.6-enterprise')
   for p in platforms_arm_custom
 ]

CMakeLists.txt

@@ -358,13 +358,6 @@ IF(NOT TARGET columnstore)
   RETURN()
 ENDIF()
 
-set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external)
-ExternalProject_Add(mpark_patterns
-    GIT_REPOSITORY https://github.com/mpark/patterns
-    GIT_TAG v0.3.0
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION}
-)
-
 ADD_SUBDIRECTORY(utils)
 ADD_SUBDIRECTORY(oam/oamcpp)
 ADD_SUBDIRECTORY(dbcon/execplan)

cmake/thrift.cmake

@@ -24,6 +24,8 @@ ExternalProject_Add(external_thrift
     -DCMAKE_CXX_FLAGS:STRING="-fPIC"
     -DBOOST_INCLUDEDIR=${Boost_INCLUDE_DIRS}
     -DBOOST_LIBRARYDIR=${Boost_LIBRARY_DIRS}
+    BUILD_BYPRODUCTS "${THRIFT_LIBRARY_DIRS}/${CMAKE_STATIC_LIBRARY_PREFIX}thrift${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    EXCLUDE_FROM_ALL TRUE
 )
 
 add_dependencies(external_thrift external_boost)

tests/CMakeLists.txt

@@ -4,13 +4,19 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-fsanitize=address -fsanitize-address-use-after-
 
 if (WITH_UNITTESTS)
     cmake_policy(SET CMP0054 NEW)
-    set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external)
+    set(EXTERNAL_INSTALL_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external)
     ExternalProject_Add(googletest
         GIT_REPOSITORY https://github.com/google/googletest
         GIT_TAG release-1.12.0
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION} -DBUILD_SHARED_LIBS=ON
     )
 
+    ExternalProject_Add(mpark_patterns
+        GIT_REPOSITORY https://github.com/mpark/patterns
+        GIT_TAG v0.3.0
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION}
+    )
+
     # this is a workaround for gtest's bug still not closed
     # https://github.com/google/googletest/issues/3659
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")