Merge branch 'develop' into MCOL-3536

2025-08-08 14:22:09 +03:00 · 2020-05-18 16:22:01 -05:00
parent 1f3d1e6fd6 91196607bd
commit 8479a87e46
110 changed files with 557 additions and 7879 deletions
--- a/utils/batchloader/CMakeLists.txt
+++ b/utils/batchloader/CMakeLists.txt
@@ -10,6 +10,6 @@ add_library(batchloader SHARED ${batchloader_LIB_SRCS})

 target_link_libraries(batchloader ${NETSNMP_LIBRARIES})

-install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)


--- a/utils/cacheutils/CMakeLists.txt
+++ b/utils/cacheutils/CMakeLists.txt
@@ -8,5 +8,5 @@ set(cacheutils_LIB_SRCS cacheutils.cpp)

 add_library(cacheutils SHARED ${cacheutils_LIB_SRCS})

-install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/cloudio/CMakeLists.txt
+++ b/utils/cloudio/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(cloudio SHARED ${cloudio_LIB_SRCS})
 # we should be able to reverse the dependency like so:
 target_link_libraries(cloudio idbdatafile messageqcpp loggingcpp)

-install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

 add_executable(cloudio_component_test component_test.cpp)

--- a/utils/clusterTester/CMakeLists.txt
+++ b/utils/clusterTester/CMakeLists.txt
@@ -1,5 +1,5 @@

 install(PROGRAMS columnstoreClusterTester.sh
 		os_detect.sh
-                DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
+                DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

--- a/utils/common/CMakeLists.txt
+++ b/utils/common/CMakeLists.txt
@@ -16,5 +16,5 @@ add_library(common SHARED ${common_LIB_SRCS})

 add_dependencies(common loggingcpp)

-install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/compress/CMakeLists.txt
+++ b/utils/compress/CMakeLists.txt
@@ -12,5 +12,5 @@ add_library(compress SHARED ${compress_LIB_SRCS})

 target_link_libraries(compress ${SNAPPY_LIBRARIES})

-install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/configcpp/CMakeLists.txt
+++ b/utils/configcpp/CMakeLists.txt
@@ -9,5 +9,5 @@ add_library(configcpp SHARED ${configcpp_LIB_SRCS})

 target_compile_definitions(configcpp PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)

-install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/dataconvert/CMakeLists.txt
+++ b/utils/dataconvert/CMakeLists.txt
@@ -8,4 +8,4 @@ set(dataconvert_LIB_SRCS dataconvert.cpp)

 add_library(dataconvert SHARED ${dataconvert_LIB_SRCS})

-install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
--- a/utils/ddlcleanup/CMakeLists.txt
+++ b/utils/ddlcleanup/CMakeLists.txt
@@ -10,5 +10,5 @@ add_library(ddlcleanuputil SHARED ${ddlcleanuputil_LIB_SRCS})

 target_link_libraries(ddlcleanuputil ${NETSNMP_LIBRARIES})

-install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/funcexp/CMakeLists.txt
+++ b/utils/funcexp/CMakeLists.txt
@@ -112,5 +112,5 @@ add_library(funcexp SHARED ${funcexp_LIB_SRCS})

 target_link_libraries(funcexp ${NETSNMP_LIBRARIES})

-install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/idbdatafile/CMakeLists.txt
+++ b/utils/idbdatafile/CMakeLists.txt
@@ -19,4 +19,4 @@ target_link_libraries(idbdatafile ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS})

 target_compile_definitions(idbdatafile PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)

-install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
--- a/utils/joiner/CMakeLists.txt
+++ b/utils/joiner/CMakeLists.txt
@@ -8,6 +8,6 @@ set(joiner_LIB_SRCS joiner.cpp tuplejoiner.cpp joinpartition.cpp)

 add_library(joiner SHARED ${joiner_LIB_SRCS})

-install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)


--- a/utils/libmarias3/CMakeLists.txt
+++ b/utils/libmarias3/CMakeLists.txt
@@ -35,5 +35,5 @@ set(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS")

 install(TARGETS marias3
    DESTINATION ${ENGINE_LIBDIR}
-    COMPONENT columnstore-platform
+    COMPONENT columnstore-engine
 )
--- a/utils/libmysql_client/CMakeLists.txt
+++ b/utils/libmysql_client/CMakeLists.txt
@@ -7,5 +7,5 @@ set(libmysql_client_LIB_SRCS libmysql_client.cpp)

 add_library(libmysql_client SHARED ${libmysql_client_LIB_SRCS})

-install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/loggingcpp/CMakeLists.txt
+++ b/utils/loggingcpp/CMakeLists.txt
@@ -29,7 +29,7 @@ add_library(loggingcpp SHARED
    ${CMAKE_CURRENT_BINARY_DIR}/errorids.h
 )

-install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

-install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-platform)
+install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-engine)

--- a/utils/messageqcpp/CMakeLists.txt
+++ b/utils/messageqcpp/CMakeLists.txt
@@ -16,4 +16,4 @@ set(messageqcpp_LIB_SRCS

 add_library(messageqcpp SHARED ${messageqcpp_LIB_SRCS})

-install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
--- a/utils/querystats/CMakeLists.txt
+++ b/utils/querystats/CMakeLists.txt
@@ -7,5 +7,5 @@ set(querystats_LIB_SRCS querystats.cpp)

 add_library(querystats SHARED ${querystats_LIB_SRCS})

-install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/querytele/CMakeLists.txt
+++ b/utils/querytele/CMakeLists.txt
@@ -14,5 +14,5 @@ set(querytele_LIB_SRCS

 add_library(querytele SHARED ${querytele_LIB_SRCS})

-install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/regr/CMakeLists.txt
+++ b/utils/regr/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN)

 add_library(regr SHARED ${regr_LIB_SRCS} )

-install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)



--- a/utils/rowgroup/CMakeLists.txt
+++ b/utils/rowgroup/CMakeLists.txt
@@ -12,5 +12,5 @@ add_library(rowgroup SHARED ${rowgroup_LIB_SRCS})

 target_link_libraries(rowgroup ${NETSNMP_LIBRARIES} funcexp)

-install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/rwlock/CMakeLists.txt
+++ b/utils/rwlock/CMakeLists.txt
@@ -9,5 +9,5 @@ set(rwlock_LIB_SRCS rwlock.cpp rwlock_local.cpp)

 add_library(rwlock SHARED ${rwlock_LIB_SRCS})

-install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/threadpool/CMakeLists.txt
+++ b/utils/threadpool/CMakeLists.txt
@@ -8,4 +8,4 @@ set(threadpool_LIB_SRCS weightedthreadpool.cpp threadpool.cpp prioritythreadpool

 add_library(threadpool SHARED ${threadpool_LIB_SRCS})

-install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
--- a/utils/threadpool/threadpool.cpp
+++ b/utils/threadpool/threadpool.cpp
@@ -298,10 +298,10 @@ uint64_t ThreadPool::invoke(const Functor_T& threadfunc)
                logging::Message::Args args;
                logging::Message message(5);
                args.add("invoke: Blocked waiting for thread. Count ");
-                args.add(fThreadCount);
+                args.add(static_cast<uint64_t>(fThreadCount));
                args.add("max ");
-                args.add(fMaxThreads);
-                message.format( args );
+                args.add(static_cast<uint64_t>(fMaxThreads));
+                message.format(args);
                logging::LoggingID lid(22);
                logging::MessageLog ml(lid);
                ml.logWarningMessage( message );
--- a/utils/thrift/CMakeLists.txt
+++ b/utils/thrift/CMakeLists.txt
@@ -16,5 +16,5 @@ add_definitions(-DTHRIFT_SQUELCH_CONSOLE_OUTPUT)

 add_library(thrift SHARED ${thrift_LIB_SRCS})

-install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

--- a/utils/udfsdk/CMakeLists.txt
+++ b/utils/udfsdk/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN)

 add_library(udfsdk SHARED ${udfsdk_LIB_SRCS})

-install(TARGETS udfsdk DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS udfsdk DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

 set(udf_mysql_LIB_SRCS udfmysql.cpp)

--- a/utils/windowfunction/CMakeLists.txt
+++ b/utils/windowfunction/CMakeLists.txt
@@ -26,10 +26,10 @@ set(windowfunction_LIB_SRCS

 add_library(windowfunction SHARED ${windowfunction_LIB_SRCS})

-install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
+install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

 if (WITH_SORTING_COMPARATORS_UT)
    add_executable(comparators_tests comparators-tests.cpp)
    target_link_libraries(comparators_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
-    install(TARGETS comparators_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
+    install(TARGETS comparators_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
 endif()