database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +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;
}

14
dbcon/execplan/calpontsystemcatalog.h
View File

@ -429,16 +429,16 @@ public:
*/
struct TableAliasName
{
TableAliasName (): fIsInfiniDB (true) {}
TableAliasName (): fisColumnStore (true) {}
TableAliasName (std::string sch, std::string tb, std::string al) :
schema (sch), table (tb), alias (al), fIsInfiniDB(true) {}
schema (sch), table (tb), alias (al), fisColumnStore(true) {}
TableAliasName (std::string sch, std::string tb, std::string al, std::string v) :
schema (sch), table (tb), alias (al), view(v), fIsInfiniDB(true) {}
schema (sch), table (tb), alias (al), view(v), fisColumnStore(true) {}
std::string schema;
std::string table;
std::string alias;
std::string view;
bool fIsInfiniDB;
bool fisColumnStore;
void clear();
bool operator<(const TableAliasName& rhs) const;
bool operator>=(const TableAliasName& rhs) const
@ -451,7 +451,7 @@ public:
table == rhs.table &&
alias == rhs.alias &&
view == rhs.view &&
fIsInfiniDB == rhs.fIsInfiniDB);
fisColumnStore == rhs.fisColumnStore);
}
bool operator!=(const TableAliasName& rhs) const
{
@ -962,8 +962,8 @@ const CalpontSystemCatalog::TableColName make_tcn(const std::string& s, const st
*/
const CalpontSystemCatalog::TableName make_table(const std::string& s, const std::string& t);
const CalpontSystemCatalog::TableAliasName make_aliastable(const std::string& s, const std::string& t, const std::string& a,
const bool fIsInfiniDB = true);
const CalpontSystemCatalog::TableAliasName make_aliasview(const std::string& s, const std::string& t, const std::string& a, const std::string& v, const bool fIsInfiniDB = true);
const bool fisColumnStore = true);
const CalpontSystemCatalog::TableAliasName make_aliasview(const std::string& s, const std::string& t, const std::string& a, const std::string& v, const bool fisColumnStore = true);
/** convenience function to determine if column type is a char
* type

8
dbcon/execplan/pseudocolumn.cpp
View File

@ -72,10 +72,10 @@ PseudoColumn::PseudoColumn(const string& schemaName,
PseudoColumn::PseudoColumn(const string& schemaName,
const string& tableName,
const string& columnName,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t pseudoType,
const uint32_t sessionID):
SimpleColumn(schemaName, tableName, columnName, isInfiniDB, sessionID),
SimpleColumn(schemaName, tableName, columnName, isColumnStore, sessionID),
fPseudoType(pseudoType)
{
adjustResultType();
@ -122,7 +122,7 @@ PseudoColumn& PseudoColumn::operator=(const PseudoColumn& rhs)
fData = rhs.data();
fSequence = rhs.sequence();
fDistinct = rhs.distinct();
fIsInfiniDB = rhs.isInfiniDB();
fisColumnStore = rhs.isColumnStore();
fPseudoType = rhs.pseudoType();
}
@ -155,7 +155,7 @@ const string PseudoColumn::toString() const
<< cardinality() << '/'
<< joinInfo() << '/'
<< colSource() << '/'
<< (isInfiniDB() ? "ColumnStore" : "ForeignEngine") << endl;
<< (isColumnStore() ? "ColumnStore" : "ForeignEngine") << endl;
output << "Pseudotype=" << fPseudoType << endl;
return output.str();

2
dbcon/execplan/pseudocolumn.h
View File

@ -78,7 +78,7 @@ public:
PseudoColumn(const std::string& schema,
const std::string& table,
const std::string& col,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t pseudoType,
const uint32_t sessionID = 0);
PseudoColumn(const SimpleColumn& rhs, const uint32_t pseudoType, const uint32_t sessionID = 0);

26
dbcon/execplan/simplecolumn.cpp
View File

@ -139,7 +139,7 @@ ParseTree* replaceRefCol(ParseTree*& n, CalpontSelectExecutionPlan::ReturnedColu
SimpleColumn::SimpleColumn():
ReturnedColumn(),
fOid (0),
fIsInfiniDB (true)
fisColumnStore (true)
{
fDistinct = false;
}
@ -148,7 +148,7 @@ SimpleColumn::SimpleColumn(const string& token, const uint32_t sessionID):
ReturnedColumn(sessionID),
fOid (0),
fData(token),
fIsInfiniDB (true)
fisColumnStore (true)
{
parse (token);
setOID();
@ -163,7 +163,7 @@ SimpleColumn::SimpleColumn(const string& schemaName,
fSchemaName (schemaName),
fTableName (tableName),
fColumnName (columnName),
fIsInfiniDB (true)
fisColumnStore (true)
{
setOID();
fDistinct = false;
@ -172,15 +172,15 @@ SimpleColumn::SimpleColumn(const string& schemaName,
SimpleColumn::SimpleColumn(const string& schemaName,
const string& tableName,
const string& columnName,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t sessionID):
ReturnedColumn(sessionID),
fSchemaName (schemaName),
fTableName (tableName),
fColumnName (columnName),
fIsInfiniDB (isInfiniDB)
fisColumnStore (isColumnStore)
{
if (isInfiniDB)
if (isColumnStore)
setOID();
fDistinct = false;
@ -197,7 +197,7 @@ SimpleColumn::SimpleColumn (const SimpleColumn& rhs, const uint32_t sessionID):
fIndexName (rhs.indexName()),
fViewName (rhs.viewName()),
fTimeZone (rhs.timeZone()),
fIsInfiniDB (rhs.isInfiniDB())
fisColumnStore (rhs.isColumnStore())
{
}
@ -234,7 +234,7 @@ SimpleColumn& SimpleColumn::operator=(const SimpleColumn& rhs)
fData = rhs.data();
fSequence = rhs.sequence();
fDistinct = rhs.distinct();
fIsInfiniDB = rhs.isInfiniDB();
fisColumnStore = rhs.isColumnStore();
}
return *this;
@ -264,7 +264,7 @@ const string SimpleColumn::toString() const
<< cardinality() << '/'
<< joinInfo() << '/'
<< colSource() << '/'
<< (isInfiniDB() ? "ColumnStore" : "ForeignEngine") << '/'
<< (isColumnStore() ? "ColumnStore" : "ForeignEngine") << '/'
<< colPosition() << endl;
return output.str();
@ -352,7 +352,7 @@ void SimpleColumn::serialize(messageqcpp::ByteStream& b) const
b << fData;
b << fTableAlias;
b << (uint32_t) fSequence;
b << static_cast<const ByteStream::doublebyte>(fIsInfiniDB);
b << static_cast<const ByteStream::doublebyte>(fisColumnStore);
}
void SimpleColumn::unserialize(messageqcpp::ByteStream& b)
@ -369,7 +369,7 @@ void SimpleColumn::unserialize(messageqcpp::ByteStream& b)
b >> fData;
b >> fTableAlias;
b >> (uint32_t&) fSequence;
b >> reinterpret_cast< ByteStream::doublebyte&>(fIsInfiniDB);
b >> reinterpret_cast< ByteStream::doublebyte&>(fisColumnStore);
}
bool SimpleColumn::operator==(const SimpleColumn& t) const
@ -412,7 +412,7 @@ bool SimpleColumn::operator==(const SimpleColumn& t) const
if (fReturnAll != t.fReturnAll)
return false;
if (fIsInfiniDB != t.fIsInfiniDB)
if (fisColumnStore != t.fisColumnStore)
return false;
return true;
@ -452,7 +452,7 @@ bool SimpleColumn::sameColumn(const ReturnedColumn* rc) const
fColumnName.compare(sc->columnName()) == 0 &&
fTableAlias.compare(sc->tableAlias()) == 0 &&
fViewName.compare(sc->viewName()) == 0 &&
fIsInfiniDB == sc->isInfiniDB());
fisColumnStore == sc->isColumnStore());
}
void SimpleColumn::setDerivedTable()

12
dbcon/execplan/simplecolumn.h
View File

@ -70,7 +70,7 @@ public:
SimpleColumn(const std::string& schema,
const std::string& table,
const std::string& col,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t sessionID = 0);
SimpleColumn(const SimpleColumn& rhs, const uint32_t sessionID = 0);
@ -160,13 +160,13 @@ public:
{
fTimeZone = timeZone;
}
inline const bool isInfiniDB() const
inline const bool isColumnStore() const
{
return fIsInfiniDB;
return fisColumnStore;
}
inline void isInfiniDB(const bool isInfiniDB)
inline void isColumnStore(const bool isColumnStore)
{
fIsInfiniDB = isInfiniDB;
fisColumnStore = isColumnStore;
}
/** return a copy of this pointer
@ -261,7 +261,7 @@ protected:
// if belong to view, view name is non-empty
std::string fViewName;
std::string fTimeZone;
bool fIsInfiniDB;
bool fisColumnStore;
/** @brief parse SimpleColumn text
*

6
dbcon/execplan/simplecolumn_decimal.h
View File

@ -60,7 +60,7 @@ public:
SimpleColumn_Decimal(const std::string& schema,
const std::string& table,
const std::string& col,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t sessionID = 0);
SimpleColumn_Decimal(const SimpleColumn& rhs, const uint32_t sessionID = 0);
@ -107,9 +107,9 @@ template<int len>
SimpleColumn_Decimal<len>::SimpleColumn_Decimal(const std::string& schema,
const std::string& table,
const std::string& col,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t sessionID) :
SimpleColumn(schema, table, col, isInfiniDB, sessionID)
SimpleColumn(schema, table, col, isColumnStore, sessionID)
{
setNullVal();
}

6
dbcon/execplan/simplecolumn_int.h
View File

@ -58,7 +58,7 @@ public:
SimpleColumn_INT(const std::string& schema,
const std::string& table,
const std::string& col,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t sessionID = 0);
SimpleColumn_INT(const SimpleColumn& rhs, const uint32_t sessionID = 0);
@ -106,9 +106,9 @@ template<int len>
SimpleColumn_INT<len>::SimpleColumn_INT(const std::string& schema,
const std::string& table,
const std::string& col,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t sessionID) :
SimpleColumn(schema, table, col, isInfiniDB, sessionID)
SimpleColumn(schema, table, col, isColumnStore, sessionID)
{
setNullVal();
}

6
dbcon/execplan/simplecolumn_uint.h
View File

@ -58,7 +58,7 @@ public:
SimpleColumn_UINT(const std::string& schema,
const std::string& table,
const std::string& col,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t sessionID = 0);
SimpleColumn_UINT(const SimpleColumn& rhs, const uint32_t sessionID = 0);
@ -106,9 +106,9 @@ template<int len>
SimpleColumn_UINT<len>::SimpleColumn_UINT(const std::string& schema,
const std::string& table,
const std::string& col,
const bool isInfiniDB,
const bool isColumnStore,
const uint32_t sessionID) :
SimpleColumn(schema, table, col, isInfiniDB, sessionID)
SimpleColumn(schema, table, col, isColumnStore, sessionID)
{
setNullVal();
}