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

fix(writeengine) MCOL-4202: use schema name when renaming table and change it's fields in syscat

Browse Source
This commit is contained in:
Leonid Fedorov
2023-12-06 21:05:51 +00:00
committed by Leonid Fedorov
parent a9ab71e675
commit 97abd9866b
12 changed files with 214 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/bootstrap_mcs.sh
View File

@ -4,6 +4,7 @@
# - the server's source code is two directories above the MCS engine source. # - the server's source code is two directories above the MCS engine source.
# - the script is to be run under root. # - the script is to be run under root.
set -o pipefail
SCRIPT_LOCATION=$(dirname "$0") SCRIPT_LOCATION=$(dirname "$0")
MDB_SOURCE_PATH=$(realpath $SCRIPT_LOCATION/../../../..) MDB_SOURCE_PATH=$(realpath $SCRIPT_LOCATION/../../../..)
@ -44,7 +45,7 @@ optparse.define short=G long=draw-deps desc="Draw dependencies graph" variable=D
optparse.define short=M long=skip-smoke desc="Skip final smoke test" variable=SKIP_SMOKE default=false value=true optparse.define short=M long=skip-smoke desc="Skip final smoke test" variable=SKIP_SMOKE default=false value=true
optparse.define short=n long=no-clean-install desc="Do not perform a clean install (keep existing db files)" variable=NO_CLEAN default=false value=true optparse.define short=n long=no-clean-install desc="Do not perform a clean install (keep existing db files)" variable=NO_CLEAN default=false value=true
optparse.define short=j long=parallel desc="Number of paralles for build" variable=CPUS default=$(getconf _NPROCESSORS_ONLN) optparse.define short=j long=parallel desc="Number of paralles for build" variable=CPUS default=$(getconf _NPROCESSORS_ONLN)
optparse.define short=F long=show-build-flags desc="Print CMake flags, while build" variable=PRINT_CMAKE_FLAGS default=false optparse.define short=F long=show-build-flags desc="Print CMake flags, while build" variable=PRINT_CMAKE_FLAGS default=false value=true
optparse.define short=c long=cloud desc="Enable cloud storage" variable=CLOUD_STORAGE_ENABLED default=false value=true optparse.define short=c long=cloud desc="Enable cloud storage" variable=CLOUD_STORAGE_ENABLED default=false value=true
optparse.define short=f long=do-not-freeze-revision desc="Disable revision freezing, or do not set 'update none' for columnstore submodule in MDB repository" variable=DO_NOT_FREEZE_REVISION default=false value=true optparse.define short=f long=do-not-freeze-revision desc="Disable revision freezing, or do not set 'update none' for columnstore submodule in MDB repository" variable=DO_NOT_FREEZE_REVISION default=false value=true
@ -69,6 +70,8 @@ if [[ $OS = 'Ubuntu' || $OS = 'Debian' ]]; then
CONFIG_DIR="/etc/mysql/mariadb.conf.d" CONFIG_DIR="/etc/mysql/mariadb.conf.d"
fi fi
export CLICOLOR_FORCE=1
disable_git_restore_frozen_revision() disable_git_restore_frozen_revision()
{ {
@ -323,7 +326,8 @@ build()
message "Configuring cmake silently" message "Configuring cmake silently"
${CMAKE_BIN_NAME} -DCMAKE_BUILD_TYPE=$MCS_BUILD_TYPE $MDB_CMAKE_FLAGS . | spinner ${CMAKE_BIN_NAME} -DCMAKE_BUILD_TYPE=$MCS_BUILD_TYPE $MDB_CMAKE_FLAGS . | spinner
message_split message_split
${CMAKE_BIN_NAME} --build . -j $CPUS && \
${CMAKE_BIN_NAME} --build . -j $CPUS | onelinearizator && \
message "Installing silently" && message "Installing silently" &&
${CMAKE_BIN_NAME} --install . | spinner 30 ${CMAKE_BIN_NAME} --install . | spinner 30

7
build/utils.sh
View File

@ -97,6 +97,13 @@ function spinner
echo echo
} }
function onelinearizator
{
while read data; do
echo -ne "\r\033[K$data"
done;
echo
}
detect_distro() detect_distro()
{ {

4
dbcon/ddlpackageproc/altertableprocessor.cpp
View File

@ -1899,7 +1899,7 @@ void AlterTableProcessor::renameTable(uint32_t sessionID, execplan::CalpontSyste
boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr = boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID); CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
execplan::CalpontSystemCatalog::TableName tableName; execplan::CalpontSystemCatalog::TableName tableName;
tableName.schema = fTableName.fSchema; tableName.schema = ataRenameTable.fQualifiedName->fSchema;
tableName.table = ataRenameTable.fQualifiedName->fName; tableName.table = ataRenameTable.fQualifiedName->fName;
execplan::CalpontSystemCatalog::ROPair roPair; execplan::CalpontSystemCatalog::ROPair roPair;
roPair.objnum = 0; roPair.objnum = 0;
@ -1924,6 +1924,7 @@ void AlterTableProcessor::renameTable(uint32_t sessionID, execplan::CalpontSyste
bytestream << fTableName.fSchema; bytestream << fTableName.fSchema;
bytestream << fTableName.fName; bytestream << fTableName.fName;
bytestream << ataRenameTable.fQualifiedName->fName; bytestream << ataRenameTable.fQualifiedName->fName;
bytestream << ataRenameTable.fQualifiedName->fSchema;
std::string errorMsg; std::string errorMsg;
uint16_t dbRoot; uint16_t dbRoot;
@ -1997,6 +1998,7 @@ void AlterTableProcessor::renameTable(uint32_t sessionID, execplan::CalpontSyste
bytestream << fTableName.fSchema; bytestream << fTableName.fSchema;
bytestream << fTableName.fName; bytestream << fTableName.fName;
bytestream << ataRenameTable.fQualifiedName->fName; bytestream << ataRenameTable.fQualifiedName->fName;
bytestream << ataRenameTable.fQualifiedName->fSchema;
sysOid = 1021; sysOid = 1021;
// Find out where syscolumn is // Find out where syscolumn is
rc = fDbrm->getSysCatDBRoot(sysOid, dbRoot); rc = fDbrm->getSysCatDBRoot(sysOid, dbRoot);

142
dbcon/ddlpackageproc/ddlpackageprocessor.cpp
View File

@ -1127,148 +1127,6 @@ void DDLPackageProcessor::createWriteTruncateTableLogFile(
throw std::runtime_error(errorMsg); throw std::runtime_error(errorMsg);
} }
#if 0
void DDLPackageProcessor::createOpenTruncateTableLogFile(execplan::CalpontSystemCatalog::OID tableOid, execplan::CalpontSystemCatalog::TableName tableName)
{
SUMMARY_INFO("DDLPackageProcessor::createOpenTruncateTableLogFile");
//Build file name with tableOid. Currently, table oid is not returned and therefore not reused
string prefix, error;
config::Config* config = config::Config::makeConfig();
prefix = config->getConfig("SystemConfig", "DBRMRoot");
if (prefix.length() == 0)
{
error = "Need a valid DBRMRoot entry in Calpont configuation file";
throw std::runtime_error(error);
}
uint64_t pos = prefix.find_last_of ("/") ;
if (pos != string::npos)
{
fDDLLogFileName = prefix.substr(0, pos + 1); //Get the file path
}
else
{
error = "Cannot find the dbrm directory for the DDL log file";
throw std::runtime_error(error);
}
std::ostringstream oss;
oss << tableOid;
fDDLLogFileName += "DDL_TRUNCATETABLE_Log_" + oss.str();
fDDLLogFile.open(fDDLLogFileName.c_str(), ios::out);
if (!fDDLLogFile)
{
error = "DDL truncate table log file cannot be created";
throw std::runtime_error(error);
}
}
void DDLPackageProcessor::removeIndexFiles(execplan::CalpontSystemCatalog::SCN txnID,
DDLResult& result,
execplan::CalpontSystemCatalog::IndexOIDList& idxOIDList)
{
/* SUMMARY_INFO("DDLPackageProcessor::removeIndexFiles");
if (result.result != NO_ERROR)
return;
int err = 0;
CalpontSystemCatalog::IndexOID idxOID;
CalpontSystemCatalog::IndexOIDList::const_iterator iter = idxOIDList.begin();
std::string error;
try
{
while(iter != idxOIDList.end())
{
idxOID = *iter;
if (idxOID.objnum < 3000 || idxOID.listOID < 3000)
{
++iter;
continue;
}
err = -1;
if (err)
{
WErrorCodes ec;
error = "WE: Error removing index files: " + getFileName(idxOID.objnum) + ", " + getFileName(idxOID.listOID) + ". error = " + ec.errorString(err);
throw std::runtime_error(error);
}
++iter;
}
}
catch (std::exception& ex)
{
error = ex.what();
throw std::runtime_error(error);
}
catch (...)
{
error = "Unknown exception caught";
throw std::runtime_error(error);
}
*/
}
void DDLPackageProcessor::updateSyscolumns(execplan::CalpontSystemCatalog::SCN txnID,
DDLResult& result, WriteEngine::RIDList& ridList,
WriteEngine::ColValueList& colValuesList,
WriteEngine::ColValueList& colOldValuesList)
{
SUMMARY_INFO("DDLPackageProcessor::updateSyscolumns");
if (result.result != NO_ERROR)
return;
WriteEngine::ColStructList colStructs;
WriteEngine::CSCTypesList cscColTypeList;
//std::vector<ColStruct> colStructs;
WriteEngine::ColStruct colStruct;
execplan::CalpontSystemCatalog::ColType colType;
WriteEngine::DctnryStructList dctnryStructList;
WriteEngine::DctnryValueList dctnryValueList;
//Build column structure for COLUMNPOS_COL
colType.columnOID = colStruct.dataOid = OID_SYSCOLUMN_COLUMNPOS;
colType.colWidth = colStruct.colWidth = 4;
colStruct.tokenFlag = false;
colType.colDataType = colStruct.colDataType = CalpontSystemCatalog::INT;
colStructs.push_back(colStruct);
cscColTypeList.push_back(colType);
int error;
std::string err;
std::vector<void*> colOldValuesList1;
try
{
//@Bug 3051 use updateColumnRecs instead of updateColumnRec to use different value for diffrent rows.
if (NO_ERROR != (error = fWriteEngine.updateColumnRecs( txnID, cscColTypeList, colStructs, colValuesList, ridList )))
{
// build the logging message
WErrorCodes ec;
err = "WE: Failed on update SYSCOLUMN table. " + ec.errorString(error);
throw std::runtime_error(err);
}
}
catch (std::exception& ex)
{
err = ex.what();
throw std::runtime_error(err);
}
catch (...)
{
err = "updateSyscolumns:Unknown exception caught";
throw std::runtime_error(err);
}
}
#endif
void DDLPackageProcessor::returnOIDs(execplan::CalpontSystemCatalog::RIDList& ridList, void DDLPackageProcessor::returnOIDs(execplan::CalpontSystemCatalog::RIDList& ridList,
execplan::CalpontSystemCatalog::DictOIDList& dictOIDList) execplan::CalpontSystemCatalog::DictOIDList& dictOIDList)
{ {

24
mysql-test/columnstore/basic/r/mcol4202-crossdb-rename.result Normal file
View File

@ -0,0 +1,24 @@
DROP DATABASE IF EXISTS mcol4202_db1;
DROP DATABASE IF EXISTS mcol4202_db2;
CREATE DATABASE mcol4202_db1;
CREATE DATABASE mcol4202_db2;
CREATE TABLE mcol4202_db1.t1 (id INT) ENGINE=Columnstore;
INSERT INTO mcol4202_db1.t1 values (111);
RENAME TABLE mcol4202_db1.t1 TO mcol4202_db2.t1;
SELECT * FROM mcol4202_db2.t1;
id
111
USE mcol4202_db2;
INSERT INTO t1 values (222);
SELECT * FROM t1;
id
111
222
RENAME TABLE mcol4202_db2.t1 to mcol4202_db1.t33333;
USE mcol4202_db1;
SELECT * from t33333;
id
111
222
DROP DATABASE mcol4202_db1;
DROP DATABASE mcol4202_db2;

3
mysql-test/columnstore/basic/r/mcs12_alter_table.result
View File

@ -69,8 +69,7 @@ a c1
3 c 3 c
4 d 4 d
ALTER TABLE mcs12_db1.t1 RENAME TO mcs12_db2.t1; ALTER TABLE mcs12_db1.t1 RENAME TO mcs12_db2.t1;
ERROR HY000: Internal error: CAL0001: Alter table Failed: The new tablename is already in use. DROP TABLE mcs12_db2.t1;
DROP TABLE t1;
CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore; CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore;
ALTER TABLE t1 ADD COLUMN (c CHAR(10)); ALTER TABLE t1 ADD COLUMN (c CHAR(10));
INSERT INTO t1 VALUES (1, 'a'),(2, 'b'); INSERT INTO t1 VALUES (1, 'a'),(2, 'b');

27
mysql-test/columnstore/basic/t/mcol4202-crossdb-rename.test Normal file
View File

@ -0,0 +1,27 @@
#
# Test ALTER TABLE schemas in various possible ways.
#
-- source ../include/have_columnstore.inc
-- source include/have_innodb.inc
--disable_warnings
DROP DATABASE IF EXISTS mcol4202_db1;
DROP DATABASE IF EXISTS mcol4202_db2;
--enable_warnings
CREATE DATABASE mcol4202_db1;
CREATE DATABASE mcol4202_db2;
CREATE TABLE mcol4202_db1.t1 (id INT) ENGINE=Columnstore;
INSERT INTO mcol4202_db1.t1 values (111);
RENAME TABLE mcol4202_db1.t1 TO mcol4202_db2.t1;
SELECT * FROM mcol4202_db2.t1;
USE mcol4202_db2;
INSERT INTO t1 values (222);
SELECT * FROM t1;
RENAME TABLE mcol4202_db2.t1 to mcol4202_db1.t33333;
USE mcol4202_db1;
SELECT * from t33333;
DROP DATABASE mcol4202_db1;
DROP DATABASE mcol4202_db2;

4
mysql-test/columnstore/basic/t/mcs12_alter_table.test
View File

@ -37,12 +37,10 @@ ALTER TABLE t2 RENAME TO mcs12_db1.t1;
--replace_regex /( COLLATE=latin1_swedish_ci)// --replace_regex /( COLLATE=latin1_swedish_ci)//
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
SELECT * FROM t1; SELECT * FROM t1;
# Cross db rename errors in CS but not in innodb. Need to check.
--error 1815
ALTER TABLE mcs12_db1.t1 RENAME TO mcs12_db2.t1; ALTER TABLE mcs12_db1.t1 RENAME TO mcs12_db2.t1;
# Add column # Add column
DROP TABLE t1; DROP TABLE mcs12_db2.t1;
CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore; CREATE TABLE t1 (i INTEGER) ENGINE=Columnstore;
ALTER TABLE t1 ADD COLUMN (c CHAR(10)); ALTER TABLE t1 ADD COLUMN (c CHAR(10));
INSERT INTO t1 VALUES (1, 'a'),(2, 'b'); INSERT INTO t1 VALUES (1, 'a'),(2, 'b');

557
writeengine/server/we_ddlcommandproc.cpp
View File

@ -36,7 +36,7 @@ using namespace ddlpackage;
#include <ctime> #include <ctime>
#include "dataconvert.h" #include "dataconvert.h"
using namespace dataconvert; using namespace dataconvert;
//#include "we_brm.h" // #include "we_brm.h"
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
#include "cacheutils.h" #include "cacheutils.h"
#include "IDBDataFile.h" #include "IDBDataFile.h"
@ -2366,23 +2366,14 @@ uint8_t WE_DDLCommandProc::updateSyscolumnNextvalCol(ByteStream& bs, std::string
return rc; return rc;
} }
uint8_t WE_DDLCommandProc::updateSyscolumnTablename(ByteStream& bs, std::string& err) uint8_t WE_DDLCommandProc::updateSystableEntryForSysColumn(int32_t sessionID, uint32_t txnID,
const DDLColumn& column, const std::string& value,
const std::string& oldValue,
execplan::CalpontSystemCatalog::RIDList& roList,
std::string& err)
{ {
int rc = 0; int rc = 0;
uint32_t sessionID, tmp32;
std::string schema, oldTablename, newTablename;
int txnID;
bs >> sessionID;
bs >> tmp32;
txnID = tmp32;
bs >> schema;
bs >> oldTablename;
bs >> newTablename;
CalpontSystemCatalog::TableName tableName;
tableName.schema = schema;
tableName.table = oldTablename;
WriteEngine::DctnryStructList dctnryStructList; WriteEngine::DctnryStructList dctnryStructList;
WriteEngine::DctnryValueList dctnryValueList; WriteEngine::DctnryValueList dctnryValueList;
WriteEngine::DctColTupleList dctRowList; WriteEngine::DctColTupleList dctRowList;
@ -2395,33 +2386,13 @@ uint8_t WE_DDLCommandProc::updateSyscolumnTablename(ByteStream& bs, std::string&
uint16_t segment; uint16_t segment;
uint32_t partition; uint32_t partition;
CalpontSystemCatalog::RIDList roList;
boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
systemCatalogPtr->identity(CalpontSystemCatalog::EC);
try
{
roList = systemCatalogPtr->columnRIDs(tableName);
}
catch (std::exception& ex)
{
err = ex.what();
rc = 1;
return rc;
}
// Build colStructs for SYSTABLE
std::vector<WriteEngine::RID> ridList; std::vector<WriteEngine::RID> ridList;
WriteEngine::ColValueList colValuesList; WriteEngine::ColValueList colValuesList;
WriteEngine::ColTupleList aColList; WriteEngine::ColTupleList aColList;
WriteEngine::ColStructList colStructs; WriteEngine::ColStructList colStructs;
WriteEngine::CSCTypesList cscColTypeList; WriteEngine::CSCTypesList cscColTypeList;
std::vector<void*> colOldValuesList; std::vector<void*> colOldValuesList;
tableName.schema = CALPONT_SCHEMA;
tableName.table = SYSCOLUMN_TABLE;
DDLColumn column;
findColumnData(sessionID, tableName, TABLENAME_COL, column);
WriteEngine::ColStruct colStruct; WriteEngine::ColStruct colStruct;
WriteEngine::DctnryStruct dctnryStruct; WriteEngine::DctnryStruct dctnryStruct;
WriteEngine::DctnryTuple dictTuple; WriteEngine::DctnryTuple dictTuple;
@ -2491,8 +2462,8 @@ uint8_t WE_DDLCommandProc::updateSyscolumnTablename(ByteStream& bs, std::string&
// It's the same string for each column, so we just need one dictionary struct // It's the same string for each column, so we just need one dictionary struct
void* dictTuplePtr = static_cast<void*>(&dictTuple); void* dictTuplePtr = static_cast<void*>(&dictTuple);
memset(dictTuplePtr, 0, sizeof(dictTuple)); memset(dictTuplePtr, 0, sizeof(dictTuple));
dictTuple.sigValue = (unsigned char*)newTablename.c_str(); dictTuple.sigValue = (unsigned char*)value.c_str();
dictTuple.sigSize = newTablename.length(); dictTuple.sigSize = value.length();
dictTuple.isNull = false; dictTuple.isNull = false;
dctColList = dictTuple; dctColList = dictTuple;
dctRowList.push_back(dctColList); dctRowList.push_back(dctColList);
@ -2553,7 +2524,7 @@ uint8_t WE_DDLCommandProc::updateSyscolumnTablename(ByteStream& bs, std::string&
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
// build the logging message // build the logging message
err = "WE: Update failed on: " + tableName.table; err = "WE: Update failed on: " + value;
} }
int rc1 = 0; int rc1 = 0;
@ -2580,6 +2551,55 @@ uint8_t WE_DDLCommandProc::updateSyscolumnTablename(ByteStream& bs, std::string&
if (rc == 0) if (rc == 0)
rc = rc1; rc = rc1;
return rc;
}
uint8_t WE_DDLCommandProc::updateSyscolumnTablename(ByteStream& bs, std::string& err)
{
int rc = 0;
uint32_t sessionID, txnID;
std::string schema, oldTablename, newTablename, newSchema;
bs >> sessionID;
bs >> txnID;
bs >> schema;
bs >> oldTablename;
bs >> newTablename;
bs >> newSchema;
CalpontSystemCatalog::TableName tableName;
tableName.schema = schema;
tableName.table = oldTablename;
CalpontSystemCatalog::RIDList roList;
boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
systemCatalogPtr->identity(CalpontSystemCatalog::EC);
try
{
roList = systemCatalogPtr->columnRIDs(tableName);
}
catch (std::exception& ex)
{
err = ex.what();
rc = 1;
return rc;
}
// Build colStructs for SYSTABLE
tableName.schema = CALPONT_SCHEMA;
tableName.table = SYSCOLUMN_TABLE;
DDLColumn column;
findColumnData(sessionID, tableName, TABLENAME_COL, column);
rc = updateSystableEntryForSysColumn(sessionID, txnID, column, newTablename, oldTablename, roList, err);
if (newSchema != schema && rc == NO_ERROR)
{
findColumnData(sessionID, tableName, SCHEMA_COL, column);
rc = updateSystableEntryForSysColumn(sessionID, txnID, column, newSchema, schema, roList, err);
}
systemCatalogPtr->flushCache(); systemCatalogPtr->flushCache();
purgeFDCache(); purgeFDCache();
// if (idbdatafile::IDBPolicy::useHdfs()) // if (idbdatafile::IDBPolicy::useHdfs())
@ -2771,56 +2791,12 @@ uint8_t WE_DDLCommandProc::updateSystableAuto(ByteStream& bs, std::string& err)
return rc; return rc;
} }
uint8_t WE_DDLCommandProc::updateSystableTablename(ByteStream& bs, std::string& err) uint8_t WE_DDLCommandProc::updateSystableEntryForSysTable(int32_t sessionID, uint32_t txnID,
const DDLColumn& column, const std::string& value,
const std::string& oldValue,
CalpontSystemCatalog::ROPair ropair,
std::string& err)
{ {
int rc = 0;
uint32_t sessionID, tmp32;
std::string schema, oldTablename, newTablename;
int txnID;
bs >> sessionID;
bs >> tmp32;
txnID = tmp32;
bs >> schema;
bs >> oldTablename;
bs >> newTablename;
CalpontSystemCatalog::TableName tableName;
tableName.schema = schema;
tableName.table = oldTablename;
WriteEngine::DctnryStructList dctnryStructList;
WriteEngine::DctnryValueList dctnryValueList;
WriteEngine::DctColTupleList dctRowList;
WriteEngine::DctnryTuple dctColList;
uint16_t dbRoot = 0;
uint16_t segment;
uint32_t partition;
CalpontSystemCatalog::ROPair ropair;
boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
systemCatalogPtr->identity(CalpontSystemCatalog::EC);
try
{
ropair = systemCatalogPtr->tableRID(tableName);
}
catch (std::exception& ex)
{
err = ex.what();
rc = 1;
return rc;
}
if (ropair.objnum < 0)
{
err = "No such table: " + tableName.table;
return 1;
}
// now we have to prepare the various structures for the WE to update the column.
std::vector<WriteEngine::RID> ridList; std::vector<WriteEngine::RID> ridList;
WriteEngine::ColValueList colValuesList; WriteEngine::ColValueList colValuesList;
WriteEngine::ColTupleList aColList; WriteEngine::ColTupleList aColList;
@ -2828,19 +2804,16 @@ uint8_t WE_DDLCommandProc::updateSystableTablename(ByteStream& bs, std::string&
WriteEngine::CSCTypesList cscColTypeList; WriteEngine::CSCTypesList cscColTypeList;
std::vector<void*> colOldValuesList; std::vector<void*> colOldValuesList;
std::map<uint32_t, uint32_t> oids; std::map<uint32_t, uint32_t> oids;
// std::vector<BRM::OID_t> oidsToFlush;
boost::any datavalue;
datavalue = newTablename;
WriteEngine::ColTuple colTuple; WriteEngine::ColTuple colTuple;
// Build colStructs for SYSTABLE
tableName.schema = CALPONT_SCHEMA;
tableName.table = SYSTABLE_TABLE;
DDLColumn column;
findColumnData(sessionID, tableName, TABLENAME_COL, column);
WriteEngine::ColStruct colStruct; WriteEngine::ColStruct colStruct;
WriteEngine::DctnryStruct dctnryStruct; WriteEngine::DctnryStruct dctnryStruct;
WriteEngine::DctnryStructList dctnryStructList;
WriteEngine::DctnryValueList dctnryValueList;
WriteEngine::DctColTupleList dctRowList;
WriteEngine::DctnryTuple dctColList;
colStruct.dataOid = column.oid; colStruct.dataOid = column.oid;
colStruct.colWidth = column.colType.colWidth > 8 ? 8 : column.colType.colWidth; colStruct.colWidth = column.colType.colWidth > 8 ? 8 : column.colType.colWidth;
colStruct.tokenFlag = true; colStruct.tokenFlag = true;
@ -2852,8 +2825,8 @@ uint8_t WE_DDLCommandProc::updateSystableTablename(ByteStream& bs, std::string&
dictStruct.columnOid = column.colType.columnOID; dictStruct.columnOid = column.colType.columnOID;
WriteEngine::DctnryTuple dictTuple; WriteEngine::DctnryTuple dictTuple;
dictTuple.isNull = false; dictTuple.isNull = false;
dictTuple.sigValue = (unsigned char*)newTablename.c_str(); dictTuple.sigValue = (unsigned char*)value.c_str();
dictTuple.sigSize = newTablename.length(); dictTuple.sigSize = value.length();
if (idbdatafile::IDBPolicy::useHdfs()) if (idbdatafile::IDBPolicy::useHdfs())
{ {
@ -2899,6 +2872,11 @@ uint8_t WE_DDLCommandProc::updateSystableTablename(ByteStream& bs, std::string&
std::vector<extentInfo> extentsinfo; std::vector<extentInfo> extentsinfo;
extentInfo aExtentinfo; extentInfo aExtentinfo;
CalpontSystemCatalog::OID oid = 1003; CalpontSystemCatalog::OID oid = 1003;
uint16_t dbRoot = 0;
uint16_t segment;
uint32_t partition;
convertRidToColumn(ropair.rid, dbRoot, partition, segment, oid); convertRidToColumn(ropair.rid, dbRoot, partition, segment, oid);
ridList.push_back(ropair.rid); ridList.push_back(ropair.rid);
@ -2934,13 +2912,14 @@ uint8_t WE_DDLCommandProc::updateSystableTablename(ByteStream& bs, std::string&
fWEWrapper.setBulkFlag(false); fWEWrapper.setBulkFlag(false);
fWEWrapper.startTransaction(txnID); fWEWrapper.startTransaction(txnID);
rc = fWEWrapper.updateColumnRec(txnID, colExtentsColType, colExtentsStruct, colValuesList, colOldValuesList, int rc =
ridLists, dctnryExtentsStruct, dctnryValueList, SYSCOLUMN_BASE); fWEWrapper.updateColumnRec(txnID, colExtentsColType, colExtentsStruct, colValuesList, colOldValuesList,
ridLists, dctnryExtentsStruct, dctnryValueList, SYSCOLUMN_BASE);
if (rc != NO_ERROR) if (rc != NO_ERROR)
{ {
// build the logging message // build the logging message
err = "WE: Update failed on: " + tableName.table; err = "WE: Update failed on: " + oldValue;
int rc1 = 0; int rc1 = 0;
if (idbdatafile::IDBPolicy::useHdfs()) if (idbdatafile::IDBPolicy::useHdfs())
@ -2993,20 +2972,14 @@ uint8_t WE_DDLCommandProc::updateSystableTablename(ByteStream& bs, std::string&
if (rc == 0) if (rc == 0)
rc = rc1; rc = rc1;
systemCatalogPtr->flushCache();
purgeFDCache();
// if (idbdatafile::IDBPolicy::useHdfs())
// cacheutils::flushOIDsFromCache(oidsToFlush);
// cout << "rename:syscolumn is updated" << endl;
return rc; return rc;
} }
uint8_t WE_DDLCommandProc::updateSystablesTablename(ByteStream& bs, std::string& err) uint8_t WE_DDLCommandProc::updateSystableTablename(ByteStream& bs, std::string& err)
{ {
int rc = 0; uint8_t rc;
uint32_t sessionID, tmp32; uint32_t sessionID, tmp32, txnID;
std::string schema, oldTablename, newTablename; std::string schema, oldTablename, newTablename, newSchema;
int txnID;
bs >> sessionID; bs >> sessionID;
bs >> tmp32; bs >> tmp32;
@ -3014,26 +2987,17 @@ uint8_t WE_DDLCommandProc::updateSystablesTablename(ByteStream& bs, std::string&
bs >> schema; bs >> schema;
bs >> oldTablename; bs >> oldTablename;
bs >> newTablename; bs >> newTablename;
bs >> newSchema;
CalpontSystemCatalog::TableName tableName; CalpontSystemCatalog::TableName tableName;
tableName.schema = schema; tableName.schema = schema;
tableName.table = oldTablename; tableName.table = oldTablename;
WriteEngine::DctnryStructList dctnryStructList;
WriteEngine::DctnryValueList dctnryValueList;
WriteEngine::DctColTupleList dctRowList;
WriteEngine::DctnryTuple dctColList;
uint16_t dbRoot = 0;
uint16_t segment;
uint32_t partition;
CalpontSystemCatalog::ROPair ropair; CalpontSystemCatalog::ROPair ropair;
boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr = boost::shared_ptr<CalpontSystemCatalog> systemCatalogPtr =
CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID); CalpontSystemCatalog::makeCalpontSystemCatalog(sessionID);
systemCatalogPtr->identity(CalpontSystemCatalog::EC); systemCatalogPtr->identity(CalpontSystemCatalog::EC);
//@bug 4592 Error handling for syscat call
try try
{ {
ropair = systemCatalogPtr->tableRID(tableName); ropair = systemCatalogPtr->tableRID(tableName);
@ -3053,361 +3017,20 @@ uint8_t WE_DDLCommandProc::updateSystablesTablename(ByteStream& bs, std::string&
// now we have to prepare the various structures for the WE to update the column. // now we have to prepare the various structures for the WE to update the column.
std::vector<WriteEngine::RID> ridList;
WriteEngine::ColValueList colValuesList;
WriteEngine::ColTupleList aColList;
WriteEngine::ColStructList colStructs;
WriteEngine::CSCTypesList cscColTypeList;
std::vector<void*> colOldValuesList;
std::map<uint32_t, uint32_t> oids;
// std::vector<BRM::OID_t> oidsToFlush;
boost::any datavalue;
datavalue = newTablename;
WriteEngine::ColTuple colTuple;
// Build colStructs for SYSTABLE // Build colStructs for SYSTABLE
tableName.schema = CALPONT_SCHEMA; tableName.schema = CALPONT_SCHEMA;
tableName.table = SYSTABLE_TABLE; tableName.table = SYSTABLE_TABLE;
DDLColumn column; DDLColumn column;
findColumnData(sessionID, tableName, TABLENAME_COL, column); findColumnData(sessionID, tableName, TABLENAME_COL, column);
WriteEngine::ColStruct colStruct;
WriteEngine::DctnryStruct dctnryStruct;
colStruct.dataOid = column.oid;
colStruct.colWidth = column.colType.colWidth > 8 ? 8 : column.colType.colWidth;
colStruct.tokenFlag = true;
colStruct.colDataType = column.colType.colDataType; rc = updateSystableEntryForSysTable(sessionID, txnID, column, newTablename, oldTablename, ropair, err);
// Tokenize the data value
WriteEngine::DctnryStruct dictStruct;
dictStruct.dctnryOid = column.colType.ddn.dictOID;
dictStruct.columnOid = column.colType.columnOID;
WriteEngine::DctnryTuple dictTuple;
dictTuple.isNull = false;
dictTuple.sigValue = (unsigned char*)newTablename.c_str();
dictTuple.sigSize = newTablename.length();
// int error = NO_ERROR;
// if (NO_ERROR != (error = fWEWrapper.tokenize(txnID, dictStruct, dictTuple)))
//{
// WErrorCodes ec;
// throw std::runtime_error("WE: Tokenization failed " + ec.errorString(error));
//}
// WriteEngine::Token aToken = dictTuple.token;
// colTuple.data = aToken; if (newSchema != schema && rc == NO_ERROR)
// cout << "token value for new table name is op:fbo = " << aToken.op <<":" << aToken.fbo << " null flag = "
// << (uint32_t)dictTuple.isNull<< endl;
if (idbdatafile::IDBPolicy::useHdfs())
{ {
colStruct.fCompressionType = 2; findColumnData(sessionID, tableName, SCHEMA_COL, column);
dctnryStruct.fCompressionType = 2; rc = updateSystableEntryForSysTable(sessionID, txnID, column, newSchema, schema, ropair, err);
} }
if (colStruct.tokenFlag)
{
dctnryStruct.dctnryOid = column.colType.ddn.dictOID;
dctnryStruct.fCharsetNumber = column.colType.charsetNumber;
dctnryStruct.columnOid = colStruct.dataOid;
}
else
{
dctnryStruct.dctnryOid = 0;
dctnryStruct.columnOid = colStruct.dataOid;
}
colStructs.push_back(colStruct);
dctnryStructList.push_back(dctnryStruct);
oids[colStruct.dataOid] = colStruct.dataOid;
cscColTypeList.push_back(column.colType);
// oidsToFlush.push_back(colStruct.dataOid);
if (dctnryStruct.dctnryOid > 0)
{
oids[dctnryStruct.dctnryOid] = dctnryStruct.dctnryOid;
// oidsToFlush.push_back(dctnryStruct.dctnryOid);
}
aColList.push_back(colTuple);
colValuesList.push_back(aColList);
std::vector<WriteEngine::ColStructList> colExtentsStruct;
std::vector<WriteEngine::DctnryStructList> dctnryExtentsStruct;
std::vector<WriteEngine::CSCTypesList> colExtentsColType;
dctColList = dictTuple;
dctRowList.push_back(dctColList);
dctnryValueList.push_back(dctRowList);
// In this case, there's only 1 row, so only one one extent, but keep it generic...
std::vector<extentInfo> extentsinfo;
extentInfo aExtentinfo;
CalpontSystemCatalog::OID oid = 1003;
convertRidToColumn(ropair.rid, dbRoot, partition, segment, oid);
ridList.push_back(ropair.rid);
std::vector<WriteEngine::RIDList> ridLists;
ridLists.push_back(ridList);
aExtentinfo.dbRoot = dbRoot;
aExtentinfo.partition = partition;
aExtentinfo.segment = segment;
extentsinfo.push_back(aExtentinfo);
// build colExtentsStruct
for (unsigned i = 0; i < extentsinfo.size(); i++)
{
for (unsigned j = 0; j < colStructs.size(); j++)
{
colStructs[j].fColPartition = extentsinfo[i].partition;
colStructs[j].fColSegment = extentsinfo[i].segment;
colStructs[j].fColDbRoot = extentsinfo[i].dbRoot;
dctnryStructList[j].fColPartition = extentsinfo[i].partition;
dctnryStructList[j].fColSegment = extentsinfo[i].segment;
dctnryStructList[j].fColDbRoot = extentsinfo[i].dbRoot;
}
colExtentsStruct.push_back(colStructs);
dctnryExtentsStruct.push_back(dctnryStructList);
colExtentsColType.push_back(cscColTypeList);
}
// call the write engine to update the row
fWEWrapper.setTransId(txnID);
fWEWrapper.setIsInsert(false);
fWEWrapper.setBulkFlag(false);
fWEWrapper.startTransaction(txnID);
rc = fWEWrapper.updateColumnRec(txnID, colExtentsColType, colExtentsStruct, colValuesList, colOldValuesList,
ridLists, dctnryExtentsStruct, dctnryValueList, SYSCOLUMN_BASE);
if (rc != NO_ERROR)
{
// build the logging message
err = "WE: Update failed on: " + tableName.table;
int rc1 = 0;
if (idbdatafile::IDBPolicy::useHdfs())
{
rc1 = fWEWrapper.flushDataFiles(rc, txnID, oids);
if ((rc == 0) && (rc1 == 0))
{
rc1 = fWEWrapper.confirmTransaction(txnID);
if (rc1 == NO_ERROR)
rc1 = fWEWrapper.endTransaction(txnID, true);
else
fWEWrapper.endTransaction(txnID, false);
}
else
{
fWEWrapper.endTransaction(txnID, false);
}
}
if (rc == 0)
rc = rc1;
if (rc != 0)
return rc;
}
// cout << "rename:systable is updated to " << newTablename << " for rid " << ropair.rid << endl;
// Update SYSCOLUMN table
tableName.schema = schema;
tableName.table = oldTablename;
dctnryStructList.clear();
dctnryValueList.clear();
dctRowList.clear();
CalpontSystemCatalog::RIDList roList;
try
{
roList = systemCatalogPtr->columnRIDs(tableName);
}
catch (std::exception& ex)
{
err = ex.what();
rc = 1;
return rc;
}
// Build colStructs for SYSCOLUMN
ridList.clear();
colValuesList.clear();
aColList.clear();
colStructs.clear();
cscColTypeList.clear();
colOldValuesList.clear();
oids.clear();
tableName.schema = CALPONT_SCHEMA;
tableName.table = SYSCOLUMN_TABLE;
findColumnData(sessionID, tableName, TABLENAME_COL, column);
colStruct.dataOid = column.oid;
colStruct.colWidth = column.colType.colWidth > 8 ? 8 : column.colType.colWidth;
colStruct.tokenFlag = false;
if ((column.colType.colDataType == CalpontSystemCatalog::CHAR && column.colType.colWidth > 8) ||
(column.colType.colDataType == CalpontSystemCatalog::VARCHAR && column.colType.colWidth > 7) ||
(column.colType.colDataType == CalpontSystemCatalog::VARBINARY && column.colType.colWidth > 7) ||
(column.colType.colDataType == CalpontSystemCatalog::BLOB && column.colType.colWidth > 7) ||
(column.colType.colDataType == CalpontSystemCatalog::TEXT && column.colType.colWidth > 7) ||
(column.colType.colDataType == CalpontSystemCatalog::DECIMAL && column.colType.precision > 18) ||
(column.colType.colDataType == CalpontSystemCatalog::UDECIMAL &&
column.colType.precision > 18)) // token
{
colStruct.colWidth = 8;
colStruct.tokenFlag = true;
}
else
{
colStruct.colWidth = column.colType.colWidth;
}
colStruct.colDataType = column.colType.colDataType;
// Tokenize the data value
dictStruct.dctnryOid = column.colType.ddn.dictOID;
dictStruct.columnOid = column.colType.columnOID;
dictTuple.sigValue = (unsigned char*)newTablename.c_str();
dictTuple.sigSize = newTablename.length();
dictTuple.isNull = false;
/*
if (NO_ERROR != (error = fWEWrapper.tokenize(txnID, dictStruct, dictTuple)))
{
WErrorCodes ec;
throw std::runtime_error("WE: Tokenization failed " + ec.errorString(error));
}
aToken = dictTuple.token;
colTuple.data = aToken; */
colStruct.colDataType = column.colType.colDataType;
if (idbdatafile::IDBPolicy::useHdfs())
{
colStruct.fCompressionType = 2;
dctnryStruct.fCompressionType = 2;
}
if (colStruct.tokenFlag)
{
dctnryStruct.dctnryOid = column.colType.ddn.dictOID;
dctnryStruct.fCharsetNumber = column.colType.charsetNumber;
dctnryStruct.columnOid = colStruct.dataOid;
}
else
{
dctnryStruct.dctnryOid = 0;
dctnryStruct.columnOid = colStruct.dataOid;
}
oids[colStruct.dataOid] = colStruct.dataOid;
// oidsToFlush.push_back(colStruct.dataOid);
if (dctnryStruct.dctnryOid > 0)
{
oids[dctnryStruct.dctnryOid] = dctnryStruct.dctnryOid;
// oidsToFlush.push_back(dctnryStruct.dctnryOid);
}
colStructs.push_back(colStruct);
dctnryStructList.push_back(dctnryStruct);
cscColTypeList.push_back(column.colType);
for (unsigned int i = 0; i < roList.size(); i++)
{
aColList.push_back(colTuple);
}
colValuesList.push_back(aColList);
// It's the same string for each column, so we just need one dictionary struct
void* dictTuplePtr = static_cast<void*>(&dictTuple);
memset(dictTuplePtr, 0, sizeof(dictTuple));
dictTuple.sigValue = (unsigned char*)newTablename.c_str();
dictTuple.sigSize = newTablename.length();
dictTuple.isNull = false;
dctColList = dictTuple;
dctRowList.push_back(dctColList);
dctnryValueList.push_back(dctRowList);
extentsinfo.clear();
colExtentsStruct.clear();
colExtentsColType.clear();
dctnryExtentsStruct.clear();
oid = 1021;
for (unsigned int i = 0; i < roList.size(); i++)
{
convertRidToColumn(roList[i].rid, dbRoot, partition, segment, oid);
aExtentinfo.dbRoot = dbRoot;
aExtentinfo.partition = partition;
aExtentinfo.segment = segment;
if (extentsinfo.empty())
extentsinfo.push_back(aExtentinfo);
else if (extentsinfo.back() != aExtentinfo)
extentsinfo.push_back(aExtentinfo);
ridList.push_back(roList[i].rid);
}
ridLists.clear();
ridLists.push_back(ridList);
// build colExtentsStruct
for (unsigned i = 0; i < extentsinfo.size(); i++)
{
for (unsigned j = 0; j < colStructs.size(); j++)
{
colStructs[j].fColPartition = extentsinfo[i].partition;
colStructs[j].fColSegment = extentsinfo[i].segment;
colStructs[j].fColDbRoot = extentsinfo[i].dbRoot;
dctnryStructList[j].fColPartition = extentsinfo[i].partition;
dctnryStructList[j].fColSegment = extentsinfo[i].segment;
dctnryStructList[j].fColDbRoot = extentsinfo[i].dbRoot;
}
colExtentsStruct.push_back(colStructs);
dctnryExtentsStruct.push_back(dctnryStructList);
colExtentsColType.push_back(cscColTypeList);
}
// call the write engine to update the row
rc = fWEWrapper.updateColumnRec(txnID, colExtentsColType, colExtentsStruct, colValuesList, colOldValuesList,
ridLists, dctnryExtentsStruct, dctnryValueList, SYSCOLUMN_BASE);
if (rc != NO_ERROR)
{
// build the logging message
err = "WE: Update failed on: " + tableName.table;
}
int rc1 = 0;
if (idbdatafile::IDBPolicy::useHdfs())
{
rc1 = fWEWrapper.flushDataFiles(rc, txnID, oids);
if ((rc == 0) && (rc1 == 0))
{
rc1 = fWEWrapper.confirmTransaction(txnID);
if (rc1 == NO_ERROR)
rc1 = fWEWrapper.endTransaction(txnID, true);
else
fWEWrapper.endTransaction(txnID, false);
}
else
{
fWEWrapper.endTransaction(txnID, false);
}
}
if (rc == 0)
rc = rc1;
systemCatalogPtr->flushCache(); systemCatalogPtr->flushCache();
purgeFDCache(); purgeFDCache();
// if (idbdatafile::IDBPolicy::useHdfs()) // if (idbdatafile::IDBPolicy::useHdfs())

88
writeengine/server/we_ddlcommandproc.h
View File

@ -32,8 +32,11 @@
#define EXPORT #define EXPORT
namespace WriteEngine namespace WriteEngine
{ {
struct DDLColumn;
class WE_DDLCommandProc class WE_DDLCommandProc
{ {
public: public:
@ -43,9 +46,9 @@ class WE_DDLCommandProc
DROPPART_LOG, DROPPART_LOG,
TRUNCATE_LOG TRUNCATE_LOG
}; };
EXPORT WE_DDLCommandProc(); WE_DDLCommandProc();
EXPORT WE_DDLCommandProc(const WE_DDLCommandProc& rhs); WE_DDLCommandProc(const WE_DDLCommandProc& rhs);
EXPORT ~WE_DDLCommandProc(); ~WE_DDLCommandProc();
/** @brief Update SYSCOLUMN nextval column for the columnoid with nextVal. /** @brief Update SYSCOLUMN nextval column for the columnoid with nextVal.
* *
* Update SYSCOLUMN nextval column for the columnoid with nexValue. * Update SYSCOLUMN nextval column for the columnoid with nexValue.
@ -53,35 +56,36 @@ class WE_DDLCommandProc
* @param nextVal (in) The partition number * @param nextVal (in) The partition number
* @return 0 on success, non-0 on error. * @return 0 on success, non-0 on error.
*/ */
EXPORT uint8_t updateSyscolumnNextval(messageqcpp::ByteStream& bs, std::string& err); uint8_t updateSyscolumnNextval(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t writeSystable(messageqcpp::ByteStream& bs, std::string& err); uint8_t writeSystable(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t writeSyscolumn(messageqcpp::ByteStream& bs, std::string& err); uint8_t writeSyscolumn(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t writeCreateSyscolumn(messageqcpp::ByteStream& bs, std::string& err); uint8_t writeCreateSyscolumn(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t createtablefiles(messageqcpp::ByteStream& bs, std::string& err); uint8_t createtablefiles(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t commitVersion(messageqcpp::ByteStream& bs, std::string& err); uint8_t commitVersion(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t rollbackBlocks(messageqcpp::ByteStream& bs, std::string& err); uint8_t rollbackBlocks(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t rollbackVersion(messageqcpp::ByteStream& bs, std::string& err); uint8_t rollbackVersion(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t deleteSyscolumn(messageqcpp::ByteStream& bs, std::string& err); uint8_t deleteSyscolumn(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t deleteSyscolumnRow(messageqcpp::ByteStream& bs, std::string& err); uint8_t deleteSyscolumnRow(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t deleteSystable(messageqcpp::ByteStream& bs, std::string& err); uint8_t deleteSystable(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t deleteSystables(messageqcpp::ByteStream& bs, std::string& err); uint8_t deleteSystables(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t dropFiles(messageqcpp::ByteStream& bs, std::string& err); uint8_t dropFiles(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSyscolumnAuto(messageqcpp::ByteStream& bs, std::string& err); uint8_t updateSyscolumnAuto(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSyscolumnNextvalCol(messageqcpp::ByteStream& bs, std::string& err); uint8_t updateSyscolumnNextvalCol(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSyscolumnTablename(messageqcpp::ByteStream& bs, std::string& err); uint8_t updateSystableAuto(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSystableAuto(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSystableTablename(messageqcpp::ByteStream& bs, std::string& err); uint8_t updateSyscolumnTablename(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSystablesTablename(messageqcpp::ByteStream& bs, std::string& err); uint8_t updateSystableTablename(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSyscolumnColumnposCol(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t fillNewColumn(messageqcpp::ByteStream& bs, std::string& err); uint8_t updateSyscolumnColumnposCol(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSyscolumnRenameColumn(messageqcpp::ByteStream& bs, std::string& err); uint8_t fillNewColumn(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t updateSyscolumnSetDefault(messageqcpp::ByteStream& bs, std::string& err); uint8_t updateSyscolumnRenameColumn(messageqcpp::ByteStream& bs, std::string& err);
// EXPORT uint8_t updateSyscolumn(messageqcpp::ByteStream& bs, std::string & err); uint8_t updateSyscolumnSetDefault(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t writeTruncateLog(messageqcpp::ByteStream& bs, std::string& err); // uint8_t updateSyscolumn(messageqcpp::ByteStream& bs, std::string & err);
EXPORT uint8_t writeDropPartitionLog(messageqcpp::ByteStream& bs, std::string& err); uint8_t writeTruncateLog(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t writeDropTableLog(messageqcpp::ByteStream& bs, std::string& err); uint8_t writeDropPartitionLog(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t deleteDDLLog(messageqcpp::ByteStream& bs, std::string& err); uint8_t writeDropTableLog(messageqcpp::ByteStream& bs, std::string& err);
EXPORT uint8_t fetchDDLLog(messageqcpp::ByteStream& bs, std::string& err); uint8_t deleteDDLLog(messageqcpp::ByteStream& bs, std::string& err);
uint8_t fetchDDLLog(messageqcpp::ByteStream& bs, std::string& err);
void purgeFDCache(); void purgeFDCache();
/** @brief drop a set of partitions /** @brief drop a set of partitions
* *
@ -90,7 +94,7 @@ class WE_DDLCommandProc
* @param err (out) error message when error occurs * @param err (out) error message when error occurs
* @return 0 on success, otherwise error. * @return 0 on success, otherwise error.
*/ */
EXPORT uint8_t dropPartitions(messageqcpp::ByteStream& bs, std::string& err); uint8_t dropPartitions(messageqcpp::ByteStream& bs, std::string& err);
inline void convertRidToColumn(uint64_t& rid, uint16_t& dbRoot, uint32_t& partition, uint16_t& segment, inline void convertRidToColumn(uint64_t& rid, uint16_t& dbRoot, uint32_t& partition, uint16_t& segment,
const int32_t oid) const int32_t oid)
{ {
@ -111,6 +115,24 @@ class WE_DDLCommandProc
rid = relRidInThisExtent + numExtentsInThisSegPart * extentRows; rid = relRidInThisExtent + numExtentsInThisSegPart * extentRows;
} }
private:
uint8_t updateSystableEntryForSysTable(int32_t sessionID,
uint32_t txnID,
const DDLColumn& column,
const std::string& value,
const std::string& oldValue,
execplan::CalpontSystemCatalog::ROPair ropair,
std::string& err);
uint8_t updateSystableEntryForSysColumn(int32_t sessionID,
uint32_t txnID,
const DDLColumn& column,
const std::string& value,
const std::string& oldValue,
execplan::CalpontSystemCatalog::RIDList& roList,
std::string& err);
private: private:
WriteEngineWrapper fWEWrapper; WriteEngineWrapper fWEWrapper;
BRM::DBRM fDbrm; BRM::DBRM fDbrm;

1
writeengine/server/we_messages.h
View File

@ -48,7 +48,6 @@ enum ServerMessages
WE_SVR_UPDATE_SYSCOLUMN_COLPOS, WE_SVR_UPDATE_SYSCOLUMN_COLPOS,
WE_SVR_UPDATE_SYSCOLUMN_RENAMECOLUMN, WE_SVR_UPDATE_SYSCOLUMN_RENAMECOLUMN,
WE_SVR_UPDATE_SYSTABLE_TABLENAME, WE_SVR_UPDATE_SYSTABLE_TABLENAME,
WE_SVR_UPDATE_SYSTABLES_TABLENAME,
WE_SVR_DROP_PARTITIONS, WE_SVR_DROP_PARTITIONS,
WE_SVR_SINGLE_INSERT, WE_SVR_SINGLE_INSERT,
WE_SVR_BATCH_KEEPALIVE, WE_SVR_BATCH_KEEPALIVE,

6
writeengine/server/we_readthread.cpp
View File

@ -325,12 +325,6 @@ void DmlReadThread::operator()()
break; break;
} }
case WE_SVR_UPDATE_SYSTABLES_TABLENAME:
{
rc = fWeDDLprocessor->updateSystablesTablename(ibs, errMsg);
break;
}
case WE_SVR_FILL_COLUMN: case WE_SVR_FILL_COLUMN:
{ {
rc = fWeDDLprocessor->fillNewColumn(ibs, errMsg); rc = fWeDDLprocessor->fillNewColumn(ibs, errMsg);