From f4a6294c950e45d2d26c48fa864e89585206e467 Mon Sep 17 00:00:00 2001 From: Alexey Antipovsky Date: Tue, 10 Nov 2020 18:11:14 +0000 Subject: [PATCH] Fix ignored qualifiers warnings (-Wignored-qualifiers) --- dbcon/dmlpackage/commanddmlpackage.cpp | 4 ++-- dbcon/dmlpackage/insertdmlpackage.cpp | 6 +++--- dbcon/execplan/aggregatecolumn.cpp | 2 +- dbcon/execplan/calpontselectexecutionplan.cpp | 6 +++--- dbcon/execplan/calpontsystemcatalog.cpp | 2 +- dbcon/execplan/constantcolumn.cpp | 2 +- dbcon/execplan/existsfilter.cpp | 4 ++-- dbcon/execplan/simplecolumn.cpp | 2 +- writeengine/bulk/we_colbufsec.cpp | 2 +- writeengine/shared/we_dbfileop.cpp | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dbcon/dmlpackage/commanddmlpackage.cpp b/dbcon/dmlpackage/commanddmlpackage.cpp index 6bbdc0693..02669232e 100644 --- a/dbcon/dmlpackage/commanddmlpackage.cpp +++ b/dbcon/dmlpackage/commanddmlpackage.cpp @@ -61,8 +61,8 @@ int CommandDMLPackage::write(messageqcpp::ByteStream& bytestream) bytestream << fTimeZone; bytestream << fTableName; bytestream << fTableOid; - bytestream << static_cast(fIsAutocommitOn); - bytestream << static_cast(fIsBatchInsert); + bytestream << static_cast(fIsAutocommitOn); + bytestream << static_cast(fIsBatchInsert); return retval; } diff --git a/dbcon/dmlpackage/insertdmlpackage.cpp b/dbcon/dmlpackage/insertdmlpackage.cpp index b46e58da3..b91848e29 100644 --- a/dbcon/dmlpackage/insertdmlpackage.cpp +++ b/dbcon/dmlpackage/insertdmlpackage.cpp @@ -67,9 +67,9 @@ int InsertDMLPackage::write(messageqcpp::ByteStream& bytestream) bytestream << (uint8_t)fLogending; bytestream << fTableOid; - bytestream << static_cast(fIsInsertSelect); - bytestream << static_cast(fIsBatchInsert); - bytestream << static_cast(fIsAutocommitOn); + bytestream << static_cast(fIsInsertSelect); + bytestream << static_cast(fIsBatchInsert); + bytestream << static_cast(fIsAutocommitOn); if (fTable != 0) { diff --git a/dbcon/execplan/aggregatecolumn.cpp b/dbcon/execplan/aggregatecolumn.cpp index 3d7825dcb..0141ed832 100644 --- a/dbcon/execplan/aggregatecolumn.cpp +++ b/dbcon/execplan/aggregatecolumn.cpp @@ -190,7 +190,7 @@ void AggregateColumn::serialize(messageqcpp::ByteStream& b) const b << fTimeZone; //b << fAlias; b << fTableAlias; - b << static_cast(fAsc); + b << static_cast(fAsc); if (fConstCol.get() == 0) b << (uint8_t) ObjectReader::NULL_CLASS; diff --git a/dbcon/execplan/calpontselectexecutionplan.cpp b/dbcon/execplan/calpontselectexecutionplan.cpp index 07622638d..94faf2ba2 100644 --- a/dbcon/execplan/calpontselectexecutionplan.cpp +++ b/dbcon/execplan/calpontselectexecutionplan.cpp @@ -480,7 +480,7 @@ void CalpontSelectExecutionPlan::serialize(messageqcpp::ByteStream& b) const b << fVerID; b << fTraceFlags; b << fStatementID; - b << static_cast(fDistinct); + b << static_cast(fDistinct); b << static_cast(fOverrideLargeSideEstimate); // for union @@ -500,8 +500,8 @@ void CalpontSelectExecutionPlan::serialize(messageqcpp::ByteStream& b) const b << (uint64_t)fLimitStart; b << (uint64_t)fLimitNum; - b << static_cast(fHasOrderBy); - b << static_cast(fSpecHandlerProcessed); + b << static_cast(fHasOrderBy); + b << static_cast(fSpecHandlerProcessed); b << reinterpret_cast(fOrderByThreads); b << static_cast(fSelectSubList.size()); diff --git a/dbcon/execplan/calpontsystemcatalog.cpp b/dbcon/execplan/calpontsystemcatalog.cpp index 7bb88253d..15033b9bc 100644 --- a/dbcon/execplan/calpontsystemcatalog.cpp +++ b/dbcon/execplan/calpontsystemcatalog.cpp @@ -411,7 +411,7 @@ void CalpontSystemCatalog::TableAliasName::serialize(messageqcpp::ByteStream& b) b << table; b << alias; b << view; - b << static_cast(fisColumnStore); + b << static_cast(fisColumnStore); } void CalpontSystemCatalog::TableAliasName::unserialize(messageqcpp::ByteStream& b) diff --git a/dbcon/execplan/constantcolumn.cpp b/dbcon/execplan/constantcolumn.cpp index 13b8f72ae..28a7611d4 100644 --- a/dbcon/execplan/constantcolumn.cpp +++ b/dbcon/execplan/constantcolumn.cpp @@ -308,7 +308,7 @@ void ConstantColumn::serialize(messageqcpp::ByteStream& b) const //b << fAlias; b << fData; b << fTimeZone; - b << static_cast(fReturnAll); + b << static_cast(fReturnAll); b << (uint64_t)fResult.intVal; b << fResult.uintVal; b << fResult.doubleVal; diff --git a/dbcon/execplan/existsfilter.cpp b/dbcon/execplan/existsfilter.cpp index c9799da1d..4527042cf 100644 --- a/dbcon/execplan/existsfilter.cpp +++ b/dbcon/execplan/existsfilter.cpp @@ -83,8 +83,8 @@ void ExistsFilter::serialize(messageqcpp::ByteStream& b) const else b << static_cast(ObjectReader::NULL_CLASS); - b << static_cast(fNotExists); - b << static_cast(fCorrelated); + b << static_cast(fNotExists); + b << static_cast(fCorrelated); } void ExistsFilter::unserialize(messageqcpp::ByteStream& b) diff --git a/dbcon/execplan/simplecolumn.cpp b/dbcon/execplan/simplecolumn.cpp index 054d7ab0d..8110c5296 100644 --- a/dbcon/execplan/simplecolumn.cpp +++ b/dbcon/execplan/simplecolumn.cpp @@ -365,7 +365,7 @@ void SimpleColumn::serialize(messageqcpp::ByteStream& b) const b << fData; b << fTableAlias; b << (uint32_t) fSequence; - b << static_cast(fisColumnStore); + b << static_cast(fisColumnStore); } void SimpleColumn::unserialize(messageqcpp::ByteStream& b) diff --git a/writeengine/bulk/we_colbufsec.cpp b/writeengine/bulk/we_colbufsec.cpp index f5981fb85..df6445fa7 100644 --- a/writeengine/bulk/we_colbufsec.cpp +++ b/writeengine/bulk/we_colbufsec.cpp @@ -53,7 +53,7 @@ void ColumnBufferSection::write(const void* const data, int nRows) { //Casting void * to unsigned char * without modifying the constness const unsigned char* const tData = - static_cast(data); + static_cast(data); if (fCurrRowId + nRows + 1 > fEndRowId) { diff --git a/writeengine/shared/we_dbfileop.cpp b/writeengine/shared/we_dbfileop.cpp index a2f7e4b36..aa909f8ae 100644 --- a/writeengine/shared/we_dbfileop.cpp +++ b/writeengine/shared/we_dbfileop.cpp @@ -444,12 +444,12 @@ int DbFileOp::writeVB( IDBDataFile* pFile, const OID oid, const uint64_t lbid ) return NO_ERROR; int rc; - TxnID transId = getTransId(); + const TxnID transId = getTransId(); if (transId != ((TxnID)INVALID_NUM)) { rc = BRMWrapper::getInstance()->writeVB( pFile, - (const VER_t)transId, + (VER_t)transId, oid, lbid, this ); //@Bug 4671. The error is already logged by worker node. /* if (rc != NO_ERROR)