database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

Merge pull request #991 from mariadb-corporation/MENT-513

Browse Source 
fixes for MENT-513
This commit is contained in:
Andrew Hutchings
2019-12-20 07:40:49 +02:00
committed by GitHub
parent edc889c9e5 96adf535ae
commit bf944c4ce4
44 changed files with 256 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/mysql/ha_mcs_ddl.cpp
View File

@@ -96,8 +96,8 @@ namespace
{
typedef CalpontSelectExecutionPlan::ColumnMap::value_type CMVT_;
ResourceManager* rm = ResourceManager::instance();
bool useHdfs = rm->useHdfs();
// HDFS is never used nowadays, so don't bother
bool useHdfs = false; // ResourceManager::instance()->useHdfs();
#include "ha_autoi.cpp"

9
dbcon/mysql/ha_mcs_dml.cpp
View File

@@ -77,9 +77,9 @@ using namespace joblist;
namespace
{
ResourceManager* rm = ResourceManager::instance();
uint64_t fBatchInsertGroupRows = rm->getRowsPerBatch();
bool useHdfs = rm->useHdfs();
uint64_t fBatchInsertGroupRows = 0; // ResourceManager::instance()->getRowsPerBatch();
// HDFS is never used nowadays, so don't bother
bool useHdfs = false; // ResourceManager::instance()->useHdfs();
//convenience fcn
inline uint32_t tid2sid(const uint32_t tid)
@@ -595,6 +595,9 @@ int ha_mcs_impl_write_row_(const uchar* buf, TABLE* table, cal_connection_info&
return rc;
}
if (fBatchInsertGroupRows == 0)
fBatchInsertGroupRows = ResourceManager::instance()->getRowsPerBatch();
//timer.stop( "buildValueList");
if ( ci.singleInsert // Single insert
|| (( ci.bulkInsertRows > 0 ) && (( ( ci.rowsHaveInserted + size) >= ci.bulkInsertRows ) || ( size >= fBatchInsertGroupRows )) )

4
dbcon/mysql/ha_mcs_impl.cpp
View File

@@ -162,8 +162,8 @@ static const string interval_names[] =
const unsigned NONSUPPORTED_ERR_THRESH = 2000;
ResourceManager* rm = ResourceManager::instance();
bool useHdfs = rm->useHdfs();
// HDFS is never used nowadays, so don't bother
bool useHdfs = false; // ResourceManager::instance()->useHdfs();
//convenience fcn
inline uint32_t tid2sid(const uint32_t tid)

1
dbcon/mysql/idb_mysql.h
View File

@@ -99,6 +99,7 @@ template <class T> bool isnan(T);
#undef PACKAGE_BUGREPORT
#undef DEBUG
#undef set_bits
#undef likely
namespace
{