stubs and cmake formatting

2025-08-08 14:22:09 +03:00 · 2025-05-20 02:18:54 +00:00
parent 2036e521c7
commit 6db2dc668f
87 changed files with 1186 additions and 1039 deletions
--- a/dbcon/CMakeLists.txt
+++ b/dbcon/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_subdirectory(ddlpackage)
 add_subdirectory(ddlpackageproc)
 add_subdirectory(dmlpackage)
@@ -6,4 +5,3 @@ add_subdirectory(dmlpackageproc)
 add_subdirectory(execplan)
 add_subdirectory(joblist)
 add_subdirectory(mysql)
-
--- a/dbcon/ddlpackage/CMakeLists.txt
+++ b/dbcon/ddlpackage/CMakeLists.txt
@@ -1,20 +1,25 @@
-INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-FIND_PACKAGE(BISON REQUIRED)
-BISON_TARGET(ddl_gram ddl.y ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.cpp
-  DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h
-  COMPILE_FLAGS "-l -p ddl --defines=${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h")
+find_package(BISON REQUIRED)
+bison_target(
+    ddl_gram ddl.y ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.cpp
+    DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h
+    COMPILE_FLAGS "-l -p ddl --defines=${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h"
+)

-FIND_PACKAGE(FLEX REQUIRED)
-FLEX_TARGET(ddl_scan ddl.l ${CMAKE_CURRENT_BINARY_DIR}/ddl-scan.cpp COMPILE_FLAGS "-i -L -Pddl")
-ADD_FLEX_BISON_DEPENDENCY(ddl_scan ddl_gram)
+find_package(FLEX REQUIRED)
+flex_target(ddl_scan ddl.l ${CMAKE_CURRENT_BINARY_DIR}/ddl-scan.cpp COMPILE_FLAGS "-i -L -Pddl")
+add_flex_bison_dependency(ddl_scan ddl_gram)

-set_source_files_properties(ddl-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT")
+set_source_files_properties(
+    ddl-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT"
+)
 set_source_files_properties(ddl-gram.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable")
-########### next target ###############
+# ########## next target ###############

 include_directories(${CMAKE_CURRENT_BINARY_DIR}) # to pick up flex/bison output
-columnstore_library(ddlpackage
+columnstore_library(
+    ddlpackage
    serialize.cpp
    ddl-scan.cpp
    ddl-gram.cpp
@@ -39,4 +44,8 @@ columnstore_library(ddlpackage

 add_dependencies(ddlpackage loggingcpp)

-INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS ddlpackage
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/dbcon/ddlpackageproc/CMakeLists.txt
+++ b/dbcon/ddlpackageproc/CMakeLists.txt
@@ -1,6 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

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

 set(ddlpackageproc_LIB_SRCS
    ddlpackageprocessor.cpp
@@ -9,7 +9,8 @@ set(ddlpackageproc_LIB_SRCS
    droptableprocessor.cpp
    markpartitionprocessor.cpp
    restorepartitionprocessor.cpp
-    droppartitionprocessor.cpp)
+    droppartitionprocessor.cpp
+)

 columnstore_library(ddlpackageproc ${ddlpackageproc_LIB_SRCS})

@@ -17,4 +18,8 @@ add_dependencies(ddlpackageproc loggingcpp)

 target_link_libraries(ddlpackageproc ${NETSNMP_LIBRARIES})

-install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS ddlpackageproc
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/dbcon/dmlpackage/CMakeLists.txt
+++ b/dbcon/dmlpackage/CMakeLists.txt
@@ -1,20 +1,25 @@
-INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

-FIND_PACKAGE(BISON REQUIRED)
-BISON_TARGET(dml_gram dml.y ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.cpp
-  DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h
-  COMPILE_FLAGS "-l -p dml --defines=${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h")
+find_package(BISON REQUIRED)
+bison_target(
+    dml_gram dml.y ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.cpp
+    DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h
+    COMPILE_FLAGS "-l -p dml --defines=${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h"
+)

-FIND_PACKAGE(FLEX REQUIRED)
-FLEX_TARGET(dml_scan dml.l ${CMAKE_CURRENT_BINARY_DIR}/dml-scan.cpp COMPILE_FLAGS "-i -L -Pdml")
-ADD_FLEX_BISON_DEPENDENCY(dml_scan dml_gram)
+find_package(FLEX REQUIRED)
+flex_target(dml_scan dml.l ${CMAKE_CURRENT_BINARY_DIR}/dml-scan.cpp COMPILE_FLAGS "-i -L -Pdml")
+add_flex_bison_dependency(dml_scan dml_gram)

-set_source_files_properties(dml-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT")
+set_source_files_properties(
+    dml-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT"
+)
 set_source_files_properties(dml-gram.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable")
-########### next target ###############
+# ########## next target ###############

-include_directories(${CMAKE_CURRENT_BINARY_DIR})  # to pick up flex/bison output
-columnstore_library(dmlpackage 
+include_directories(${CMAKE_CURRENT_BINARY_DIR}) # to pick up flex/bison output
+columnstore_library(
+    dmlpackage
    dml-scan.cpp
    dml-gram.cpp
    calpontdmlfactory.cpp
@@ -38,4 +43,8 @@ columnstore_library(dmlpackage

 add_dependencies(dmlpackage loggingcpp)

-INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS dmlpackage
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/dbcon/dmlpackageproc/CMakeLists.txt
+++ b/dbcon/dmlpackageproc/CMakeLists.txt
@@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} )
+include_directories(${ENGINE_COMMON_INCLUDES})

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

 set(dmlpackageproc_LIB_SRCS
    deletepackageprocessor.cpp
@@ -10,7 +9,8 @@ set(dmlpackageproc_LIB_SRCS
    updatepackageprocessor.cpp
    commandpackageprocessor.cpp
    autoincrementdata.cpp
-    tablelockdata.cpp)
+    tablelockdata.cpp
+)

 columnstore_library(dmlpackageproc ${dmlpackageproc_LIB_SRCS})

@@ -18,4 +18,8 @@ add_dependencies(dmlpackageproc loggingcpp)

 target_link_libraries(dmlpackageproc ${NETSNMP_LIBRARIES})

-install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
+install(
+    TARGETS dmlpackageproc
+    DESTINATION ${ENGINE_LIBDIR}
+    COMPONENT columnstore-engine
+)
--- a/dbcon/execplan/CMakeLists.txt
+++ b/dbcon/execplan/CMakeLists.txt
@@ -1,7 +1,6 @@
-include_directories( ${ENGINE_COMMON_INCLUDES} ${ENGINE_UTILS_UDFSDK_INCLUDE} ${ENGINE_DATATYPES_INCLUDE})
+include_directories(${ENGINE_COMMON_INCLUDES} ${ENGINE_UTILS_UDFSDK_INCLUDE} ${ENGINE_DATATYPES_INCLUDE})

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

 set(execplan_LIB_SRCS
    calpontsystemcatalog.cpp
@@ -43,7 +42,8 @@ set(execplan_LIB_SRCS
    treenodeimpl.cpp
    vendorexecutionplan.cpp
    windowfunctioncolumn.cpp
-    udafcolumn.cpp)
+    udafcolumn.cpp
+)

 columnstore_library(execplan ${execplan_LIB_SRCS})

@@ -51,4 +51,8 @@ add_dependencies(execplan loggingcpp)

 target_link_libraries(execplan messageqcpp ${NETSNMP_LIBRARIES} ${MARIADB_STRING_LIBS} ${ENGINE_DT_LIB} pron)

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