database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop' of git://github.com/mariadb-corporation/mariadb-columnstore-engine into MCOL-97

Browse Source
This commit is contained in:
Andrew Hutchings
2016-09-22 18:50:59 -05:00
parent ef405480ab 3de43bcdd5
commit 3d91ac193c
93 changed files with 444 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writeengine/bulk/CMakeLists.txt
View File

@ -39,5 +39,5 @@ add_executable(cpimport.bin ${cpimport.bin_SRCS})
target_link_libraries(cpimport.bin ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} we_bulk we_xml)
install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR})
install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

34
writeengine/bulk/we_bulkloadbuffer.cpp
View File

@ -965,19 +965,8 @@ void BulkLoadBuffer::convert(char *field, int fieldLength,
bufStats.maxBufferVal = llDate;
}
else {
if(!column.fNotNull)
{
// @bug 3375: reset invalid date/time to NULL,
// and track as a saturated value.
llDate = joblist::DATETIMENULL;
bufStats.satCount++;
}
else
{
//Bug5383 - 4.0@1400-01-01 00:00:00 Below it is 0000-01-01 00:00:00
llDate = 0x578104000000000; //394082834458869760
bufStats.satCount++;
}
llDate = 0;
bufStats.satCount++;
}
pVal = &llDate;
@ -1262,23 +1251,8 @@ void BulkLoadBuffer::convert(char *field, int fieldLength,
bufStats.maxBufferVal = iDate;
}
else {
if (!column.fNotNull)
{
// @bug 3375: reset invalid date to NULL,
// and track as a saturated value.
iDate = joblist::DATENULL;
bufStats.satCount++;
}
else
{
// Bug5383 - 1400-01-01
// iDate = 0x5781068; // for versions below 4.0 it is 0x1068
// MariaDB bug 740
iDate = 0x578107E;
bufStats.satCount++;
}
iDate = 0;
bufStats.satCount++;
}
pVal = &iDate;

17
writeengine/bulk/we_tableinfo.cpp
View File

@ -924,24 +924,15 @@ void TableInfo::reportTotals(double elapsedTime)
fColumns[i].column.colName << "; Number of ";
if (fColumns[i].column.dataType == CalpontSystemCatalog::DATE)
{
//bug5383
if(!fColumns[i].column.fNotNull)
ossSatCnt <<
"invalid dates replaced with null: ";
else
ossSatCnt <<
"invalid dates replaced with minimum value : ";
ossSatCnt <<
"invalid dates replaced with zero value : ";
}
else if (fColumns[i].column.dataType ==
CalpontSystemCatalog::DATETIME)
{
//bug5383
if(!fColumns[i].column.fNotNull)
ossSatCnt <<
"invalid date/times replaced with null: ";
else
ossSatCnt <<
"invalid date/times replaced with minimum value : ";
ossSatCnt <<
"invalid date/times replaced with zero value : ";
}
else if (fColumns[i].column.dataType == CalpontSystemCatalog::CHAR)
ossSatCnt <<

2
writeengine/client/CMakeLists.txt
View File

@ -12,6 +12,6 @@ target_link_libraries(writeengineclient ${NETSNMP_LIBRARIES})
set_target_properties(writeengineclient PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR})
install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
writeengine/redistribute/CMakeLists.txt
View File

@ -15,5 +15,5 @@ target_link_libraries(writeengineredistribute ${NETSNMP_LIBRARIES})
set_target_properties(writeengineredistribute PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR})
install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
writeengine/server/CMakeLists.txt
View File

@ -20,5 +20,5 @@ add_executable(WriteEngineServer ${WriteEngineServer_SRCS})
target_link_libraries(WriteEngineServer ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool writeengineredistribute)
install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR})
install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
writeengine/splitter/CMakeLists.txt
View File

@ -19,5 +19,5 @@ add_executable(cpimport ${cpimport_SRCS})
target_link_libraries(cpimport ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} batchloader threadpool)
install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR})
install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

4
writeengine/splitter/we_sdhandler.cpp
View File

@ -1669,10 +1669,10 @@ void WESDHandler::onCleanupResult(int PmId, messageqcpp::SBS& Sbs) {
switch ((*aIt).fColType)
{
case CalpontSystemCatalog::DATE:
ossSatCnt << "invalid dates replaced with null: ";
ossSatCnt << "invalid dates replaced with zero value: ";
break;
case CalpontSystemCatalog::DATETIME:
ossSatCnt << "invalid date/times replaced with null: ";
ossSatCnt << "invalid date/times replaced with zero value: ";
break;
case CalpontSystemCatalog::CHAR:
ossSatCnt << "character strings truncated: ";

2
writeengine/wrapper/CMakeLists.txt
View File

@ -43,5 +43,5 @@ target_link_libraries(writeengine ${NETSNMP_LIBRARIES})
set_target_properties(writeengine PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR})
install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)