database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Fixes for shared_components_tests build, move test to tests directory.

Browse Source 
* Use const uint8_t* instead of uint64_t.
* Turn off 'testExtentCrWOPreallocBin' test body since this test
turned off after MCOL-641 when CalpontSystemCatalog::BINARY type was removed.
* Move shared_components_tests to tests directory.
This commit is contained in:
Denis Khalikov
2021-03-03 02:04:16 +03:00
parent e905e60a01
commit ef8915a884
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -333,11 +333,6 @@ ADD_SUBDIRECTORY(storage-manager)
ADD_SUBDIRECTORY(datatypes) ADD_SUBDIRECTORY(datatypes)
ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(tests)
# WriteEngine component tests
IF( WITH_SHARED_COMP_TESTS )
ADD_SUBDIRECTORY(writeengine/shared)
ENDIF( WITH_SHARED_COMP_TESTS )
find_package(Git QUIET) find_package(Git QUIET)
IF (GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git) IF (GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git)

7
tests/CMakeLists.txt
View File

@ -29,3 +29,10 @@ if (WITH_SORTING_COMPARATORS_UT)
target_link_libraries(comparators_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit) 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-engine) install(TARGETS comparators_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
endif() endif()
if (WITH_SHARED_COMP_TESTS)
add_executable(we_shared_components_tests shared_components_tests.cpp)
add_dependencies(we_shared_components_tests loggingcpp)
target_link_libraries(we_shared_components_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} cppunit)
install(TARGETS we_shared_components_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
endif()

7
writeengine/shared/shared_components_tests.cpp → tests/shared_components_tests.cpp
View File

@ -396,7 +396,7 @@ public:
int width = blockOp.getCorrectRowWidth( execplan::CalpontSystemCatalog::BIGINT, 8 ); int width = blockOp.getCorrectRowWidth( execplan::CalpontSystemCatalog::BIGINT, 8 );
int nBlocks = INITIAL_EXTENT_ROWS_TO_DISK / BYTE_PER_BLOCK * width; int nBlocks = INITIAL_EXTENT_ROWS_TO_DISK / BYTE_PER_BLOCK * width;
uint64_t emptyVal = blockOp.getEmptyRowValue( execplan::CalpontSystemCatalog::BIGINT, 8 ); const uint8_t* emptyVal = blockOp.getEmptyRowValue( execplan::CalpontSystemCatalog::BIGINT, 8 );
// createFile runs IDBDataFile::open + initAbrevCompColumnExtent // createFile runs IDBDataFile::open + initAbrevCompColumnExtent
// under the hood // under the hood
// bigint column file // bigint column file
@ -979,7 +979,7 @@ public:
int width = blockOp.getCorrectRowWidth( execplan::CalpontSystemCatalog::BIGINT, 8 ); int width = blockOp.getCorrectRowWidth( execplan::CalpontSystemCatalog::BIGINT, 8 );
int nBlocks = INITIAL_EXTENT_ROWS_TO_DISK / BYTE_PER_BLOCK * width; int nBlocks = INITIAL_EXTENT_ROWS_TO_DISK / BYTE_PER_BLOCK * width;
uint64_t emptyVal = blockOp.getEmptyRowValue( execplan::CalpontSystemCatalog::BIGINT, 8 ); const uint8_t* emptyVal = blockOp.getEmptyRowValue( execplan::CalpontSystemCatalog::BIGINT, 8 );
// createFile runs IDBDataFile::open + initAbrevCompColumnExtent // createFile runs IDBDataFile::open + initAbrevCompColumnExtent
// under the hood // under the hood
// bigint column file // bigint column file
@ -1542,7 +1542,7 @@ public:
} }
} }
*/
template<uint8_t W> struct binary; template<uint8_t W> struct binary;
typedef binary<16> binary16; typedef binary<16> binary16;
typedef binary<32> binary32; typedef binary<32> binary32;
@ -1715,6 +1715,7 @@ public:
CPPUNIT_ASSERT(fileOp.exists(fileName) == false); CPPUNIT_ASSERT(fileOp.exists(fileName) == false);
cout << endl << "End of test"; cout << endl << "End of test";
} }
*/
void testCleanup() void testCleanup()
{ {

10
writeengine/shared/CMakeLists.txt
View File

@ -1,14 +1,4 @@
include_directories(${ENGINE_COMMON_INCLUDES} ../dictionary)
add_executable(we_shared_components_tests ./shared_components_tests.cpp)
add_dependencies(we_shared_components_tests loggingcpp)
target_link_libraries(we_shared_components_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES})
install(TARGETS we_shared_components_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
########### install files ############### ########### install files ###############
install(FILES we_index.h we_define.h we_type.h we_fileop.h we_blockop.h we_dbfileop.h we_obj.h we_log.h we_simplesyslog.h we_convertor.h we_brm.h we_macro.h we_config.h we_cache.h we_stats.h we_bulkrollbackmgr.h we_typeext.h we_chunkmanager.h we_bulkrollbackfilecompressed.h we_bulkrollbackfilecompressedhdfs.h we_bulkrollbackfile.h we_rbmetawriter.h we_dbrootextenttracker.h we_confirmhdfsdbfile.h DESTINATION include) install(FILES we_index.h we_define.h we_type.h we_fileop.h we_blockop.h we_dbfileop.h we_obj.h we_log.h we_simplesyslog.h we_convertor.h we_brm.h we_macro.h we_config.h we_cache.h we_stats.h we_bulkrollbackmgr.h we_typeext.h we_chunkmanager.h we_bulkrollbackfilecompressed.h we_bulkrollbackfilecompressedhdfs.h we_bulkrollbackfile.h we_rbmetawriter.h we_dbrootextenttracker.h we_confirmhdfsdbfile.h DESTINATION include)