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

MCOL-104 First pass of InfiniDB rename in code

Browse Source
This commit is contained in:
Andrew Hutchings
2019-08-12 09:41:28 +01:00
parent 7b006b6e74
commit 9d83b49fca
35 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -269,28 +269,28 @@ const CalpontSystemCatalog::TableName make_table(const string& s, const string&
return tn;
}
const CalpontSystemCatalog::TableAliasName make_aliastable(const string& s, const string& t, const string& a, const bool isInfiniDB)
const CalpontSystemCatalog::TableAliasName make_aliastable(const string& s, const string& t, const string& a, const bool isColumnStore)
{
CalpontSystemCatalog::TableAliasName tn;
tn.schema = s;
tn.table = t;
tn.alias = a;
tn.view = "";
tn.fIsInfiniDB = isInfiniDB;
tn.fisColumnStore = isColumnStore;
transform (tn.schema.begin(), tn.schema.end(), tn.schema.begin(), to_lower());
transform (tn.table.begin(), tn.table.end(), tn.table.begin(), to_lower());
transform (tn.alias.begin(), tn.alias.end(), tn.alias.begin(), to_lower());
return tn;
}
const CalpontSystemCatalog::TableAliasName make_aliasview(const string& s, const string& t, const string& a, const string& v, const bool isInfiniDB)
const CalpontSystemCatalog::TableAliasName make_aliasview(const string& s, const string& t, const string& a, const string& v, const bool isColumnStore)
{
CalpontSystemCatalog::TableAliasName tn;
tn.schema = s;
tn.table = t;
tn.alias = a;
tn.view = v;
tn.fIsInfiniDB = isInfiniDB;
tn.fisColumnStore = isColumnStore;
transform (tn.schema.begin(), tn.schema.end(), tn.schema.begin(), to_lower());
transform (tn.table.begin(), tn.table.end(), tn.table.begin(), to_lower());
transform (tn.alias.begin(), tn.alias.end(), tn.alias.begin(), to_lower());
@ -380,7 +380,7 @@ bool CalpontSystemCatalog::TableAliasName::operator<(const TableAliasName& rhs)
}
else if (view == rhs.view)
{
if (fIsInfiniDB < rhs.fIsInfiniDB)
if (fisColumnStore < rhs.fisColumnStore)
return true;
}
}
@ -396,7 +396,7 @@ void CalpontSystemCatalog::TableAliasName::serialize(messageqcpp::ByteStream& b)
b << table;
b << alias;
b << view;
b << static_cast<const ByteStream::doublebyte>(fIsInfiniDB);
b << static_cast<const ByteStream::doublebyte>(fisColumnStore);
}
void CalpontSystemCatalog::TableAliasName::unserialize(messageqcpp::ByteStream& b)
@ -405,7 +405,7 @@ void CalpontSystemCatalog::TableAliasName::unserialize(messageqcpp::ByteStream&
b >> table;
b >> alias;
b >> view;
b >> reinterpret_cast< ByteStream::doublebyte&>(fIsInfiniDB);
b >> reinterpret_cast< ByteStream::doublebyte&>(fisColumnStore);
}
/*static*/
@ -5649,7 +5649,7 @@ const string CalpontSystemCatalog::TableName::toString() const
ostream& operator<<(ostream& os, const CalpontSystemCatalog::TableAliasName& rhs)
{
os << rhs.schema << '.' << rhs.table << "(" << rhs.alias << "/" << rhs.view
<< ") engineType=" << (rhs.fIsInfiniDB ? "ColumnStore" : "ForeignEngine");
<< ") engineType=" << (rhs.fisColumnStore ? "ColumnStore" : "ForeignEngine");
return os;
}