Merge pull request mariadb-corporation#2839 from tntnatbry/develop-23.02-changes-for-develop

develop-23.02 changes for develop.

Author: drrtuy

.gitignore

@@ -177,6 +177,7 @@ build/Testing/
 tests/*\[1\]_tests.cmake
 tests/*\[1\]_include.cmake
 .boost
+build/.cmake
 *.vtg
 *.vtg-back
 '*.vtg-Stashed changes'

CMakeLists.txt

@@ -1,6 +1,18 @@
+if (CMAKE_VERSION VERSION_LESS 3.10.0)
+  MESSAGE_ONCE(CS_CMAKE "ColumnStore needs cmake >= 3.10")
+  RETURN()
+ENDIF()
+
 CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
 
 PROJECT(Columnstore)
+INCLUDE (CheckCXXSourceCompiles)
+
+FOREACH(p CMP0135)
+  IF(POLICY ${p})
+    CMAKE_POLICY(SET ${p} NEW)
+  ENDIF()
+ENDFOREACH()
 
 IF(NOT INSTALL_LAYOUT)
     IF(NOT CMAKE_BUILD_TYPE)
@@ -50,6 +62,19 @@ ELSE()
   ENDIF()
 ENDIF()
 
+CHECK_CXX_SOURCE_COMPILES(
+"#include <set>
+int main()
+{
+  std::set<int> s = {1, 2, 3, 4};
+  return s.contains(2);
+}" HAVE_STD_SET_CONTAINS)
+
+IF (NOT HAVE_STD_SET_CONTAINS)
+  MESSAGE_ONCE(CS_NO_CONTAINS "std::set does not have contains() method")
+  RETURN()
+ENDIF()
+
 # There is an inconsistency b/w default char signedness at ARM and x86.
 # This flag explicitly sets char as signed.
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
@@ -119,6 +144,7 @@ INCLUDE(columnstore_version)
 INCLUDE(misc)
 INCLUDE(boost)
 INCLUDE(thrift)
+INCLUDE(mpark_patterns)
 
 FIND_PACKAGE(BISON)
 IF (NOT BISON_FOUND)
@@ -363,13 +389,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)

VERSION

@@ -1,4 +1,4 @@
 COLUMNSTORE_VERSION_MAJOR=23
-COLUMNSTORE_VERSION_MINOR=02
+COLUMNSTORE_VERSION_MINOR=08
 COLUMNSTORE_VERSION_PATCH=1
 COLUMNSTORE_VERSION_RELEASE=1

cmake/mpark_patterns.cmake

@@ -0,0 +1,19 @@
+include(ExternalProject)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+  set(_toolset "gcc")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+  set(_toolset "clang")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+  set(_toolset "intel-linux")
+endif()
+
+ExternalProject_Add(mpark_patterns
+  PREFIX external/patterns
+  URL https://github.com/mpark/patterns/archive/refs/tags/v0.3.0.tar.gz
+  URL_HASH SHA256=80e6af808a4d74d5d7358666303eb1dbfc5582313ff9fa31d1c0d3280d3bd9e7
+  BUILD_IN_SOURCE TRUE
+  LOG_BUILD TRUE
+  LOG_INSTALL TRUE
+  EXCLUDE_FROM_ALL TRUE
+)

debian/mariadb-plugin-columnstore.install

@@ -29,6 +29,7 @@ usr/bin/ddlcleanup
 usr/bin/editem
 usr/bin/idbmeminfo
 usr/bin/load_brm
+usr/bin/loop_process_starter.sh
 usr/bin/mariadb-columnstore-start.sh
 usr/bin/mariadb-columnstore-stop.sh
 usr/bin/mcs-savebrm.py

oam/install_scripts/mcs-savebrm.py.in

@@ -118,9 +118,11 @@ def is_primary_fallback(current_hostname):
     hostnames = set()
     for _, nic_name in socket.if_nameindex():
         ip_addr = get_ip_address_by_nic(nic_name)
-        if ip_addr:
+        try:
             hostnames_3tuple = socket.gethostbyaddr(ip_addr)
             hostnames.update([hostnames_3tuple[0], *hostnames_3tuple[1]])
+        except:
+            pass
     logging.debug('Found hostnames {}.'.format(hostnames))
     return current_hostname in hostnames
 

utils/funcexp/func_lcase.cpp

@@ -53,7 +53,11 @@ std::string Func_lcase::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is
 
   CHARSET_INFO* cs = colType.getCharset();
   uint64_t inLen = tstr.length();
+#if MYSQL_VERSION_ID >= 101004
+  uint64_t bufLen = inLen * cs->casedn_multiply();
+#else
   uint64_t bufLen = inLen * cs->casedn_multiply;
+#endif
   char* outBuf = new char[bufLen];
 
   uint64_t outLen = cs->casedn(tstr.str(), inLen, outBuf, bufLen);

utils/funcexp/func_ucase.cpp

@@ -62,7 +62,11 @@ std::string Func_ucase::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is
 
   CHARSET_INFO* cs = colType.getCharset();
   uint64_t inLen = tstr.length();
-  uint64_t bufLen = inLen * cs->caseup_multiply;
+#if MYSQL_VERSION_ID >= 101004
+  uint64_t bufLen = inLen * cs->casedn_multiply();
+#else
+  uint64_t bufLen = inLen * cs->casedn_multiply;
+#endif
   char* outBuf = new char[bufLen];
 
   uint64_t outLen = cs->caseup(tstr.str(), inLen, outBuf, bufLen);

utils/messageqcpp/messagequeuepool.cpp

@@ -15,7 +15,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA. */
 
-#include <memory>
 #include <sstream>
 #include <map>
 #include <time.h>