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

MCOL-1531 Remove commented fields from equality functions

Browse Source
This commit is contained in:
David Hall
2018-07-24 09:10:46 -05:00
parent 11d2094089
commit ec9069853e
6 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/execplan/aggregatecolumn.cpp
View File

@ -260,8 +260,6 @@ bool AggregateColumn::operator==(const AggregateColumn& t) const
} }
else if (fFunctionParms.get() != NULL || t.fFunctionParms.get() != NULL) else if (fFunctionParms.get() != NULL || t.fFunctionParms.get() != NULL)
return false; return false;
//if (fAlias != t.fAlias)
// return false;
if (fTableAlias != t.fTableAlias) if (fTableAlias != t.fTableAlias)
return false; return false;
if (fData != t.fData) if (fData != t.fData)

4
dbcon/execplan/arithmeticcolumn.cpp
View File

@ -345,10 +345,6 @@ bool ArithmeticColumn::operator==(const ArithmeticColumn& t) const
} }
else if (fExpression != NULL || t.fExpression != NULL) else if (fExpression != NULL || t.fExpression != NULL)
return false; return false;
// if (fAlias != t.fAlias)
// return false;
// if (fTableAlias != t.fTableAlias)
// return false;
if (fData != t.fData) if (fData != t.fData)
return false; return false;
return true; return true;

2
dbcon/execplan/constantcolumn.cpp
View File

@ -316,8 +316,6 @@ bool ConstantColumn::operator==(const ConstantColumn& t) const
return false; return false;
if (fType != t.fType) if (fType != t.fType)
return false; return false;
// if (fAlias != t.fAlias)
// return false;
if (fData != t.fData) if (fData != t.fData)
return false; return false;
if (fReturnAll != t.fReturnAll) if (fReturnAll != t.fReturnAll)

2
dbcon/execplan/functioncolumn.cpp
View File

@ -309,8 +309,6 @@ bool FunctionColumn::operator==(const FunctionColumn& t) const
++it, ++it2) ++it, ++it2)
if (**it != **it2) if (**it != **it2)
return false; return false;
// if (fAlias != t.fAlias)
// return false;
if (fTableAlias != t.fTableAlias) if (fTableAlias != t.fTableAlias)
return false; return false;
if (fData != t.fData) if (fData != t.fData)

9
dbcon/execplan/returnedcolumn.cpp
View File

@ -173,12 +173,11 @@ void ReturnedColumn::unserialize(messageqcpp::ByteStream& b)
bool ReturnedColumn::operator==(const ReturnedColumn& t) const bool ReturnedColumn::operator==(const ReturnedColumn& t) const
{ {
// Not all fields are considered for a positive equality.
if (fData != t.fData) if (fData != t.fData)
return false; return false;
if (fCardinality != t.fCardinality) if (fCardinality != t.fCardinality)
return false; return false;
//if (fAlias != t.fAlias)
// return false;
if (fDistinct != t.fDistinct) if (fDistinct != t.fDistinct)
return false; return false;
if (fJoinInfo != t.fJoinInfo) if (fJoinInfo != t.fJoinInfo)
@ -187,20 +186,14 @@ bool ReturnedColumn::operator==(const ReturnedColumn& t) const
return false; return false;
if (fNullsFirst != t.fNullsFirst) if (fNullsFirst != t.fNullsFirst)
return false; return false;
//if (fOrderPos != t.fOrderPos)
// return false;
if (fInputIndex != t.fInputIndex) if (fInputIndex != t.fInputIndex)
return false; return false;
if (fOutputIndex != t.fOutputIndex) if (fOutputIndex != t.fOutputIndex)
return false; return false;
//if (fSequence != t.fSequence)
// return false;
if (fResultType != t.fResultType) if (fResultType != t.fResultType)
return false; return false;
if (fOperationType != t.fOperationType) if (fOperationType != t.fOperationType)
return false; return false;
//if (fExpressionId != t.fExpressionId)
// return false;
return true; return true;
} }

6
dbcon/execplan/simplecolumn.cpp
View File

@ -333,7 +333,6 @@ void SimpleColumn::serialize(messageqcpp::ByteStream& b) const
b << fViewName; b << fViewName;
b << (uint32_t) fOid; b << (uint32_t) fOid;
b << fData; b << fData;
//b << fAlias;
b << fTableAlias; b << fTableAlias;
b << (uint32_t) fSequence; b << (uint32_t) fSequence;
b << static_cast<const ByteStream::doublebyte>(fIsInfiniDB); b << static_cast<const ByteStream::doublebyte>(fIsInfiniDB);
@ -350,7 +349,6 @@ void SimpleColumn::unserialize(messageqcpp::ByteStream& b)
b >> fViewName; b >> fViewName;
b >> (uint32_t&) fOid; b >> (uint32_t&) fOid;
b >> fData; b >> fData;
//b >> fAlias;
b >> fTableAlias; b >> fTableAlias;
b >> (uint32_t&) fSequence; b >> (uint32_t&) fSequence;
b >> reinterpret_cast< ByteStream::doublebyte&>(fIsInfiniDB); b >> reinterpret_cast< ByteStream::doublebyte&>(fIsInfiniDB);
@ -370,16 +368,12 @@ bool SimpleColumn::operator==(const SimpleColumn& t) const
return false; return false;
if (fColumnName != t.fColumnName) if (fColumnName != t.fColumnName)
return false; return false;
// if (fIndexName != t.fIndexName)
// return false;
if (fViewName != t.fViewName) if (fViewName != t.fViewName)
return false; return false;
if (fOid != t.fOid) if (fOid != t.fOid)
return false; return false;
if (data() != t.data()) if (data() != t.data())
return false; return false;
// if (fAlias != t.fAlias)
// return false;
if (fTableAlias != t.fTableAlias) if (fTableAlias != t.fTableAlias)
return false; return false;
if (fAsc != t.fAsc) if (fAsc != t.fAsc)