clean code

revert CDistributionSpecRandom.cpp

Author: yjhjstz

src/backend/gpopt/gpdbwrappers.cpp

@@ -2732,7 +2732,6 @@ gpdb::IsParallelModeOK(void)
 {
 	GP_WRAP_START;
 	{
-		// Basic GUC checks similar to PostgreSQL planner
 		if (!enable_parallel)
 			return false;
 
@@ -2742,37 +2741,21 @@ gpdb::IsParallelModeOK(void)
 		if (max_parallel_workers_per_gather <= 0)
 			return false;
 
-		// Check if we're in a parallel worker
-		if (!IsParallelPlansEnabled())
-			return false;
-
-		return true;
-	}
-	GP_WRAP_END;
-	return false;
-}
-
-bool
-gpdb::IsParallelPlansEnabled(void)
-{
-	GP_WRAP_START;
-	{
-		// Get from current optimizer context
+		// Check if parallel plans are enabled in current optimizer context
 		gpopt::COptCtxt *poctxt = gpopt::COptCtxt::PoctxtFromTLS();
 		if (nullptr != poctxt)
 		{
 			gpopt::COptimizerConfig *optimizer_config = poctxt->GetOptimizerConfig();
 			if (nullptr != optimizer_config)
 			{
-				return optimizer_config->CreateParallelPlan();
+				if (!optimizer_config->CreateParallelPlan())
+					return false;
 			}
 		}
-		return false;  // default to disabled if no context
+		return true;
 	}
 	GP_WRAP_END;
-	return false;
+	return false;  // default to disabled if no context
 }
 
-
-
 // EOF

src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp

@@ -47,7 +47,6 @@ using namespace gpdbcost;
 
 // Forward declare PostgreSQL GUC variables
 extern double parallel_setup_cost;
-extern double parallel_tuple_cost;
 
 //---------------------------------------------------------------------------
 //	@function:

src/backend/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp

@@ -54,7 +54,6 @@ CDistributionSpecRandom::CDistributionSpecRandom(CColRef *gp_segment_id_)
 	}
 }
 
-
 //---------------------------------------------------------------------------
 //	@function:
 //		CDistributionSpecRandom::Matches
@@ -117,15 +116,11 @@ CDistributionSpecRandom::FSatisfies(const CDistributionSpec *pds) const
 		return true;
 	}
 
-	// Regular segment-level satisfaction logic
-	if (EdtRandom == pds->Edt())
+	if (EdtRandom == pds->Edt() &&
+		(IsDuplicateSensitive() ||
+		 !CDistributionSpecRandom::PdsConvert(pds)->IsDuplicateSensitive()))
 	{
-		const CDistributionSpecRandom *pdsRandom = CDistributionSpecRandom::PdsConvert(pds);
-
-		if (IsDuplicateSensitive() || !pdsRandom->IsDuplicateSensitive())
-		{
-			return true;
-		}
+		return true;
 	}
 
 	return EdtAny == pds->Edt() || EdtNonSingleton == pds->Edt() ||
@@ -232,8 +227,7 @@ CDistributionSpecRandom::AppendEnforcers(CMemoryPool *mp,
 IOstream &
 CDistributionSpecRandom::OsPrint(IOstream &os) const
 {
-	os << this->SzId();
-	return os;
+	return os << this->SzId();
 }
 
 // EOF

src/include/gpopt/gpdbwrappers.h

@@ -720,9 +720,6 @@ Oid GetBaseType(Oid typid);
 // check if parallel mode is OK (comprehensive check)
 bool IsParallelModeOK(void);
 
-// check if parallel plans are enabled in current context
-bool IsParallelPlansEnabled(void);
-
 // returns the result of evaluating 'expr' as an Expr. Caller keeps ownership of 'expr'
 // and takes ownership of the result
 Expr *EvaluateExpr(Expr *expr, Oid result_type, int32 typmod);