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

Fix arrow linkage on external project

Browse Source
This commit is contained in:
Leonid Fedorov
2023-10-03 15:37:35 +00:00
committed by Leonid Fedorov
parent fe597ec78c
commit 6b8c3dd918
9 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/mariadb-plugin-columnstore.install vendored
View File

@ -34,6 +34,8 @@ usr/bin/mariadb-columnstore-start.sh
usr/bin/mariadb-columnstore-stop.sh
usr/bin/mcs-savebrm.py
usr/bin/mcs-loadbrm.py
usr/bin/mcs_parquet_ddl
usr/bin/mcs_parquet_gen
usr/bin/mcs-stop-controllernode.sh
usr/bin/mcsGetConfig
usr/bin/mcsSetConfig

10
mysql-test/columnstore/basic/r/mcol-5505-parquet-ddl.result
View File

@ -15,9 +15,9 @@ parquet_test_table CREATE TABLE `parquet_test_table` (
`col9` varchar(2000) DEFAULT NULL,
`col10` varchar(2000) DEFAULT NULL,
`col11` varchar(2000) DEFAULT NULL,
`col12` timestamp(3) NULL DEFAULT NULL,
`col12` timestamp(3) NOT NULL DEFAULT current_timestamp(3) ON UPDATE current_timestamp(3),
`col13` date DEFAULT NULL,
`col14` timestamp(3) NULL DEFAULT NULL,
`col14` timestamp(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000',
`col15` smallint(6) DEFAULT NULL,
`col16` tinyint(4) DEFAULT NULL,
`col17` decimal(9,3) DEFAULT NULL,
@ -28,9 +28,9 @@ parquet_test_table CREATE TABLE `parquet_test_table` (
`col22` tinyint(1) DEFAULT NULL,
`col23` decimal(38,10) DEFAULT NULL,
`col24` time(6) DEFAULT NULL,
`col25` timestamp(6) NULL DEFAULT NULL,
`col26` timestamp(6) NULL DEFAULT NULL,
`col25` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
`col26` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
`col27` varbinary(8000) DEFAULT NULL,
`col28` char(4) DEFAULT NULL
) ENGINE=Columnstore DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
) ENGINE=Columnstore DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
DROP DATABASE mcol_5505_parquet_ddl;

2
tools/parquetDDL/CMakeLists.txt
View File

@ -2,5 +2,5 @@ include_directories(${ENGINE_COMMON_INCLUDES})
set(parquetDDL_SRCS main.cpp)
add_executable(mcs_parquet_ddl ${parquetDDL_SRCS})
target_link_libraries(mcs_parquet_ddl arrow parquet)
target_link_libraries(mcs_parquet_ddl parquet)
install(TARGETS mcs_parquet_ddl DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/parquetGen/CMakeLists.txt
View File

@ -2,5 +2,5 @@ include_directories(${ENGINE_COMMON_INCLUDES})
set(parquetGen_SRCS main.cpp)
add_executable(mcs_parquet_gen ${parquetGen_SRCS})
target_link_libraries(mcs_parquet_gen boost_system boost_filesystem arrow parquet)
target_link_libraries(mcs_parquet_gen boost_system boost_filesystem parquet)
install(TARGETS mcs_parquet_gen DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

4
tools/parquetGen/main.cpp
View File

@ -39,7 +39,7 @@ void generateIntTable(std::string fileDir)
for (int32_t i = 0; i < reserve_num-1; i++)
values.push_back(i);
values.push_back(2147483648);
values.push_back(static_cast<int32_t>(2147483648));
PARQUET_THROW_NOT_OK(builder.AppendValues(values, validity));
std::shared_ptr<arrow::Array> array;
PARQUET_THROW_NOT_OK(builder.Finish(&array));
@ -681,7 +681,7 @@ void generateAllTable(std::string fileDir)
std::vector<int32_t> int32Values;
for (int32_t i = 0; i < reserve_num-1; i++)
int32Values.push_back(i);
int32Values.push_back(2147483648);
int32Values.push_back(static_cast<int32_t>(2147483648));
PARQUET_THROW_NOT_OK(int32Builder.AppendValues(int32Values, int32Validity));
std::shared_ptr<arrow::Array> int32Array;
PARQUET_THROW_NOT_OK(int32Builder.Finish(&int32Array));

6
writeengine/bulk/CMakeLists.txt
View File

@ -30,7 +30,7 @@ add_library(we_bulk STATIC ${we_bulk_STAT_SRCS})
add_dependencies(we_bulk loggingcpp)
target_link_libraries(we_bulk ${NETSNMP_LIBRARIES})
target_link_libraries(we_bulk ${NETSNMP_LIBRARIES} parquet)
REMOVE_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
@ -42,9 +42,5 @@ add_executable(cpimport.bin ${cpimport.bin_SRCS})
add_dependencies(cpimport.bin marias3)
target_link_libraries(cpimport.bin ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} ${S3API_DEPS} we_bulk we_xml)
FIND_PACKAGE(Arrow)
FIND_PACKAGE(Parquet)
target_link_libraries(cpimport.bin arrow)
target_link_libraries(cpimport.bin parquet)
install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

3
writeengine/dictionary/we_dctnry.cpp
View File

@ -49,6 +49,9 @@ using namespace BRM;
#include "IDBDataFile.h"
#include "IDBPolicy.h"
#include "cacheutils.h"
#include <arrow/api.h>
using namespace idbdatafile;
#include "checks.h"
#include "utils_utf8.h" // for utf8_truncate_point()

8
writeengine/dictionary/we_dctnry.h
View File

@ -37,10 +37,16 @@
#include "bytestream.h"
#include "nullstring.h"
#include <arrow/api.h>
#define EXPORT
namespace arrow
{
class Array;
}
/** Namespace WriteEngine */
namespace WriteEngine
{

2
writeengine/wrapper/CMakeLists.txt
View File

@ -41,6 +41,6 @@ add_library(writeengine SHARED ${writeengine_LIB_SRCS})
add_dependencies(writeengine loggingcpp)
target_link_libraries(writeengine ${NETSNMP_LIBRARIES})
target_link_libraries(writeengine ${NETSNMP_LIBRARIES} arrow)
install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)