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

MCOL-129 INSERT/UPDATE strict mode support

Browse Source 
This changes the warning for truncation to the correct MariaDB error
code (1264).

In addition it passes the strict mode up into the DML class to roll back
correctly.

It also sets the abort_on_warning flag for updates as this isn't set on
the rnd_init phase but is needed for strict mode to work.
This commit is contained in:
Andrew Hutchings
2016-11-04 14:06:00 +00:00
parent 059a158837
commit 4fc7fa12cd
5 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/dmlpackage/calpontdmlpackage.cpp
View File

@ -40,7 +40,7 @@ namespace dmlpackage
std::string dmlStatement, int sessionID )
:fSchemaName(schemaName), fTableName( tableName ), fDMLStatement( dmlStatement ),
fSessionID(sessionID), fPlan(new messageqcpp::ByteStream()), fTable(0), fHasFilter(false), fLogging(true), fIsInsertSelect(false),
fIsBatchInsert(false), fIsAutocommitOn(false), fTableOid(0)
fIsBatchInsert(false), fIsAutocommitOn(false), fIsWarnToError(false), fTableOid(0)
{
}

5
dbcon/dmlpackage/calpontdmlpackage.h
View File

@ -226,6 +226,10 @@ namespace dmlpackage
bool get_isAutocommitOn() { return fIsAutocommitOn; }
void set_isAutocommitOn( const bool isAutocommitOn ) { fIsAutocommitOn = isAutocommitOn; }
bool get_isWarnToError() { return fIsWarnToError; }
void set_isWarnToError( const bool isWarnToError ) { fIsWarnToError = isWarnToError; }
uint32_t getTableOid() { return fTableOid; }
void setTableOid( const uint32_t tableOid ) { fTableOid = tableOid; }
@ -254,6 +258,7 @@ namespace dmlpackage
bool fIsInsertSelect;
bool fIsBatchInsert;
bool fIsAutocommitOn;
bool fIsWarnToError;
uint32_t fTableOid;
WriteEngine::ChunkManager* fCM;
};

12
dbcon/mysql/ha_calpont_dml.cpp
View File

@ -370,6 +370,11 @@ int doProcessInsertValues ( TABLE* table, uint32_t size, cal_connection_info& ci
{
pDMLPackage->set_isBatchInsert( true );
}
if (thd->is_strict_mode())
{
pDMLPackage->set_isWarnToError( true );
}
pDMLPackage->setTableOid (ci.tableOid);
if (lastBatch)
{
@ -514,8 +519,11 @@ int doProcessInsertValues ( TABLE* table, uint32_t size, cal_connection_info& ci
}
if ( b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING )
{
rc = 0;
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errormsg.c_str());
if (!thd->is_strict_mode())
{
rc = 0;
}
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, errormsg.c_str());
}
if ( rc != 0 )

24
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -1603,6 +1603,8 @@ uint32_t doUpdateDelete(THD *thd)
command = "COMMIT";
else if ((useHdfs) && (b != 0))
command = "ROLLBACK";
else if ((b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING) && thd->is_strict_mode())
command = "ROLLBACK";
else if ((!(current_thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) && (( b == 0 ) || (b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING)) )
command = "COMMIT";
else if (( b != 0 ) && (b != dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING) )
@ -1666,7 +1668,22 @@ uint32_t doUpdateDelete(THD *thd)
thd->get_stmt_da()->set_overwrite_status(true);
//cout << " error status " << ci->rc << endl;
}
else
if (b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING)
{
if (thd->is_strict_mode())
{
thd->set_row_count_func(0);
ci->rc = b;
// Turn this on as MariaDB doesn't do it until the next phase
thd->abort_on_warning= thd->is_strict_mode();
}
else
{
thd->set_row_count_func(dmlRowCount);
}
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, errorMsg.c_str());
}
else
{
// if (dmlRowCount != 0) //Bug 5117. Handling self join.
thd->set_row_count_func(dmlRowCount);
@ -1674,11 +1691,6 @@ uint32_t doUpdateDelete(THD *thd)
//cout << " error status " << ci->rc << " and rowcount = " << dmlRowCount << endl;
}
if ( b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING )
{
//string errmsg ("Out of range value detected. Please check Calpont Syntax Guide for supported data range." );
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errorMsg.c_str());
}
// @bug 4027. comment out the following because this will cause mysql
// kernel assertion failure. not sure why this is here in the first place.

16
writeengine/server/we_dmlcommandproc.cpp
View File

@ -654,6 +654,14 @@ uint8_t WE_DMLCommandProc::processSingleInsert(messageqcpp::ByteStream& bs, std:
}
args.add(cols);
err = IDBErrorInfo::instance()->errorMsg(WARN_DATA_TRUNC,args);
// Strict mode enabled, so rollback on warning
if (insertPkg.get_isWarnToError())
{
string applName ("SingleInsert");
fWEWrapper.bulkRollback(tblOid,txnid.id,tableName.toString(),
applName, false, err);
BulkRollbackMgr::deleteMetaFile( tblOid );
}
}
return rc;
@ -1244,6 +1252,14 @@ End-Disable use of MetaFile for bulk rollback support
args.add(cols);
err = IDBErrorInfo::instance()->errorMsg(WARN_DATA_TRUNC,args);
// Strict mode enabled, so rollback on warning
if (insertPkg.get_isWarnToError())
{
string applName ("BatchInsert");
fWEWrapper.bulkRollback(tblOid,txnid.id,tableName.toString(),
applName, false, err);
BulkRollbackMgr::deleteMetaFile( tblOid );
}
}
//cout << "Batch insert return code " << rc << endl;
return rc;