stubs and cmake formatting

2025-07-30 19:23:07 +03:00 · 2025-05-20 02:18:54 +00:00
parent 2036e521c7
commit 6db2dc668f
87 changed files with 1186 additions and 1039 deletions
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@ -1,5 +1,4 @@
-
-#add_subdirectory(boost_idb)
+# add_subdirectory(boost_idb)
 add_subdirectory(startup)
 add_subdirectory(common)
 add_subdirectory(configcpp)
--- a/utils/batchloader/CMakeLists.txt
+++ b/utils/batchloader/CMakeLists.txt
@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-
-########### next target ###############
+# ########## next target ###############

 set(batchloader_LIB_SRCS batchloader.cpp)

@ -11,4 +10,8 @@ add_dependencies(batchloader loggingcpp)

 target_link_libraries(batchloader ${NETSNMP_LIBRARIES})

-install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS batchloader
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/cacheutils/CMakeLists.txt
+++ b/utils/cacheutils/CMakeLists.txt
@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-
-########### next target ###############
+# ########## next target ###############

 set(cacheutils_LIB_SRCS cacheutils.cpp)

@ -9,4 +8,8 @@ columnstore_library(cacheutils ${cacheutils_LIB_SRCS})

 add_dependencies(cacheutils loggingcpp)

-install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS cacheutils
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/cloudio/CMakeLists.txt
+++ b/utils/cloudio/CMakeLists.txt
@ -1,28 +1,35 @@
 include_directories(${ENGINE_COMMON_INCLUDES} ${ENGINE_SRC_DIR}/storage-manager/include)

-set(cloudio_LIB_SRCS SMComm.cpp SMDataFile.cpp SMFileFactory.cpp SMFileSystem.cpp SocketPool.cpp cloud_plugin.cpp ../../datatypes/mcs_datatype.cpp)
+set(cloudio_LIB_SRCS
+    SMComm.cpp
+    SMDataFile.cpp
+    SMFileFactory.cpp
+    SMFileSystem.cpp
+    SocketPool.cpp
+    cloud_plugin.cpp
+    ../../datatypes/mcs_datatype.cpp
+)

 columnstore_library(cloudio ${cloudio_LIB_SRCS})

-# IDBDataFile currently depends on cloudio, which is backward.
-# Once cloudio has been turned into a proper plugin for idbdatafile,
-# we should be able to reverse the dependency like so:
+# IDBDataFile currently depends on cloudio, which is backward. Once cloudio has been turned into a proper plugin for
+# idbdatafile, 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-engine)
+install(
+    TARGETS cloudio
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)

 add_executable(cloudio_component_test component_test.cpp)

 add_executable(end_to_end_test end_to_end_test.cpp)

-# see the comment above and change this dependency to cloudio.  Hm
-# our lib dependencies seem not to be declared.  Punting on that,
-# maybe in the future we can have some poor unfortunate intern
-# untangle all of that and declare lib dependencies properly.
-# For now I'm going to do like the other executables, which means
-# nearly everything AFAICT.
+# see the comment above and change this dependency to cloudio.  Hm our lib dependencies seem not to be declared. Punting
+# on that, maybe in the future we can have some poor unfortunate intern untangle all of that and declare lib
+# dependencies properly. For now I'm going to do like the other executables, which means nearly everything AFAICT.
 target_link_libraries(cloudio_component_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cloudio)
 target_link_libraries(end_to_end_test ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} cloudio)
-#target_link_libraries(cloudio_component_test cloudio)
-# Copy end_to_end_test dataFile to binary directory
-FILE(COPY testData DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+# target_link_libraries(cloudio_component_test cloudio) Copy end_to_end_test dataFile to binary directory
+file(COPY testData DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
--- a/utils/common/CMakeLists.txt
+++ b/utils/common/CMakeLists.txt
@ -1,6 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-########### next target ###############
+# ########## next target ###############

 set(common_LIB_SRCS
    fixedallocator.cpp
@ -11,7 +11,8 @@ set(common_LIB_SRCS
    threadnaming.cpp
    utils_utf8.cpp
    statistics.cpp
-    string_prefixes.cpp)
+    string_prefixes.cpp
+)

 columnstore_library(common ${common_LIB_SRCS})

@ -19,4 +20,8 @@ target_link_libraries(common boost_filesystem)

 add_dependencies(common loggingcpp)

-install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS common
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/compress/CMakeLists.txt
+++ b/utils/compress/CMakeLists.txt
@ -1,12 +1,15 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} ${SNAPPY_INCLUDE_DIR} )
+include_directories(${ENGINE_COMMON_INCLUDES} ${SNAPPY_INCLUDE_DIR})

-#hack for lz4 duplicate header
-GET_PROPERTY(dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
-LIST(REMOVE_ITEM dirs ${CMAKE_SOURCE_DIR}/include/providers)
-SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}")
+# hack for lz4 duplicate header
+get_property(
+    dirs
+    DIRECTORY
+    PROPERTY INCLUDE_DIRECTORIES
+)
+list(REMOVE_ITEM dirs ${CMAKE_SOURCE_DIR}/include/providers)
+set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}")

-set(compress_LIB_SRCS
-    idbcompress.cpp)
+set(compress_LIB_SRCS idbcompress.cpp)

 add_definitions(-DNDEBUG)

@ -14,9 +17,13 @@ columnstore_library(compress ${compress_LIB_SRCS})
 add_dependencies(compress loggingcpp external_boost)

 target_link_libraries(compress ${SNAPPY_LIBRARIES})
-IF(HAVE_LZ4)
-    MESSAGE_ONCE(STATUS "LINK WITH LZ4")
+if(HAVE_LZ4)
+    message_once(STATUS "LINK WITH LZ4")
    target_link_libraries(compress ${LZ4_LIBRARIES})
-ENDIF()
+endif()

-install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS compress
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/configcpp/CMakeLists.txt
+++ b/utils/configcpp/CMakeLists.txt
@ -1,6 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-########### next target ###############
+# ########## next target ###############

 set(configcpp_LIB_SRCS configcpp.cpp xmlparser.cpp configstream.cpp)

@ -9,4 +9,8 @@ add_dependencies(configcpp loggingcpp)

 target_compile_definitions(configcpp PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)

-install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS configcpp
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/configcpp/md5/CMakeLists.txt
+++ b/utils/configcpp/md5/CMakeLists.txt
@ -1,24 +1,18 @@
-
 #
 # Not used
 #
-#

+# original Makefile.am contents follow:

-
-#original Makefile.am contents follow:
-
-#AM_CFLAGS = $(idb_cflags)
-#noinst_LIBRARIES = libmd5.a
-#libmd5_a_SOURCES = md5_dgst.c md5_one.c mem_clr.c
+# AM_CFLAGS = $(idb_cflags) noinst_LIBRARIES = libmd5.a libmd5_a_SOURCES = md5_dgst.c md5_one.c mem_clr.c
 #
-#test:
+# test:
 #
-#coverage:
+# coverage:
 #
-#leakcheck:
+# leakcheck:
 #
-#docs:
+# docs:
 #
-#bootstrap:
+# bootstrap:
 #
--- a/utils/dataconvert/CMakeLists.txt
+++ b/utils/dataconvert/CMakeLists.txt
@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-
-########### next target ###############
+# ########## next target ###############

 set(dataconvert_LIB_SRCS dataconvert.cpp)

@ -9,4 +8,8 @@ columnstore_library(dataconvert ${dataconvert_LIB_SRCS})

 add_dependencies(dataconvert loggingcpp)

-install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS dataconvert
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/ddlcleanup/CMakeLists.txt
+++ b/utils/ddlcleanup/CMakeLists.txt
@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-
-########### next target ###############
+# ########## next target ###############

 set(ddlcleanuputil_LIB_SRCS ddlcleanuputil.cpp)

@ -11,4 +10,8 @@ add_dependencies(ddlcleanuputil loggingcpp)

 target_link_libraries(ddlcleanuputil ${NETSNMP_LIBRARIES})

-install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS ddlcleanuputil
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/idbdatafile/CMakeLists.txt
+++ b/utils/idbdatafile/CMakeLists.txt
@ -1,6 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} ../cloudio)
+include_directories(${ENGINE_COMMON_INCLUDES} ../cloudio)

-########### next target ###############
+# ########## next target ###############

 set(idbdatafile_LIB_SRCS
    BufferedFile.cpp
@ -10,7 +10,8 @@ set(idbdatafile_LIB_SRCS
    IDBLogger.cpp
    IDBPolicy.cpp
    PosixFileSystem.cpp
-    UnbufferedFile.cpp)
+    UnbufferedFile.cpp
+)

 columnstore_library(idbdatafile ${idbdatafile_LIB_SRCS})

@ -18,4 +19,8 @@ target_link_libraries(idbdatafile ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS} boost_

 target_compile_definitions(idbdatafile PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)

-install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS idbdatafile
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/joiner/CMakeLists.txt
+++ b/utils/joiner/CMakeLists.txt
@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-
-########### next target ###############
+# ########## next target ###############

 set(joiner_LIB_SRCS tuplejoiner.cpp joinpartition.cpp)

@ -9,4 +8,8 @@ columnstore_library(joiner ${joiner_LIB_SRCS})

 add_dependencies(joiner loggingcpp)

-install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS joiner
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/libmarias3/CMakeLists.txt
+++ b/utils/libmarias3/CMakeLists.txt
@ -1,6 +1,10 @@
-set(S3API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libmarias3 CACHE INTERNAL "S3API_DIR")
+set(S3API_DIR
+    ${CMAKE_CURRENT_SOURCE_DIR}/libmarias3
+    CACHE INTERNAL "S3API_DIR"
+)

-SET(S3_SOURCES ${S3API_DIR}/src/debug.c
+set(S3_SOURCES
+    ${S3API_DIR}/src/debug.c
    ${S3API_DIR}/src/error.c
    ${S3API_DIR}/src/marias3.c
    ${S3API_DIR}/src/request.c
@ -8,17 +12,22 @@ SET(S3_SOURCES ${S3API_DIR}/src/debug.c
    ${S3API_DIR}/src/sha256.c
    ${S3API_DIR}/src/sha256-internal.c
    ${S3API_DIR}/src/xml.c
-    ${S3API_DIR}/src/assume_role.c)
+    ${S3API_DIR}/src/assume_role.c
+)

-ADD_LIBRARY(marias3 SHARED ${S3_SOURCES})
+add_library(marias3 SHARED ${S3_SOURCES})

-TARGET_LINK_LIBRARIES(marias3 curl m)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${S3API_DIR})
+target_link_libraries(marias3 curl m)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${S3API_DIR})
 add_definitions(-D_GNU_SOURCE)

-set(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS")
+set(S3API_DEPS
+    marias3 curl
+    CACHE INTERNAL "S3API_DEPS"
+)

-install(TARGETS marias3
+install(
+    TARGETS marias3
    DESTINATION ${ENGINE_LIBDIR}
    COMPONENT columnstore-engine
 )
--- a/utils/libmysql_client/CMakeLists.txt
+++ b/utils/libmysql_client/CMakeLists.txt
@ -1,11 +1,9 @@
-include_directories(BEFORE
-  ${LIBMARIADB_BININC_DIR}
-  ${LIBMARIADB_SRCINC_DIR})
+include_directories(BEFORE ${LIBMARIADB_BININC_DIR} ${LIBMARIADB_SRCINC_DIR})
 add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)

-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-########### next target ###############
+# ########## next target ###############

 set(libmysql_client_LIB_SRCS libmysql_client.cpp)

@ -14,4 +12,8 @@ target_link_libraries(libmysql_client ${MARIADB_CLIENT_LIBS})

 add_dependencies(libmysql_client loggingcpp)

-install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS libmysql_client
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/loggingcpp/CMakeLists.txt
+++ b/utils/loggingcpp/CMakeLists.txt
@ -1,23 +1,26 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-########### next target ###############
-ADD_CUSTOM_COMMAND(
+# ########## next target ###############
+add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/messageids.h
-    COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/genMsgId.pl < ${CMAKE_CURRENT_SOURCE_DIR}/MessageFile.txt > messageids-temp.h
+    COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/genMsgId.pl < ${CMAKE_CURRENT_SOURCE_DIR}/MessageFile.txt >
+            messageids-temp.h
    COMMAND ${CMAKE_COMMAND} -E copy_if_different messageids-temp.h messageids.h
    DEPENDS genMsgId.pl
-    )
-ADD_CUSTOM_COMMAND(
+)
+add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/errorids.h
-    COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/genErrId.pl < ${CMAKE_CURRENT_SOURCE_DIR}/ErrorMessage.txt > errorids-temp.h
+    COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/genErrId.pl < ${CMAKE_CURRENT_SOURCE_DIR}/ErrorMessage.txt >
+            errorids-temp.h
    COMMAND ${CMAKE_COMMAND} -E copy_if_different errorids-temp.h errorids.h
    DEPENDS genErrId.pl
-     )
+)

 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/messageids.h PROPERTIES GENERATED TRUE)
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/errorids.h PROPERTIES GENERATED TRUE)

-columnstore_library(loggingcpp 
+columnstore_library(
+    loggingcpp
    message.cpp
    messagelog.cpp
    logger.cpp
@ -30,6 +33,14 @@ columnstore_library(loggingcpp
 )
 add_dependencies(loggingcpp external_boost)

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

-install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-engine)
+install(
+    FILES MessageFile.txt ErrorMessage.txt
+    DESTINATION ${ENGINE_SYSCONFDIR}/columnstore
+    COMPONENT columnstore-engine
+)
--- a/utils/messageqcpp/CMakeLists.txt
+++ b/utils/messageqcpp/CMakeLists.txt
@ -1,7 +1,6 @@
+include_directories(${ENGINE_COMMON_INCLUDES})

-include_directories( ${ENGINE_COMMON_INCLUDES} )
-
-########### next target ###############
+# ########## next target ###############

 set(messageqcpp_LIB_SRCS
    messagequeue.cpp
@ -19,5 +18,4 @@ add_library(messageqcpp STATIC ${messageqcpp_LIB_SRCS})

 add_dependencies(messageqcpp loggingcpp)

-#We don't isntall static library
-#install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+# We don't isntall static library install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
--- a/utils/multicast/CMakeLists.txt
+++ b/utils/multicast/CMakeLists.txt
@ -1,48 +1,33 @@
-
 #
 # Not used
 #
-#

+# original Makefile.am contents follow:

-
-#original Makefile.am contents follow:
-
-## Copyright (C) 2014 InfiniDB, Inc.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation; version 2 of
-## the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-## MA 02110-1301, USA.
+# Copyright (C) 2014 InfiniDB, Inc.
 #
-## $Id$
-### Process this file with automake to produce Makefile.in
+# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; version 2 of the License.
 #
-#AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = -version-info 1:0:0 $(idb_ldflags)
-#lib_LTLIBRARIES = libmulticast.la
-#libmulticast_la_SOURCES = multicast.cpp
-#include_HEADERS = multicast.h
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-#test:
+# You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-#coverage:
+# $Id$ Process this file with automake to produce Makefile.in
 #
-#leakcheck:
+# AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags) AM_CFLAGS = $(idb_cflags) AM_CXXFLAGS = $(idb_cxxflags)
+# AM_LDFLAGS = -version-info 1:0:0 $(idb_ldflags) lib_LTLIBRARIES = libmulticast.la libmulticast_la_SOURCES =
+# multicast.cpp include_HEADERS = multicast.h
 #
-#docs:
+# test:
 #
-#bootstrap: install-data-am
+# coverage:
+#
+# leakcheck:
+#
+# docs:
+#
+# bootstrap: install-data-am
 #
--- a/utils/pron/CMakeLists.txt
+++ b/utils/pron/CMakeLists.txt
@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})
 set(pron_LIB_SRCS pron.cpp)
 add_library(pron STATIC ${pron_LIB_SRCS})
 target_link_libraries(pron messageqcpp loggingcpp)

-#We don't isntall static library
-#install(TARGETS pron DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+# We don't isntall static library install(TARGETS pron DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
--- a/utils/querystats/CMakeLists.txt
+++ b/utils/querystats/CMakeLists.txt
@ -1,11 +1,9 @@
-include_directories(BEFORE
-  ${LIBMARIADB_BININC_DIR}
-  ${LIBMARIADB_SRCINC_DIR})
+include_directories(BEFORE ${LIBMARIADB_BININC_DIR} ${LIBMARIADB_SRCINC_DIR})
 add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)

-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-########### next target ###############
+# ########## next target ###############

 set(querystats_LIB_SRCS querystats.cpp)

@ -13,4 +11,8 @@ columnstore_library(querystats ${querystats_LIB_SRCS})

 add_dependencies(querystats loggingcpp)

-install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS querystats
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/querytele/CMakeLists.txt
+++ b/utils/querytele/CMakeLists.txt
@ -1,19 +1,18 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

+# ########## next target ###############

-########### next target ###############
-
-set(querytele_LIB_SRCS
-    querytele.cpp
-    queryteleclient.cpp
-    querytele_constants.cpp
-    querytele_types.cpp
-    QueryTeleService.cpp
-    queryteleprotoimpl.cpp)
+set(querytele_LIB_SRCS querytele.cpp queryteleclient.cpp querytele_constants.cpp querytele_types.cpp
+                       QueryTeleService.cpp queryteleprotoimpl.cpp
+)

 columnstore_library(querytele ${querytele_LIB_SRCS})
 add_dependencies(querytele external_boost external_thrift)

 target_include_directories(querytele PRIVATE ${THRIFT_INCLUDE_DIRS})
 target_link_libraries(querytele ${THRIFT_LIBRARY})
-install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS querytele
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/regr/CMakeLists.txt
+++ b/utils/regr/CMakeLists.txt
@ -1,26 +1,44 @@
-include_directories( ${ENGINE_COMMON_INCLUDES}
-                     ../../dbcon/mysql )
-                     
-########### next target ###############
+include_directories(${ENGINE_COMMON_INCLUDES} ../../dbcon/mysql)

-set(regr_LIB_SRCS regr_avgx.cpp regr_avgy.cpp regr_count.cpp regr_slope.cpp regr_intercept.cpp regr_r2.cpp corr.cpp regr_sxx.cpp regr_syy.cpp regr_sxy.cpp covar_pop.cpp covar_samp.cpp moda.cpp)
+# ########## next target ###############
+
+set(regr_LIB_SRCS
+    regr_avgx.cpp
+    regr_avgy.cpp
+    regr_count.cpp
+    regr_slope.cpp
+    regr_intercept.cpp
+    regr_r2.cpp
+    corr.cpp
+    regr_sxx.cpp
+    regr_syy.cpp
+    regr_sxy.cpp
+    covar_pop.cpp
+    covar_samp.cpp
+    moda.cpp
+)

 add_definitions(-DMYSQL_DYNAMIC_PLUGIN)

-columnstore_library(regr ${regr_LIB_SRCS} )
+columnstore_library(regr ${regr_LIB_SRCS})

 add_dependencies(regr loggingcpp)

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

 set(regr_mysql_LIB_SRCS regrmysql.cpp modamysql.cpp)

 columnstore_library(regr_mysql ${regr_mysql_LIB_SRCS})
 add_dependencies(regr_mysql external_boost)

-install(TARGETS regr_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS regr_mysql
+    DESTINATION ${MARIADB_PLUGINDIR}
+    COMPONENT columnstore-engine
+)

-set_target_properties(regr_mysql PROPERTIES
-                      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../)
+set_target_properties(regr_mysql PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../)
--- a/utils/rowgroup/CMakeLists.txt
+++ b/utils/rowgroup/CMakeLists.txt
@ -1,11 +1,10 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-
-########### next target ###############
+# ########## next target ###############

 set(rowgroup_LIB_SRCS rowaggregation.cpp rowgroup.cpp rowstorage.cpp)

-#librowgroup_la_CXXFLAGS = $(march_flags) $(AM_CXXFLAGS)
+# librowgroup_la_CXXFLAGS = $(march_flags) $(AM_CXXFLAGS)

 columnstore_library(rowgroup ${rowgroup_LIB_SRCS})

@ -13,4 +12,8 @@ add_dependencies(rowgroup loggingcpp external_boost)

 target_link_libraries(rowgroup ${NETSNMP_LIBRARIES} funcexp)

-install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS rowgroup
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/rwlock/CMakeLists.txt
+++ b/utils/rwlock/CMakeLists.txt
@ -1,8 +1,12 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

 set(rwlock_LIB_SRCS rwlock.cpp rwlock_local.cpp)

 columnstore_library(rwlock ${rwlock_LIB_SRCS})
 add_dependencies(rwlock external_boost)

-install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS rwlock
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/startup/CMakeLists.txt
+++ b/utils/startup/CMakeLists.txt
@ -1,8 +1,8 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-ADD_DEFINITIONS(-fPIC -DPIC)
+add_definitions(-fPIC -DPIC)

 columnstore_library(idbboot installdir.cpp)
 add_dependencies(idbboot external_boost)

-INSTALL(TARGETS idbboot DESTINATION ${ENGINE_LIBDIR})
+install(TARGETS idbboot DESTINATION ${ENGINE_LIBDIR})
--- a/utils/threadpool/CMakeLists.txt
+++ b/utils/threadpool/CMakeLists.txt
@ -1,10 +1,13 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-
-########### next target ###############
+# ########## next target ###############

 set(threadpool_LIB_SRCS weightedthreadpool.cpp threadpool.cpp prioritythreadpool.cpp fair_threadpool.cpp)
 columnstore_library(threadpool ${threadpool_LIB_SRCS})
 add_dependencies(threadpool loggingcpp external_boost)
 target_link_libraries(threadpool boost_chrono)
-install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS threadpool
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/utils/windowfunction/CMakeLists.txt
+++ b/utils/windowfunction/CMakeLists.txt
@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-
-########### next target ###############
+# ########## next target ###############

 set(windowfunction_LIB_SRCS
    framebound.cpp
@ -21,10 +20,15 @@ set(windowfunction_LIB_SRCS
    wf_row_number.cpp
    wf_stats.cpp
    wf_sum_avg.cpp
-    wf_udaf.cpp)
+    wf_udaf.cpp
+)

 columnstore_library(windowfunction ${windowfunction_LIB_SRCS})

 add_dependencies(windowfunction loggingcpp)

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