Fix core dump generated by "ORCA support ext stats, Fix EPQ..."

There are two parts in the current cherry-pick that need to be adapted:

 1. In CBDB, the `rel->rd_partdesc` cannot be used as a basis for
determining that current table is a partition table or not.
 2. `get_relation_statistics` implementation has changed.

Author: jiaqizho

src/backend/gpopt/gpdbwrappers.cpp

@@ -870,6 +870,17 @@ gpdb::GetRelationPartitionKey(Relation rel)
 	return nullptr;
 }
 
+PartitionDesc
+gpdb::RelationGetPartitionDesc(Relation rel, bool omit_detached)
+{
+	GP_WRAP_START;
+	{
+		return ::RelationGetPartitionDesc(rel, omit_detached);
+	}
+	GP_WRAP_END;
+	return nullptr;
+}
+
 bool
 gpdb::GetCastFunc(Oid src_oid, Oid dest_oid, bool *is_binary_coercible,
 				  Oid *cast_fn_oid, CoercionPathType *pathtype)

src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp

@@ -72,7 +72,7 @@ CPartPruneStepsBuilder::CreatePartPruneInfoForOneLevel(CDXLNode *filterNode)
 	PartitionedRelPruneInfo *pinfo = MakeNode(PartitionedRelPruneInfo);
 	pinfo->rtindex = m_rtindex;
 
-	pinfo->nparts = RelationGetPartitionDesc(m_relation, true)->nparts;
+	pinfo->nparts = gpdb::RelationGetPartitionDesc(m_relation, true)->nparts;
 
 	pinfo->subpart_map = (int *) palloc(sizeof(int) * pinfo->nparts);
 	pinfo->subplan_map = (int *) palloc(sizeof(int) * pinfo->nparts);
@@ -90,7 +90,7 @@ CPartPruneStepsBuilder::CreatePartPruneInfoForOneLevel(CDXLNode *filterNode)
 		{
 			// partition did survive pruning
 			pinfo->subplan_map[i] = part_ptr;
-			pinfo->relid_map[i] = RelationGetPartitionDesc(m_relation, true)->oids[i];
+			pinfo->relid_map[i] = gpdb::RelationGetPartitionDesc(m_relation, true)->oids[i];
 			pinfo->present_parts = bms_add_member(pinfo->present_parts, i);
 			++part_ptr;
 		}

src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp

@@ -320,7 +320,7 @@ CTranslatorRelcacheToDXL::RetrieveRelCheckConstraints(CMemoryPool *mp, OID oid)
 void
 CTranslatorRelcacheToDXL::CheckUnsupportedRelation(Relation rel)
 {
-	if (!rel->rd_partdesc && gpdb::HasSubclassSlow(rel->rd_id))
+	if (!gpdb::RelationGetPartitionDesc(rel, true) && gpdb::HasSubclassSlow(rel->rd_id))
 	{
 		GPOS_RAISE(gpdxl::ExmaMD, gpdxl::ExmiMDObjUnsupported,
 				   GPOS_WSZ_LIT("Inherited tables"));
@@ -374,11 +374,10 @@ CTranslatorRelcacheToDXL::RetrieveExtStats(CMemoryPool *mp, IMDId *mdid)
 
 			CBitSet *attnos = GPOS_NEW(mp) CBitSet(mp);
 
-			int attno = -1;
-			while ((attno = bms_next_member(item.attrs, attno)) >= 0)
-			{
-				attnos->ExchangeSet(attno);
+			for (int item_idx = 0; item_idx < item.nattributes; item_idx++) {
+				attnos->ExchangeSet(item.attributes[item_idx]);
 			}
+
 			md_ndistincts->Append(GPOS_NEW(mp)
 									  CMDNDistinct(mp, item.ndistinct, attnos));
 		}
@@ -552,17 +551,18 @@ CTranslatorRelcacheToDXL::RetrieveRel(CMemoryPool *mp, CMDAccessor *md_accessor,
 	is_partitioned = (nullptr != part_keys && 0 < part_keys->Size());
 
 	// get number of leaf partitions
-	if (rel->rd_partdesc)
+	PartitionDesc part_desc = gpdb::RelationGetPartitionDesc(rel.get(), true);
+	if (part_desc)
 	{
 		partition_oids = GPOS_NEW(mp) IMdIdArray(mp);
 
-		for (int i = 0; i < RelationGetPartitionDesc(rel.get(), true)->nparts; ++i)
+		for (int i = 0; i < part_desc->nparts; ++i)
 		{
-			Oid oid = RelationGetPartitionDesc(rel.get(), true)->oids[i];
+			Oid oid = part_desc->oids[i];
 			partition_oids->Append(GPOS_NEW(mp)
 									   CMDIdGPDB(IMDId::EmdidRel, oid));
 			gpdb::RelationWrapper rel_part = gpdb::GetRelation(oid);
-			if (rel_part->rd_partdesc)
+			if (gpdb::RelationGetPartitionDesc(rel_part.get(), true))
 			{
 				// Multi-level partitioned tables are unsupported - fall back
 				GPOS_RAISE(gpdxl::ExmaMD, gpdxl::ExmiMDObjUnsupported,
@@ -3007,13 +3007,13 @@ CTranslatorRelcacheToDXL::RetrieveStorageTypeForPartitionedTable(Relation rel)
 	// causes gporca generate another query plan. The problem is that the CWorkerPoolManager
 	// holds a static worker pointer, executing gporca nestly is not supported now.
 	// See CWorkerPoolManager::RegisterWorker()
-	if (RelationGetPartitionDesc(rel, true)->nparts == 0)
+	if (gpdb::RelationGetPartitionDesc(rel, true)->nparts == 0)
 	{
 		return IMDRelation::ErelstorageHeap;
 	}
-	for (int i = 0; i < RelationGetPartitionDesc(rel, true)->nparts; ++i)
+	for (int i = 0; i < gpdb::RelationGetPartitionDesc(rel, true)->nparts; ++i)
 	{
-		Oid oid = RelationGetPartitionDesc(rel, true)->oids[i];
+		Oid oid = gpdb::RelationGetPartitionDesc(rel, true)->oids[i];
 		gpdb::RelationWrapper child_rel = gpdb::GetRelation(oid);
 		IMDRelation::Erelstoragetype child_storage =
 			RetrieveRelStorageType(child_rel.get());

src/backend/nodes/readfuncs.c

@@ -2382,14 +2382,6 @@ ReadCommonSort(Sort *local_node)
 	READ_BOOL_ARRAY(nullsFirst, local_node->numCols);
 }
 
-static void
-ReadSort(Sort *local_node)
-{
-	READ_TEMP_LOCALS();
-
-	ReadCommonSort(local_node);
-}
-
 /*
  * _readSort
  */
@@ -2398,7 +2390,7 @@ _readSort(void)
 {
 	READ_LOCALS_NO_FIELDS(Sort);
 
-	ReadSort(local_node);
+	ReadCommonSort(local_node);
 
 	READ_DONE();
 }
@@ -2411,7 +2403,7 @@ _readIncrementalSort(void)
 {
 	READ_LOCALS(IncrementalSort);
 
-	ReadSort(&local_node->sort);
+	ReadCommonSort(&local_node->sort);
 
 	READ_INT_FIELD(nPresortedCols);
 

src/backend/optimizer/util/plancat.c

@@ -1620,7 +1620,7 @@ GetRelationExtStatistics(Relation relation)
 static List *
 get_relation_statistics(RelOptInfo *rel, Relation relation)
 {
-	Index		varno = rel->relid;
+	Index		varno = rel ? rel->relid : 0;
 	List	   *statoidlist;
 	List	   *stainfos = NIL;
 	ListCell   *l;
@@ -1658,7 +1658,7 @@ get_relation_statistics(RelOptInfo *rel, Relation relation)
 		 * Preprocess expressions (if any). We read the expressions, run them
 		 * through eval_const_expressions, and fix the varnos.
 		 */
-		{
+		if (rel) {
 			bool		isnull;
 			Datum		datum;
 

src/include/gpopt/gpdbwrappers.h

@@ -516,6 +516,8 @@ void BuildRelationTriggers(Relation rel);
 
 PartitionKey GetRelationPartitionKey(Relation rel);
 
+PartitionDesc RelationGetPartitionDesc(Relation rel, bool omit_detached);
+
 MVNDistinct *GetMVNDistinct(Oid stat_oid);
 
 MVDependencies *GetMVDependencies(Oid stat_oid);