diff --git a/dbcon/execplan/aggregatecolumn.cpp b/dbcon/execplan/aggregatecolumn.cpp index b6262f998..da50c983d 100644 --- a/dbcon/execplan/aggregatecolumn.cpp +++ b/dbcon/execplan/aggregatecolumn.cpp @@ -260,8 +260,6 @@ bool AggregateColumn::operator==(const AggregateColumn& t) const } else if (fFunctionParms.get() != NULL || t.fFunctionParms.get() != NULL) return false; - //if (fAlias != t.fAlias) - // return false; if (fTableAlias != t.fTableAlias) return false; if (fData != t.fData) diff --git a/dbcon/execplan/arithmeticcolumn.cpp b/dbcon/execplan/arithmeticcolumn.cpp index 2c2eb5ace..4306f3191 100644 --- a/dbcon/execplan/arithmeticcolumn.cpp +++ b/dbcon/execplan/arithmeticcolumn.cpp @@ -345,10 +345,6 @@ bool ArithmeticColumn::operator==(const ArithmeticColumn& t) const } else if (fExpression != NULL || t.fExpression != NULL) return false; -// if (fAlias != t.fAlias) -// return false; -// if (fTableAlias != t.fTableAlias) -// return false; if (fData != t.fData) return false; return true; diff --git a/dbcon/execplan/constantcolumn.cpp b/dbcon/execplan/constantcolumn.cpp index fadd2dfc9..04caafc9c 100644 --- a/dbcon/execplan/constantcolumn.cpp +++ b/dbcon/execplan/constantcolumn.cpp @@ -316,8 +316,6 @@ bool ConstantColumn::operator==(const ConstantColumn& t) const return false; if (fType != t.fType) return false; -// if (fAlias != t.fAlias) -// return false; if (fData != t.fData) return false; if (fReturnAll != t.fReturnAll) diff --git a/dbcon/execplan/functioncolumn.cpp b/dbcon/execplan/functioncolumn.cpp index 2316557ac..f7467f40f 100644 --- a/dbcon/execplan/functioncolumn.cpp +++ b/dbcon/execplan/functioncolumn.cpp @@ -309,8 +309,6 @@ bool FunctionColumn::operator==(const FunctionColumn& t) const ++it, ++it2) if (**it != **it2) return false; -// if (fAlias != t.fAlias) -// return false; if (fTableAlias != t.fTableAlias) return false; if (fData != t.fData) diff --git a/dbcon/execplan/returnedcolumn.cpp b/dbcon/execplan/returnedcolumn.cpp index f3b7f9a10..d78817f06 100644 --- a/dbcon/execplan/returnedcolumn.cpp +++ b/dbcon/execplan/returnedcolumn.cpp @@ -173,12 +173,11 @@ void ReturnedColumn::unserialize(messageqcpp::ByteStream& b) bool ReturnedColumn::operator==(const ReturnedColumn& t) const { + // Not all fields are considered for a positive equality. if (fData != t.fData) return false; if (fCardinality != t.fCardinality) return false; - //if (fAlias != t.fAlias) - // return false; if (fDistinct != t.fDistinct) return false; if (fJoinInfo != t.fJoinInfo) @@ -187,20 +186,14 @@ bool ReturnedColumn::operator==(const ReturnedColumn& t) const return false; if (fNullsFirst != t.fNullsFirst) return false; - //if (fOrderPos != t.fOrderPos) - // return false; if (fInputIndex != t.fInputIndex) return false; if (fOutputIndex != t.fOutputIndex) return false; - //if (fSequence != t.fSequence) - // return false; if (fResultType != t.fResultType) return false; if (fOperationType != t.fOperationType) return false; - //if (fExpressionId != t.fExpressionId) - // return false; return true; } diff --git a/dbcon/execplan/simplecolumn.cpp b/dbcon/execplan/simplecolumn.cpp index 895334fc9..34eb4c919 100644 --- a/dbcon/execplan/simplecolumn.cpp +++ b/dbcon/execplan/simplecolumn.cpp @@ -333,7 +333,6 @@ void SimpleColumn::serialize(messageqcpp::ByteStream& b) const b << fViewName; b << (uint32_t) fOid; b << fData; - //b << fAlias; b << fTableAlias; b << (uint32_t) fSequence; b << static_cast(fIsInfiniDB); @@ -350,7 +349,6 @@ void SimpleColumn::unserialize(messageqcpp::ByteStream& b) b >> fViewName; b >> (uint32_t&) fOid; b >> fData; - //b >> fAlias; b >> fTableAlias; b >> (uint32_t&) fSequence; b >> reinterpret_cast< ByteStream::doublebyte&>(fIsInfiniDB); @@ -370,16 +368,12 @@ bool SimpleColumn::operator==(const SimpleColumn& t) const return false; if (fColumnName != t.fColumnName) return false; -// if (fIndexName != t.fIndexName) -// return false; if (fViewName != t.fViewName) return false; if (fOid != t.fOid) return false; if (data() != t.data()) return false; -// if (fAlias != t.fAlias) -// return false; if (fTableAlias != t.fTableAlias) return false; if (fAsc != t.fAsc)