Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/backend/gporca/libgpopt/include/gpopt/base/CCTEInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@ class CCTEInfo : public CRefCount
{
m_ulCount++;
}

void
Decrement()
{
GPOS_ASSERT(m_ulCount > 1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why GPOS_ASSERT(m_ulCount > 1);?

m_ulCount--;
GPOS_ASSERT(m_ulCount > 0);
}

};

// hash map mapping ULONG -> SConsumerCounter
Expand Down Expand Up @@ -283,6 +292,10 @@ class CCTEInfo : public CRefCount
void IncrementConsumers(ULONG ulConsumerId,
ULONG ulParentCTEId = gpos::ulong_max);

// decrement number of CTE consumers
void DecrementConsumers(ULONG ulConsumerId,
ULONG ulParentCTEId = gpos::ulong_max);

// add cte producer to hashmap
void AddCTEProducer(CExpression *pexprCTEProducer);

Expand Down
22 changes: 22 additions & 0 deletions src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,28 @@ CCTEInfo::IncrementConsumers(ULONG ulConsumerId, ULONG ulParentCTEId)
}
}

//---------------------------------------------------------------------------
// @function:
// CCTEInfo::IncrementConsumers
//
// @doc:
// Decrement number of CTE consumers
//
//---------------------------------------------------------------------------
void
CCTEInfo::DecrementConsumers(ULONG ulConsumerId, ULONG ulParentCTEId)
{
UlongToConsumerCounterMap *phmulconsumermap =
m_phmulprodconsmap->Find(&ulParentCTEId);

GPOS_ASSERT(nullptr != phmulconsumermap);

SConsumerCounter *pconsumercounter = phmulconsumermap->Find(&ulConsumerId);
GPOS_ASSERT(nullptr != pconsumercounter);

pconsumercounter->Decrement();
}


//---------------------------------------------------------------------------
// @function:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ CDedupSupersetPreprocessor::ChildExprFullSuperset(CMemoryPool *mp,
}
CColRefSet *colrefsets = pexpr_child0->DeriveOutputColumns();

// The colref(in CScalarSubqueryAny) must in the output
// The colref(in CScalarSubqueryAny) must in the output
// FIXME: do not use index, it does not follow ORCA design principle
(void) colrefsets->ExtractIndex(pop_subany->Pcr(), &ulidx_subany);
GPOS_ASSERT(ulidx_subany != gpos::ulong_max);

Expand Down Expand Up @@ -519,6 +520,23 @@ CDedupSupersetPreprocessor::PexprPreprocess(CMemoryPool *mp, CExpression *pexpr)
{
if (!dedupulmasks[ul])
{
if (COperator::EopScalarSubqueryAny == (*pexpr)[ul]->Pop()->Eopid())
{
CExpression *pdrgpexprSubqueryAny = (*pexpr)[ul];
CExpression *pdrgpexpr = (*pdrgpexprSubqueryAny)[0];

// remove the CTE consumer from CTEINFO
if (COperator::EopLogicalCTEConsumer == pdrgpexpr->Pop()->Eopid())
{
CCTEInfo *pcteinfo =
COptCtxt::PoctxtFromTLS()->Pcteinfo();
CLogicalCTEConsumer *pop =
CLogicalCTEConsumer::PopConvert(pdrgpexpr->Pop());

pcteinfo->DecrementConsumers(pop->UlCTEId());
}
}

continue;
}

Expand All @@ -534,7 +552,6 @@ CDedupSupersetPreprocessor::PexprPreprocess(CMemoryPool *mp, CExpression *pexpr)

return GPOS_NEW(mp) CExpression(mp, pop, pdrgpexprChildren);
}
// FIXME: should we consider remove the CTE consumer from CTEINFO?

const ULONG arity = pexpr->Arity();
CExpressionArray *pdrgpexprChildren = GPOS_NEW(mp) CExpressionArray(mp);
Expand Down
Loading
Loading