database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #1613 from tntnatbry/MCOL-641-alter-table-fix

Browse Source 
MCOL-641 Fix alter table add wide decimal column.
This commit is contained in:
Roman Nozdrin
2020-11-26 18:17:01 +03:00
committed by GitHub
parent b106daacb7 995cadef2d
commit 454ec4be99
32 changed files with 62 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -227,10 +227,6 @@ const string colDataTypeToString(CalpontSystemCatalog::ColDataType cdt)
return "udouble";
break;
case CalpontSystemCatalog::BINARY:
return "binary";
break;
default:
break;
}

7
dbcon/execplan/calpontsystemcatalog.h
View File

@ -1076,13 +1076,6 @@ inline bool isNull(int64_t val, const execplan::CalpontSystemCatalog::ColType& c
break;
}
case execplan::CalpontSystemCatalog::BINARY:
{
ret = false;
break;
}
default:
break;
}

9
dbcon/execplan/simplecolumn.cpp
View File

@ -703,15 +703,6 @@ void SimpleColumn::evaluate(Row& row, bool& isNull)
break;
}
case CalpontSystemCatalog::BINARY:
{
// WIP MCOL-641 Binary representation could contain \0.
std::string value(row.getBinaryField<char>(fInputIndex));
fResult.strVal.swap(value);
break;
}
default: // treat as int64
{
fResult.intVal = row.getUintField<8>(fInputIndex);

2
dbcon/execplan/simplefilter.cpp
View File

@ -219,7 +219,6 @@ const string SimpleFilter::data() const
fRhs->resultType().colDataType == CalpontSystemCatalog::DATE ||
fRhs->resultType().colDataType == CalpontSystemCatalog::DATETIME ||
fRhs->resultType().colDataType == CalpontSystemCatalog::TIMESTAMP ||
fRhs->resultType().colDataType == CalpontSystemCatalog::BINARY ||
fRhs->resultType().colDataType == CalpontSystemCatalog::TIME))
rhs = "'" + SimpleFilter::escapeString(fRhs->data()) + "'";
else
@ -234,7 +233,6 @@ const string SimpleFilter::data() const
fLhs->resultType().colDataType == CalpontSystemCatalog::DATE ||
fLhs->resultType().colDataType == CalpontSystemCatalog::TIME ||
fLhs->resultType().colDataType == CalpontSystemCatalog::TIMESTAMP ||
fLhs->resultType().colDataType == CalpontSystemCatalog::BINARY ||
fLhs->resultType().colDataType == CalpontSystemCatalog::DATETIME))
lhs = "'" + SimpleFilter::escapeString(fLhs->data()) + "'";
else

5
dbcon/execplan/treenode.h
View File

@ -666,10 +666,6 @@ inline const std::string& TreeNode::getStrVal(const std::string& timeZone)
break;
}
case CalpontSystemCatalog::BINARY:
{
break;
}
default:
throw logging::InvalidConversionExcept("TreeNode::getStrVal: Invalid conversion.");
}
@ -1027,7 +1023,6 @@ inline IDB_Decimal TreeNode::getDecimalVal()
case CalpontSystemCatalog::VARBINARY:
case CalpontSystemCatalog::BLOB:
case CalpontSystemCatalog::BINARY:
throw logging::InvalidConversionExcept("TreeNode::getDecimalVal: non-support conversion from binary string");
case CalpontSystemCatalog::BIGINT: