diff --git a/datatypes/mcs_datatype.cpp b/datatypes/mcs_datatype.cpp index ffaaf695d..d8bc951c3 100644 --- a/datatypes/mcs_datatype.cpp +++ b/datatypes/mcs_datatype.cpp @@ -663,7 +663,7 @@ int TypeHandlerBinary::storeValueToField(rowgroup::Row &row, int pos, StoreField *f) const { Field_varstring* f2 = static_cast(f); - // WIP MCOL-641 Binary representation could contain \0. + // TODO MCOL-641 Binary representation could contain \0. char* binaryString = row.getBinaryField(pos); return f2->store(binaryString, colType.colWidth, f2->charset()); } diff --git a/datatypes/mcs_decimal.cpp b/datatypes/mcs_decimal.cpp index 51eddb800..5ede71e9f 100644 --- a/datatypes/mcs_decimal.cpp +++ b/datatypes/mcs_decimal.cpp @@ -629,15 +629,16 @@ namespace datatypes // decimal part left = sizeof(buf) - (p - buf); p += writeFractionalPart(tempValue, p, left); - - *p = '\0'; - uint8_t written = p - buf; + if (sizeof(buf) <= written) { throw logging::QueryDataExcept("Decimal::toString() char buffer overflow.", logging::formatErr); } + + *p = '\0'; + return std::string(buf); } diff --git a/datatypes/mcs_int128.h b/datatypes/mcs_int128.h index dc9e1897e..47fce411a 100644 --- a/datatypes/mcs_int128.h +++ b/datatypes/mcs_int128.h @@ -265,6 +265,13 @@ class TSInt128 return toTFloat128(); } + // unaligned argument + inline TSInt128& operator=(const int128_t* x) + { + assignPtrPtr(&s128Value, x); + return *this; + } + inline TSInt128 operator%(const int64_t& rhs) const { return TSInt128(s128Value % rhs); diff --git a/dbcon/execplan/arithmeticoperator.cpp b/dbcon/execplan/arithmeticoperator.cpp index 1c22b6e33..26fc4e1fe 100644 --- a/dbcon/execplan/arithmeticoperator.cpp +++ b/dbcon/execplan/arithmeticoperator.cpp @@ -47,7 +47,7 @@ ArithmeticOperator::ArithmeticOperator(const string& operatorName): Operator(ope ArithmeticOperator::ArithmeticOperator(const ArithmeticOperator& rhs): Operator(rhs), fTimeZone(rhs.timeZone()), - fDecimalOverflowCheck(false) + fDecimalOverflowCheck(rhs.getOverflowCheck()) { } diff --git a/dbcon/execplan/calpontsystemcatalog.cpp b/dbcon/execplan/calpontsystemcatalog.cpp index f8271affd..eea94b358 100644 --- a/dbcon/execplan/calpontsystemcatalog.cpp +++ b/dbcon/execplan/calpontsystemcatalog.cpp @@ -129,7 +129,7 @@ ColumnCommandDataType::ColumnCommandDataType(const CalpontSystemCatalog::DataTyp colWidth = 8; mIsDict = true; } - // MCOL-641 WIP + // TODO MCOL-641 else if (colWidth > 8 && colDataType != CalpontSystemCatalog::DECIMAL && colDataType != CalpontSystemCatalog::UDECIMAL) diff --git a/dbcon/execplan/functioncolumn.h b/dbcon/execplan/functioncolumn.h index 63d7c0572..47d87ff64 100644 --- a/dbcon/execplan/functioncolumn.h +++ b/dbcon/execplan/functioncolumn.h @@ -264,7 +264,7 @@ public: { if (scaleDiff > 0) { - // WIP MCOL-641 Unconditional overflow check + // TODO MCOL-641 Unconditional overflow check datatypes::MultiplicationNoOverflowCheck mul; mul(decimal.s128Value, scaleMultiplier, decimal.s128Value); } diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h index c14b4bcdf..154771112 100644 --- a/dbcon/execplan/predicateoperator.h +++ b/dbcon/execplan/predicateoperator.h @@ -118,15 +118,15 @@ public: void setOpType(Type& l, Type& r); private: - inline bool numericCompare(IDB_Decimal& op1, IDB_Decimal& op2); + inline bool numericCompare(const IDB_Decimal& op1, const IDB_Decimal& op2); template - inline bool numericCompare(result_t op1, result_t op2); + inline bool numericCompare(const result_t op1, const result_t op2); inline bool strTrimCompare(const std::string& op1, const std::string& op2); const CHARSET_INFO* cs; }; -inline bool PredicateOperator::numericCompare(IDB_Decimal& op1, IDB_Decimal& op2) +inline bool PredicateOperator::numericCompare(const IDB_Decimal& op1, const IDB_Decimal& op2) { switch (fOp) { @@ -158,7 +158,7 @@ inline bool PredicateOperator::numericCompare(IDB_Decimal& op1, IDB_Decimal& op2 } template -inline bool PredicateOperator::numericCompare(result_t op1, result_t op2) +inline bool PredicateOperator::numericCompare(const result_t op1, const result_t op2) { switch (fOp) { diff --git a/dbcon/execplan/simplecolumn.cpp b/dbcon/execplan/simplecolumn.cpp index cdccb399f..71ee8f3a8 100644 --- a/dbcon/execplan/simplecolumn.cpp +++ b/dbcon/execplan/simplecolumn.cpp @@ -483,7 +483,7 @@ void SimpleColumn::setDerivedTable() // @todo make aggregate filter to having clause. not optimize it for now if (fDerivedRefCol && - // WIP replace with typeid() + // TODO replace with typeid() (dynamic_cast(fDerivedRefCol) || dynamic_cast(fDerivedRefCol))) fDerivedTable = ""; @@ -502,7 +502,7 @@ bool SimpleColumn::singleTable(CalpontSystemCatalog::TableAliasName& tan) // @todo move to inline void SimpleColumn::evaluate(Row& row, bool& isNull) { - // WIP Move this block into an appropriate place + // TODO Move this block into an appropriate place if (UNLIKELY((int)(fInputOffset == (uint32_t)-1))) { fInputOffset = row.getOffset(fInputIndex); diff --git a/dbcon/execplan/simplecolumn_decimal.h b/dbcon/execplan/simplecolumn_decimal.h index e6f8d9271..4c806c65f 100644 --- a/dbcon/execplan/simplecolumn_decimal.h +++ b/dbcon/execplan/simplecolumn_decimal.h @@ -143,7 +143,7 @@ void SimpleColumn_Decimal::setNullVal() fNullVal = joblist::TINYINTNULL; break; case 16: - std::cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << std::endl; + // TODO MCOL-641 //fallthrough default: fNullVal = joblist::BIGINTNULL; @@ -233,8 +233,8 @@ void SimpleColumn_Decimal::serialize(messageqcpp::ByteStream& b) const case 8: b << (ObjectReader::id_t) ObjectReader::SIMPLECOLUMN_DECIMAL8; break; - case 16: - std::cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << std::endl; + // TODO MCOL-641 + // case 16: } SimpleColumn::serialize(b); @@ -260,8 +260,8 @@ void SimpleColumn_Decimal::unserialize(messageqcpp::ByteStream& b) case 8: ObjectReader::checkType(b, ObjectReader::SIMPLECOLUMN_DECIMAL8); break; - case 16: - std::cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << std::endl; + // TODO MCOL-641 + // case 16: } SimpleColumn::unserialize(b); diff --git a/dbcon/execplan/simplecolumn_uint.h b/dbcon/execplan/simplecolumn_uint.h index edd811cba..14144e847 100644 --- a/dbcon/execplan/simplecolumn_uint.h +++ b/dbcon/execplan/simplecolumn_uint.h @@ -142,8 +142,8 @@ void SimpleColumn_UINT::setNullVal() case 1: fNullVal = joblist::UTINYINTNULL; break; + // TODO MCOL-641 case 16: - std::cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << std::endl; //fallthrough default: fNullVal = joblist::UBIGINTNULL; @@ -245,8 +245,9 @@ void SimpleColumn_UINT::serialize(messageqcpp::ByteStream& b) const case 8: b << (ObjectReader::id_t) ObjectReader::SIMPLECOLUMN_UINT8; break; - case 16: - std::cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << std::endl; + + // TODO MCOL-641 + // case 16: } SimpleColumn::serialize(b); @@ -272,8 +273,9 @@ void SimpleColumn_UINT::unserialize(messageqcpp::ByteStream& b) case 8: ObjectReader::checkType(b, ObjectReader::SIMPLECOLUMN_UINT8); break; - case 16: - std::cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << std::endl; + + // TODO MCOL-641 + // case 16: } SimpleColumn::unserialize(b); diff --git a/dbcon/execplan/windowfunctioncolumn.cpp b/dbcon/execplan/windowfunctioncolumn.cpp index 499ff4421..afb1562fd 100644 --- a/dbcon/execplan/windowfunctioncolumn.cpp +++ b/dbcon/execplan/windowfunctioncolumn.cpp @@ -489,8 +489,9 @@ void WindowFunctionColumn::evaluate(Row& row, bool& isNull) fResult.origIntVal = row.getUintField<8>(fInputIndex); break; + + // TODO MCOL-641 case 16: - cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl; //fallthrough default: if (row.equals(CPNULLSTRMARK, fInputIndex)) diff --git a/dbcon/joblist/batchprimitiveprocessor-jl.cpp b/dbcon/joblist/batchprimitiveprocessor-jl.cpp index 108a169d8..9d3aba526 100644 --- a/dbcon/joblist/batchprimitiveprocessor-jl.cpp +++ b/dbcon/joblist/batchprimitiveprocessor-jl.cpp @@ -680,8 +680,9 @@ void BatchPrimitiveProcessorJL::getTuples(messageqcpp::ByteStream& in, columnData[j]++; pos++; break; + + // TODO MCOL-641 case 16: - cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl; //fallthrough default: cout << "BPP::getTuples(): bad column width of " << colWidths[j] diff --git a/dbcon/joblist/columncommand-jl.cpp b/dbcon/joblist/columncommand-jl.cpp index acde9cdb6..8cb72940a 100644 --- a/dbcon/joblist/columncommand-jl.cpp +++ b/dbcon/joblist/columncommand-jl.cpp @@ -256,9 +256,11 @@ uint8_t ColumnCommandJL::getTableColumnType() case 1: return TableColumn::UINT8; + + // TODO MCOL-641 case 16: - cout << __FILE__<< ":" <<__LINE__ << " Fix 16 Bytes ?" << endl; //fallthrough + default: throw logic_error("ColumnCommandJL: bad column width"); } diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp index 876f2af32..7aa863b39 100644 --- a/dbcon/joblist/jlf_execplantojoblist.cpp +++ b/dbcon/joblist/jlf_execplantojoblist.cpp @@ -1885,9 +1885,7 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo) #else bool isNull = ConstantColumn::NULLDATA == cc->type(); - // WIP MCOL-641 width check must be a f() not a literal - // make a template from convertValueNum to avoid extra if - // this condition doesn't support UDECIMAL + if (ct.isWideDecimalType()) convertValueNum(constval, ct, isNull, rf, jobInfo.timeZone, value128); else diff --git a/dbcon/joblist/pcolstep.cpp b/dbcon/joblist/pcolstep.cpp index dbcbe19ba..6b625d1e8 100644 --- a/dbcon/joblist/pcolstep.cpp +++ b/dbcon/joblist/pcolstep.cpp @@ -597,7 +597,6 @@ void pColStep::addFilter(int8_t COP, int64_t value, uint8_t roundFlag) fFilterCount++; } -// WIP MCOL-641 void pColStep::addFilter(int8_t COP, const int128_t& value, uint8_t roundFlag) { fFilterString << (uint8_t) COP; diff --git a/dbcon/joblist/primitivestep.h b/dbcon/joblist/primitivestep.h index 49b753ccd..4375b8815 100644 --- a/dbcon/joblist/primitivestep.h +++ b/dbcon/joblist/primitivestep.h @@ -196,7 +196,6 @@ public: */ void addFilter(int8_t COP, int64_t value, uint8_t roundFlag = 0); void addFilter(int8_t COP, float value); - // WIP MCOL-641 void addFilter(int8_t COP, const int128_t& value, uint8_t roundFlag = 0); /** @brief Sets the DataList to get RID values from. diff --git a/dbcon/joblist/rowestimator.cpp b/dbcon/joblist/rowestimator.cpp index ff1fc88df..c6fe69c82 100644 --- a/dbcon/joblist/rowestimator.cpp +++ b/dbcon/joblist/rowestimator.cpp @@ -380,8 +380,8 @@ float RowEstimator::estimateRowReturnFactor(const BRM::EMEntry& emEntry, if (ct.colDataType == execplan::CalpontSystemCatalog::DECIMAL || ct.colDataType == execplan::CalpontSystemCatalog::UDECIMAL) { - uint128_t val = *(uint128_t*)msgDataPtr; - bigValue = static_cast(val); + datatypes::TSInt128 val(reinterpret_cast(msgDataPtr)); + bigValue = val.getValue(); break; } } @@ -426,8 +426,8 @@ float RowEstimator::estimateRowReturnFactor(const BRM::EMEntry& emEntry, if (ct.colDataType == execplan::CalpontSystemCatalog::DECIMAL || ct.colDataType == execplan::CalpontSystemCatalog::UDECIMAL) { - int128_t val = *(int128_t*)msgDataPtr; - bigValue = static_cast(val); + datatypes::TSInt128 val(reinterpret_cast(msgDataPtr)); + bigValue = val.getValue(); break; } } diff --git a/dbcon/joblist/tuple-bps.cpp b/dbcon/joblist/tuple-bps.cpp index f9dec0efd..eae2c5b09 100644 --- a/dbcon/joblist/tuple-bps.cpp +++ b/dbcon/joblist/tuple-bps.cpp @@ -1484,7 +1484,7 @@ bool TupleBPS::processSingleFilterString(int8_t BOP, int8_t colWidth, T val, con { int8_t COP; int64_t val2; - int128_t bigVal2; + datatypes::TSInt128 bigVal2; bool thisPredicate; COP = *filterString++; filterString++; // skip the round var, don't think that applies here @@ -1512,7 +1512,7 @@ bool TupleBPS::processSingleFilterString(int8_t BOP, int8_t colWidth, T val, con break; case 16: - bigVal2 = *((int128_t*) filterString); + bigVal2 = reinterpret_cast(filterString); filterString += 16; break; @@ -1524,7 +1524,7 @@ bool TupleBPS::processSingleFilterString(int8_t BOP, int8_t colWidth, T val, con if (static_cast(colWidth) < datatypes::MAXDECIMALWIDTH) thisPredicate = compareSingleValue(COP, (int64_t) val, val2); else - thisPredicate = compareSingleValue(COP, (int128_t) val, bigVal2); + thisPredicate = compareSingleValue(COP, (int128_t) val, bigVal2.getValue()); if (j == 0) ret = thisPredicate; diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp index 67bb30ce9..bea224b8c 100755 --- a/dbcon/mysql/ha_mcs_execplan.cpp +++ b/dbcon/mysql/ha_mcs_execplan.cpp @@ -5148,9 +5148,9 @@ because it has multiple arguments."; // adjust decimal result type according to internalDecimalScale bool isWideDecimal = ac->resultType().isWideDecimalType(); - // This must be also valid for UDECIMAL - if (!isWideDecimal && gwi.internalDecimalScale >= 0 - && ac->resultType().colDataType == CalpontSystemCatalog::DECIMAL) + if (!isWideDecimal && gwi.internalDecimalScale >= 0 && + (ac->resultType().colDataType == CalpontSystemCatalog::DECIMAL || + ac->resultType().colDataType == CalpontSystemCatalog::UDECIMAL)) { CalpontSystemCatalog::ColType ct = ac->resultType(); ct.scale = gwi.internalDecimalScale; diff --git a/primitives/linux-port/column.cpp b/primitives/linux-port/column.cpp index f485ff167..2b65e67d3 100644 --- a/primitives/linux-port/column.cpp +++ b/primitives/linux-port/column.cpp @@ -208,13 +208,6 @@ inline bool colStrCompare_(uint64_t val1, uint64_t val2, uint8_t COP, uint8_t rf template inline bool isEmptyVal(uint8_t type, const uint8_t* val8); -template<> -inline bool isEmptyVal<32>(uint8_t type, const uint8_t* ival) // For BINARY -{ - std::cout << __func__ << " WARNING!!! Not implemented for 32 byte data types." << std::endl; - return false; -} - template<> inline bool isEmptyVal<16>(uint8_t type, const uint8_t* ival) // For BINARY { @@ -354,15 +347,6 @@ inline bool isNullVal<16>(uint8_t type, const uint8_t* ival) return *val == datatypes::Decimal128Null; } -template<> -inline bool isNullVal<32>(uint8_t type, const uint8_t* ival) -{ - - std::cout << __func__ << " WARNING!!! Not implemented for 32 byte data types." -<< std::endl; - return false; -} - template<> inline bool isNullVal<8>(uint8_t type, const uint8_t* ival) { @@ -505,7 +489,6 @@ inline bool isNullVal(uint32_t length, uint8_t type, const uint8_t* val8) case 1: return isNullVal<1>(type, val8); }; - std::cout << __func__ << " WARNING!!! Not implemented for " << length << " bytes data types." << std::endl; return false; } @@ -693,17 +676,12 @@ inline void store(const NewColRequestHeader* in, switch (in->colType.DataSize) { - case 32: - std::cout << __func__ << " WARNING!!! Not implemented for 32 byte data types." << std::endl; - break; - case 16: ptr2 += (rid << 4); memcpy(ptr1, ptr2, 16); break; default: - std::cout << __func__ << " WARNING!!! unspecified column width." << std::endl; // fallthrough case 8: @@ -1636,10 +1614,6 @@ void PrimitiveProcessor::p_Col(NewColRequestHeader* in, NewColResultHeader* out, p_Col_bin_ridArray<16, int128_t>(in, out, outSize, written, block, fStatsPtr, itemsPerBlk, parsedColumnFilter); break; - case 32: - std::cout << __func__ << " WARNING!!! Not implemented for 32 byte data types." << std::endl; - // fallthrough - default: idbassert(0); break; diff --git a/primitives/linux-port/primitiveprocessor.h b/primitives/linux-port/primitiveprocessor.h index 2d333dbfe..62e2b7dfa 100644 --- a/primitives/linux-port/primitiveprocessor.h +++ b/primitives/linux-port/primitiveprocessor.h @@ -319,7 +319,6 @@ private: int dict_OffsetIndex, currentOffsetIndex; // used by p_dictionary int fDebugLevel; dbbc::Stats* fStatsPtr; // pointer for pmstats - // To be removed b/c always true bool logicalBlockMode; boost::shared_ptr parsedColumnFilter; diff --git a/primitives/primproc/columncommand.cpp b/primitives/primproc/columncommand.cpp index 548ebe45a..1b2079258 100644 --- a/primitives/primproc/columncommand.cpp +++ b/primitives/primproc/columncommand.cpp @@ -485,8 +485,6 @@ void ColumnCommand::createCommand(ByteStream& bs) bs >> filterCount; deserializeInlineVector(bs, lastLbid); -// cout << __func__ << " colType.colWidth " << colType.colWidth << endl; - // cout << "lastLbid count=" << lastLbid.size() << endl; // for (uint32_t i = 0; i < lastLbid.size(); i++) // cout << " " << lastLbid[i]; diff --git a/utils/funcexp/func_cast.cpp b/utils/funcexp/func_cast.cpp index 35624aeef..9b35a00b5 100644 --- a/utils/funcexp/func_cast.cpp +++ b/utils/funcexp/func_cast.cpp @@ -1511,7 +1511,7 @@ double Func_cast_decimal::getDoubleVal(Row& row, isNull, operationColType); - // WIP MCOL-641 This could deliver wrong result b/c wide DECIMAL might have + // TODO MCOL-641 This could deliver wrong result b/c wide DECIMAL might have // p <= INT64MAXPRECISION || p > INT128MAXPRECISION if (decimal.isTSInt128ByPrecision()) { diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp index 27f4f42be..3c47d210a 100755 --- a/utils/rowgroup/rowaggregation.cpp +++ b/utils/rowgroup/rowaggregation.cpp @@ -338,7 +338,6 @@ void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, i inline bool RowAggregation::isNull(const RowGroup* pRowGroup, const Row& row, int64_t col) { /* TODO: Can we replace all of this with a call to row.isNullValue(col)? */ - // WIP MCOL-641 Yes. We can bool ret = false; int colDataType = (pRowGroup->getColTypes())[col]; diff --git a/utils/rowgroup/rowgroup.cpp b/utils/rowgroup/rowgroup.cpp index 927d40869..3266b257e 100644 --- a/utils/rowgroup/rowgroup.cpp +++ b/utils/rowgroup/rowgroup.cpp @@ -1023,14 +1023,13 @@ bool Row::isNullValue(uint32_t colIndex) const case CalpontSystemCatalog::DECIMAL: case CalpontSystemCatalog::UDECIMAL: { - // WIP MCOL-641 Allmighty hack. + // TODO MCOL-641 Allmighty hack. switch (getColumnWidth(colIndex)) { // MCOL-641 case 16: return isNullValue_offset (offsets[colIndex]); - case 1 : return (data[offsets[colIndex]] == joblist::TINYINTNULL); diff --git a/utils/thrift/thrift/protocol/TCompactProtocol.tcc b/utils/thrift/thrift/protocol/TCompactProtocol.tcc index 89c943a8c..62d6485d7 100644 --- a/utils/thrift/thrift/protocol/TCompactProtocol.tcc +++ b/utils/thrift/thrift/protocol/TCompactProtocol.tcc @@ -808,8 +808,6 @@ TType TCompactProtocolT::getTType(int8_t type) { case detail::compact::CT_STRUCT: return T_STRUCT; default: - - cout << __FILE__<< __LINE__ << __func__<< endl; throw TException(std::string("don't know what type: ") + (char)type); } return T_STOP; diff --git a/writeengine/server/we_ddlcommandproc.cpp b/writeengine/server/we_ddlcommandproc.cpp index 6e955c853..faa481b4c 100644 --- a/writeengine/server/we_ddlcommandproc.cpp +++ b/writeengine/server/we_ddlcommandproc.cpp @@ -455,9 +455,8 @@ uint8_t WE_DDLCommandProc::writeCreateSyscolumn(ByteStream& bs, std::string& err dataType = convertDataType(colDefPtr->fType->fType); if (dataType == CalpontSystemCatalog::DECIMAL || - dataType == CalpontSystemCatalog::UDECIMAL) + dataType == CalpontSystemCatalog::UDECIMAL) { - // WIP MCOL-641 if (colDefPtr->fType->fPrecision > 38) // precision cannot be over 38. { ostringstream os; diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp index 7f0d57f73..3355a8e66 100644 --- a/writeengine/server/we_dmlcommandproc.cpp +++ b/writeengine/server/we_dmlcommandproc.cpp @@ -149,7 +149,7 @@ uint8_t WE_DMLCommandProc::processSingleInsert(messageqcpp::ByteStream& bs, std: { DMLColumn* columnPtr = *column_iterator; tableColName.column = columnPtr->get_Name(); - // WIP MCOL-641 replace with getColRidsOidsTypes() + // TODO MCOL-641 replace with getColRidsOidsTypes() CalpontSystemCatalog::ROPair roPair = systemCatalogPtr->columnRID(tableColName); CalpontSystemCatalog::OID oid = systemCatalogPtr->lookupOID(tableColName); @@ -216,7 +216,7 @@ uint8_t WE_DMLCommandProc::processSingleInsert(messageqcpp::ByteStream& bs, std: const DMLColumn* columnPtr = rowPtr->get_ColumnAt(i); tableColName.column = columnPtr->get_Name(); - // WIP MCOL-641 remove these calls + // TODO MCOL-641 remove these calls CalpontSystemCatalog::OID oid = systemCatalogPtr->lookupOID(tableColName); CalpontSystemCatalog::ColType colType; diff --git a/writeengine/wrapper/writeengine.cpp b/writeengine/wrapper/writeengine.cpp index 66708ce63..b1cb6b2f8 100644 --- a/writeengine/wrapper/writeengine.cpp +++ b/writeengine/wrapper/writeengine.cpp @@ -3576,7 +3576,7 @@ int WriteEngineWrapper::insertColumnRec_Single(const TxnID& txnid, } bool newFile; - // WIP + #ifdef PROFILE timer.start("allocRowId"); #endif @@ -5520,9 +5520,8 @@ int WriteEngineWrapper::writeColumnRecBinary(const TxnID& txnid, ((uint16_t*)valArray)[j] = tmp16; break; - // WIP case WriteEngine::WR_BINARY: - ((uint64_t*)valArray)[j] = curValue; //FIXME maybe + ((uint64_t*)valArray)[j] = curValue; break; } @@ -5671,9 +5670,8 @@ int WriteEngineWrapper::writeColumnRecBinary(const TxnID& txnid, ((uint16_t*)valArray)[j] = tmp16; break; - // WIP case WriteEngine::WR_BINARY: - ((uint64_t*)valArray)[j] = curValue; // FIXME maybe + ((uint64_t*)valArray)[j] = curValue; break; } }