You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by ma...@apache.org on 2025/01/10 08:20:36 UTC
(cloudberry) 02/08: Remove table Oid for DML on partition table (#14623)
This is an automated email from the ASF dual-hosted git repository.
maxyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit e727234a71a755fe7c46c2801a9a8e50d4649860
Author: gpopt <10...@users.noreply.github.com>
AuthorDate: Fri Dec 9 15:25:06 2022 -0800
Remove table Oid for DML on partition table (#14623)
#2481 and greenplum-db/gporca#186 removed PartOid from Orca, but the OidCol
still exists. This patch completely removes PartOid and related stuff from Orca.
---
.../gpopt/translate/CTranslatorDXLToPlStmt.cpp | 8 +-
src/backend/gpopt/utils/COptTasks.cpp | 3 +-
.../dxl/expressiontests/InsertPartitionedPlan.xml | 2 +-
.../3WayJoinOnMultiDistributionColumnsTables.mdp | 2 +-
...oinOnMultiDistributionColumnsTablesNoMotion.mdp | 2 +-
.../3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp | 2 +-
.../4WayJoinInferredPredsRemovedWith2Motion.mdp | 2 +-
.../data/dxl/minidump/AddPredsInSubqueries.mdp | 2 +-
.../dxl/minidump/AddRedistributeBeforeInsert-1.mdp | 4 +-
.../dxl/minidump/AddRedistributeBeforeInsert-2.mdp | 4 +-
.../dxl/minidump/AddRedistributeBeforeInsert-3.mdp | 4 +-
.../dxl/minidump/AddRedistributeBeforeInsert-4.mdp | 4 +-
.../dxl/minidump/AddRedistributeBeforeInsert-5.mdp | 4 +-
.../dxl/minidump/AggSubqCollapseFalseFilter.mdp | 2 +-
.../data/dxl/minidump/AggWithVolatileFunc.mdp | 2 +-
.../dxl/minidump/AggonExternalTableNoMotion.mdp | 2 +-
.../gporca/data/dxl/minidump/AggregateWithSkew.mdp | 2 +-
.../AggregatesConstraintDeriveNegation.mdp | 2 +-
.../minidump/AllSubqueryWithSubqueryInScalar.mdp | 2 +-
.../AnySubq-With-NonScalarSubqueryChild-1.mdp | 2 +-
.../AnySubq-With-NonScalarSubqueryChild-2.mdp | 2 +-
.../AnySubq-With-NonScalarSubqueryChild-3.mdp | 2 +-
.../AnySubqueryWithAllSubqueryInScalar.mdp | 2 +-
.../minidump/AnySubqueryWithSubqueryInScalar.mdp | 2 +-
.../dxl/minidump/AnySubqueryWithVolatileComp.mdp | 2 +-
.../dxl/minidump/AnySubqueryWithVolatileFunc.mdp | 2 +-
.../data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp | 2 +-
.../data/dxl/minidump/ArrayCmpAll-Disjunct.mdp | 2 +-
.../gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp | 2 +-
.../gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp | 2 +-
.../data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp | 2 +-
.../gporca/data/dxl/minidump/ArrayCmpInList.mdp | 2 +-
.../gporca/data/dxl/minidump/ArrayCoerceCast.mdp | 2 +-
.../gporca/data/dxl/minidump/ArrayCoerceExpr.mdp | 2 +-
.../minidump/AvoidConstraintDerivationForLike.mdp | 2 +-
.../gporca/data/dxl/minidump/BRINScan-Or.mdp | 2 +-
.../dxl/minidump/BTreeIndex-Against-InList.mdp | 2 +-
.../minidump/BTreeIndex-Against-InListLarge.mdp | 2 +-
.../minidump/BTreeIndex-Against-ScalarSubquery.mdp | 2 +-
.../dxl/minidump/BitmapIndex-Against-InList.mdp | 2 +-
.../dxl/minidump/BitmapIndex-ChooseHashJoin.mdp | 2 +-
.../dxl/minidump/BitmapIndexNLJWithProject.mdp | 2 +-
.../minidump/BitmapIndexNLJWithProjectNoFilt.mdp | 2 +-
.../dxl/minidump/BitmapIndexNLOJWithProject.mdp | 2 +-
.../minidump/BitmapIndexNLOJWithProjectNonPart.mdp | 2 +-
.../dxl/minidump/BitmapIndexProbeMergeFilters.mdp | 2 +-
.../dxl/minidump/BitmapIndexScanChooseIndex.mdp | 2 +-
.../data/dxl/minidump/BitmapIndexScanCost.mdp | 2 +-
.../minidump/BitmapIndexUnsupportedOperator.mdp | 2 +-
.../BitmapScan-Hetrogeneous-Partitioned.mdp | 2 +-
...BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp | 2 +-
.../BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp | 2 +-
.../minidump/BitmapTableScan-ComplexConjDisj.mdp | 2 +-
.../BitmapTableScan-ConjDisjWithOuterRefs.mdp | 2 +-
.../minidump/Blocking-Spool-Parallel-Union-All.mdp | 2 +-
.../dxl/minidump/BpCharMCVCardinalityEquals.mdp | 2 +-
.../minidump/BpCharMCVCardinalityGreaterThan.mdp | 2 +-
.../data/dxl/minidump/BroadcastSkewedHashjoin.mdp | 2 +-
.../minidump/BtreeIndexNLJWithProjectNoPart.mdp | 2 +-
.../dxl/minidump/BtreeIndexNLOJWithProject.mdp | 2 +-
.../CArrayExpansionTest/JoinWithInListExpand.mdp | 2 +-
.../CArrayExpansionTest/JoinWithInListNoExpand.mdp | 2 +-
.../minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp | 2 +-
.../CJoinOrderDPTest/JoinOrderWithOutDP.mdp | 2 +-
.../FallBackToSerialAppend.mdp | 2 +-
.../NoOpMotionUsesOnlyGroupOutputColumns.mdp | 2 +-
.../ParallelAppend-ConstTable.mdp | 2 +-
.../ParallelAppend-Insert.mdp | 4 +-
.../ParallelAppend-Select.mdp | 2 +-
...arallelUnionAllWithNoRedistributableColumns.mdp | 2 +-
...rallelUnionAllWithNotEqualNumOfDistrColumns.mdp | 2 +-
...lUnionAllWithSingleNotRedistributableColumn.mdp | 2 +-
.../RandomDistributedChildrenUnhashableColumns.mdp | 2 +-
.../RedundantMotionParallelUnionAll.mdp | 2 +-
.../TwoHashedTables.mdp | 2 +-
.../gporca/data/dxl/minidump/CTAS-Random.mdp | 2 +-
.../dxl/minidump/CTAS-With-Global-Local-Agg.mdp | 2 +-
...stributed-from-replicated-distributed-table.mdp | 2 +-
.../gporca/data/dxl/minidump/CTAS-with-Limit.mdp | 2 +-
...CTAS-with-hashed-distributed-external-table.mdp | 2 +-
...AS-with-randomly-distributed-external-table.mdp | 2 +-
src/backend/gporca/data/dxl/minidump/CTAS.mdp | 2 +-
.../dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp | 2 +-
.../data/dxl/minidump/CTE-NoPushProperties.mdp | 2 +-
.../data/dxl/minidump/CTE-PushProperties.mdp | 2 +-
.../data/dxl/minidump/CTE-ValuesScan-ProjList.mdp | 2 +-
.../data/dxl/minidump/CTE-with-random-filter.mdp | 2 +-
.../dxl/minidump/CTEConstraintDeriveNegation.mdp | 2 +-
.../minidump/CTEMergeGroupsCircularDeriveStats.mdp | 2 +-
.../dxl/minidump/CTEMisAlignedProducerConsumer.mdp | 2 +-
.../data/dxl/minidump/CTEWithMergedGroup.mdp | 2 +-
.../gporca/data/dxl/minidump/CTEinlining.mdp | 2 +-
.../gporca/data/dxl/minidump/CTG-Filter.mdp | 2 +-
.../data/dxl/minidump/CastedInClauseWithMCV.mdp | 2 +-
.../dxl/minidump/CastedScalarIf-On-Index-Key.mdp | 2 +-
.../gporca/data/dxl/minidump/Char-Cardinality.mdp | 2 +-
.../data/dxl/minidump/Citext-Cardinality.mdp | 2 +-
.../gporca/data/dxl/minidump/CoerceViaIO.mdp | 2 +-
.../minidump/CollapseProject-SetReturning-CTE.mdp | 2 +-
.../dxl/minidump/CollapseProject-SetReturning.mdp | 2 +-
.../data/dxl/minidump/CompositeTypeRelMdId.mdp | 2 +-
.../ConstScalarFuncNotPushedBelowGather.mdp | 2 +-
.../ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp | 2 +-
...onstTblGetUnderSubqUnderProjectWithOuterRef.mdp | 2 +-
.../ConstTblGetUnderSubqWithNoOuterRef.mdp | 2 +-
.../minidump/ConstTblGetUnderSubqWithOuterRef.mdp | 2 +-
.../minidump/ConstraintIntervalIncludesNull.mdp | 2 +-
.../minidump/ConstraintIntervalNotIncludesNull.mdp | 2 +-
.../ConstraintIntervalWithBoolIncludesNull.mdp | 2 +-
.../ConstraintIntervalWithBoolNotIncludesNull.mdp | 2 +-
.../ConstraintIntervalWithInIncludesNull.mdp | 2 +-
.../ConstraintIntervalWithInIncludesNullArray.mdp | 2 +-
.../ConstraintIntervalWithInNotIncludesNull.mdp | 2 +-
...nstraintIntervalWithMultiColumnsIncludeNull.mdp | 2 +-
...raintIntervalWithMultiColumnsNotIncludeNull.mdp | 2 +-
.../ConstraintIntervalWithNotIncludesNull.mdp | 2 +-
...ConvertBoolConstNullToConstTableFalseFilter.mdp | 2 +-
.../dxl/minidump/ConvertHashToRandomInsert.mdp | 2 +-
.../minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp | 2 +-
.../minidump/CorrelatedIN-LeftSemiJoin-True.mdp | 2 +-
.../minidump/CorrelatedIN-LeftSemiNotIn-True.mdp | 2 +-
.../minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp | 2 +-
.../CorrelatedNLJ-PartSelector-Subplan.mdp | 2 +-
.../minidump/CorrelatedNLJWithStreamingSpool.mdp | 2 +-
.../minidump/CorrelatedNLJWithTrueCondition.mdp | 2 +-
.../CorrelatedSubqueryWithAggWindowFunc.mdp | 2 +-
.../minidump/DML-ComputeScalar-With-Outerref.mdp | 4 +-
.../data/dxl/minidump/DML-Filter-With-OuterRef.mdp | 4 +-
.../data/dxl/minidump/DML-Replicated-Input.mdp | 2 +-
.../dxl/minidump/DML-UnionAll-With-OuterRef.mdp | 4 +-
.../minidump/DML-UnionAll-With-Universal-Child.mdp | 4 +-
.../data/dxl/minidump/DML-Volatile-Function.mdp | 4 +-
...DML-With-CorrelatedNLJ-With-Universal-Child.mdp | 4 +-
.../minidump/DML-With-HJ-And-UniversalChild.mdp | 4 +-
.../DML-With-Join-With-Universal-Child.mdp | 4 +-
.../dxl/minidump/DML-With-MasterOnlyTable-1.mdp | 4 +-
.../dxl/minidump/DML-With-WindowFunc-OuterRef.mdp | 2 +-
.../data/dxl/minidump/DMLCollapseProject.mdp | 2 +-
.../dxl/minidump/DPE-with-unsupported-pred.mdp | 2 +-
.../gporca/data/dxl/minidump/DPv2GreedyOnly.mdp | 2 +-
.../gporca/data/dxl/minidump/DPv2MinCardOnly.mdp | 2 +-
.../gporca/data/dxl/minidump/DPv2QueryOnly.mdp | 2 +-
.../dxl/minidump/DQA-GroupBy-HashAggregate1.mdp | 2 +-
.../dxl/minidump/DQA-GroupBy-HashAggregate2.mdp | 2 +-
.../DQA-InnerJoin-GroupBy-HashAggregate.mdp | 2 +-
.../data/dxl/minidump/DQA-KeepOuterReference.mdp | 2 +-
.../dxl/minidump/DQA-NonRedistributableCol.mdp | 2 +-
.../data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp | 2 +-
.../dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp | 2 +-
.../dxl/minidump/Delete-With-Limit-In-Subquery.mdp | 4 +-
.../dxl/minidump/DeleteMismatchedDistribution.mdp | 4 +-
.../gporca/data/dxl/minidump/DeleteRandomDistr.mdp | 2 +-
.../minidump/DeleteRandomlyDistributedTable.mdp | 4 +-
.../DeleteRandomlyDistributedTableJoin.mdp | 4 +-
...ctDispatch-GpSegmentId-MultiCol-Conjunction.mdp | 2 +-
...tDispatch-GpSegmentId-SingleCol-Conjunction.mdp | 2 +-
.../dxl/minidump/DirectDispatch-GpSegmentId.mdp | 2 +-
.../data/dxl/minidump/Distinct-LegacyOpfamily.mdp | 2 +-
.../dxl/minidump/DistinctAgg-NonSplittable.mdp | 2 +-
.../dxl/minidump/DonotPushPartConstThruLimit.mdp | 2 +-
.../minidump/DontAddRedistributeBeforeInsert-1.mdp | 4 +-
.../minidump/DontAddRedistributeBeforeInsert-2.mdp | 4 +-
.../dxl/minidump/DoubleNDVCardinalityEquals.mdp | 2 +-
.../gporca/data/dxl/minidump/DqaHavingMax.mdp | 2 +-
src/backend/gporca/data/dxl/minidump/DqaMax.mdp | 2 +-
src/backend/gporca/data/dxl/minidump/DqaMin.mdp | 2 +-
.../gporca/data/dxl/minidump/DqaNoRedistribute.mdp | 2 +-
.../gporca/data/dxl/minidump/DqaSubqueryMax.mdp | 2 +-
.../dxl/minidump/DynamicBitmapTableScan-Basic.mdp | 2 +-
.../dxl/minidump/DynamicBitmapTableScan-UUID.mdp | 2 +-
.../dxl/minidump/DynamicIndexGet-OuterRefs.mdp | 2 +-
.../dxl/minidump/DynamicIndexGetDroppedCols.mdp | 2 +-
.../dxl/minidump/DynamicIndexScan-DroppedCols.mdp | 2 +-
.../DynamicIndexScan-Heterogenous-Union.mdp | 2 +-
.../dxl/minidump/DynamicIndexScan-Homogenous.mdp | 2 +-
.../data/dxl/minidump/EagerAggEmptyInput.mdp | 2 +-
.../data/dxl/minidump/EagerAggExpression.mdp | 2 +-
.../dxl/minidump/EagerAggGroupColumnInJoin.mdp | 2 +-
.../gporca/data/dxl/minidump/EagerAggMax.mdp | 2 +-
.../dxl/minidump/EagerAggMaxWithNestedLoop.mdp | 2 +-
.../gporca/data/dxl/minidump/EagerAggMinMax.mdp | 2 +-
.../gporca/data/dxl/minidump/EagerAggSubquery.mdp | 2 +-
.../data/dxl/minidump/EagerAggUnsupportedAgg.mdp | 2 +-
.../dxl/minidump/EqualityPredicateOverDate.mdp | 2 +-
.../data/dxl/minidump/EquiJoinOnExpr-Supported.mdp | 2 +-
.../dxl/minidump/EquiJoinOnExpr-Unsupported.mdp | 2 +-
.../Equivalence-class-project-over-LOJ.mdp | 2 +-
.../ExistentialSubquriesInsideScalarExpression.mdp | 2 +-
.../data/dxl/minidump/ExistsSubqInsideExpr.mdp | 2 +-
.../minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp | 2 +-
.../dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp | 2 +-
.../minidump/ExtractOneBindingFromScalarGroups.mdp | 2 +-
.../data/dxl/minidump/FOJ-Condition-False.mdp | 2 +-
.../gporca/data/dxl/minidump/FilterScalarCast.mdp | 2 +-
.../minidump/FullJoin-2PredicateOnDistColumns.mdp | 2 +-
.../gporca/data/dxl/minidump/FullJoin-Caps.mdp | 2 +-
.../FullJoin-InnerNotOnDistributionColumn.mdp | 2 +-
.../dxl/minidump/FullJoin-NonDefaultOpfamily.mdp | 2 +-
.../minidump/FullJoin-NotOnDistributionColumn.mdp | 2 +-
.../data/dxl/minidump/FullJoin-NullPredicate.mdp | 2 +-
.../dxl/minidump/FullJoin-OnDistributionColumn.mdp | 2 +-
.../dxl/minidump/FullJoin-PredicateOnSameTable.mdp | 2 +-
.../data/dxl/minidump/FullJoin-Replicated.mdp | 2 +-
.../FullJoin-Subquery-CastedPredicates.mdp | 2 +-
.../dxl/minidump/FullJoin-SubquerySingleton.mdp | 2 +-
.../minidump/FullJoin-SubqueryWithRedistribute.mdp | 2 +-
.../dxl/minidump/FullJoin-SwappedPredicates.mdp | 2 +-
.../minidump/FullOuterJoin-NullRejectingLHS1.mdp | 2 +-
.../minidump/FullOuterJoin-NullRejectingLHS2.mdp | 2 +-
.../FullOuterJoinLeftMultiplyRightMaxCard.mdp | 2 +-
.../dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp | 2 +-
.../minidump/FullOuterJoinMaxCardRightChild.mdp | 2 +-
.../data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp | 2 +-
src/backend/gporca/data/dxl/minidump/GinIndex.mdp | 2 +-
.../data/dxl/minidump/GinIndexPathOpfamily.mdp | 2 +-
.../data/dxl/minidump/GinIndexSearchModeAll.mdp | 2 +-
.../Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp | 2 +-
.../Gist-NestedLoopJoin-Lossy-IndexPlan.mdp | 2 +-
.../Gist-NestedLoopJoin-Postgis-IndexPlan.mdp | 2 +-
.../Gist-NonPart-Lossy-BitmapIndexPlan.mdp | 2 +-
.../dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp | 2 +-
.../data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp | 2 +-
.../data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp | 2 +-
.../minidump/Gist-PartTable-Lossy-IndexPlan.mdp | 2 +-
.../Gist-PartTable-NonLossy-BitmapIndexPlan.mdp | 2 +-
.../dxl/minidump/Gist-PartialIndex-TableScan.mdp | 2 +-
.../data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp | 2 +-
.../gporca/data/dxl/minidump/GreedyNAryJoin.mdp | 2 +-
.../GreedyNAryJoinWithDisconnectedEdges.mdp | 2 +-
.../data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp | 2 +-
.../data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp | 2 +-
.../gporca/data/dxl/minidump/InClauseWithMCV.mdp | 2 +-
...InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp | 2 +-
...hPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp | 2 +-
.../InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp | 2 +-
.../data/dxl/minidump/InSubqueryWithNotNullCol.mdp | 2 +-
.../minidump/Index-Join-With-Subquery-In-Pred.mdp | 2 +-
.../minidump/IndexApply-InnerSelect-PartTable2.mdp | 2 +-
.../dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp | 2 +-
.../IndexApply-MultiDistKey-WithComplexPreds.mdp | 2 +-
...Apply-MultiDistKeys-Bitmap-WithComplexPreds.mdp | 2 +-
.../minidump/IndexApply-MultiDistKeys-Bitmap.mdp | 2 +-
...pply-MultiDistKeys-IncompletePDS-3-DistCols.mdp | 2 +-
.../IndexApply_NestLoopWithNestParamTrue.mdp | 2 +-
.../dxl/minidump/IndexConstraintsMDidCache.mdp | 2 +-
.../dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp | 2 +-
.../dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp | 2 +-
...itionToRootTableContainingHeterogenousIndex.mdp | 2 +-
...nLeaf-AddPartitionToRootWithHomogenousIndex.mdp | 2 +-
...-IndexOnPartitionsWithDifferentStorageTypes.mdp | 2 +-
...verlappingHeterogenousIndex-ANDPredicate-AO.mdp | 2 +-
...rlappingHeterogenousIndex-ANDPredicate-HEAP.mdp | 2 +-
...pingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp | 2 +-
...ppingHomogenousIndexesOnRoot-ORPredicate-AO.mdp | 2 +-
...verlappingHeterogenousIndex-ANDPredicate-AO.mdp | 2 +-
...rlappingHeterogenousIndex-ANDPredicate-HEAP.mdp | 2 +-
...OverlappingHeterogenousIndex-ORPredicate-AO.mdp | 2 +-
...pingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp | 2 +-
...nLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp | 2 +-
...ppingHomogenousIndexesOnRoot-ORPredicate-AO.mdp | 2 +-
...af-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp | 2 +-
...-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp | 2 +-
...af-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp | 2 +-
...-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp | 2 +-
.../minidump/IndexOnlyScan-NoDistKeyInIndex.mdp | 2 +-
.../gporca/data/dxl/minidump/IndexScan-AndedIn.mdp | 2 +-
.../data/dxl/minidump/IndexScan-ORPredsAOPart.mdp | 2 +-
.../data/dxl/minidump/IndexScan-ORPredsNonPart.mdp | 2 +-
.../minidump/IndexScanWithNestedCTEAndSetOp.mdp | 2 +-
.../gporca/data/dxl/minidump/IndexedNLJBitmap.mdp | 2 +-
.../gporca/data/dxl/minidump/InferPredicates.mdp | 2 +-
.../dxl/minidump/InferPredicatesBCC-oid-oid.mdp | 2 +-
.../dxl/minidump/InferPredicatesBCC-txt-txt.mdp | 2 +-
.../dxl/minidump/InferPredicatesBCC-vc-txt.mdp | 2 +-
.../data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp | 2 +-
.../dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp | 2 +-
.../data/dxl/minidump/InferPredicatesForLimit.mdp | 2 +-
.../data/dxl/minidump/InferPredicatesForPartSQ.mdp | 2 +-
.../minidump/InferPredicatesForProcessedColumn.mdp | 2 +-
.../minidump/InferPredicatesForQuantifiedSQ.mdp | 2 +-
.../minidump/InferPredicatesFromExistsSubquery.mdp | 2 +-
.../minidump/InferPredicatesFromMultiSubquery.mdp | 2 +-
.../dxl/minidump/InferPredicatesInnerOfLOJ.mdp | 2 +-
.../InferPredicatesIntFromExistsSubquery.mdp | 2 +-
.../minidump/InferPredicatesIntFromSubquery.mdp | 2 +-
.../dxl/minidump/InferPredicatesJoinSubquery.mdp | 2 +-
.../dxl/minidump/InferPredicatesMultiColumns.mdp | 2 +-
.../InferredPredicatesConstraintSimplification.mdp | 2 +-
.../minidump/InnerJoinBroadcastTableHashSpec.mdp | 2 +-
.../data/dxl/minidump/InnerJoinOverJoinExcept.mdp | 4 +-
.../dxl/minidump/InnerJoinOverJoinExceptAll.mdp | 4 +-
.../minidump/InnerJoinReplicatedTableHashSpec.mdp | 2 +-
.../Insert-AO-Partitioned-SortDisabled.mdp | 2 +-
.../data/dxl/minidump/Insert-AO-Partitioned.mdp | 2 +-
src/backend/gporca/data/dxl/minidump/Insert-AO.mdp | 2 +-
.../data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp | 4 +-
src/backend/gporca/data/dxl/minidump/Insert.mdp | 2 +-
.../gporca/data/dxl/minidump/InsertAssertSort.mdp | 2 +-
.../data/dxl/minidump/InsertCheckConstraint.mdp | 2 +-
.../gporca/data/dxl/minidump/InsertConstTuple.mdp | 2 +-
.../InsertConstTupleRandomDistribution.mdp | 4 +-
.../minidump/InsertConstTupleVolatileFunction.mdp | 2 +-
.../InsertConstTupleVolatileFunctionMOTable.mdp | 2 +-
.../minidump/InsertDirectedDispatchNullValue.mdp | 2 +-
.../InsertIntoNonNullAfterDroppingColumn.mdp | 4 +-
.../data/dxl/minidump/InsertMasterOnlyTable.mdp | 2 +-
.../minidump/InsertMasterOnlyTableConstTuple.mdp | 2 +-
.../minidump/InsertMismatchedDistrubution-2.mdp | 2 +-
.../dxl/minidump/InsertMismatchedDistrubution.mdp | 2 +-
.../dxl/minidump/InsertNULLNotNULLConstraint.mdp | 2 +-
.../dxl/minidump/InsertNoEnforceConstraints.mdp | 4 +-
.../data/dxl/minidump/InsertNonSingleton.mdp | 4 +-
.../gporca/data/dxl/minidump/InsertNotNullCols.mdp | 2 +-
.../dxl/minidump/InsertPrimaryKeyFromMOTable.mdp | 2 +-
.../gporca/data/dxl/minidump/InsertProjectSort.mdp | 2 +-
.../gporca/data/dxl/minidump/InsertRandomDistr.mdp | 4 +-
...ertReplicatedIntoSerialHashDistributedTable.mdp | 4 +-
.../gporca/data/dxl/minidump/InsertSort.mdp | 2 +-
.../minidump/InsertSortDistributed2MasterOnly.mdp | 2 +-
.../data/dxl/minidump/InsertWithDroppedCol.mdp | 2 +-
.../data/dxl/minidump/InvalidDeleteGather.mdp | 2 +-
.../dxl/minidump/JOIN-NonRedistributableCol.mdp | 2 +-
.../data/dxl/minidump/Join-INDF-NoBroadcast.mdp | 2 +-
.../minidump/Join-INDF-Nulls-Not-Collocated.mdp | 2 +-
.../dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp | 2 +-
...inArityAssociativityCommutativityAboveLimit.mdp | 2 +-
.../JoinArityAssociativityCommutativityAtLimit.mdp | 2 +-
...inArityAssociativityCommutativityBelowLimit.mdp | 2 +-
.../gporca/data/dxl/minidump/JoinCitextVarchar.mdp | 2 +-
...nDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp | 2 +-
.../dxl/minidump/JoinOnViewWithCastedColumn.mdp | 2 +-
...nViewWithCastedColumnAndSubqueryInPredicate.mdp | 2 +-
...ewWithMixOfPushableAndNonpushablePredicates.mdp | 2 +-
.../minidump/JoinOnViewWithSetReturningColumn.mdp | 2 +-
.../dxl/minidump/JoinOnViewWithVolatileColumn.mdp | 2 +-
...nOptimizationLevelGreedyNonPartTblInnerJoin.mdp | 2 +-
...inOptimizationLevelQuery3WayHashJoinPartTbl.mdp | 2 +-
...inOptimizationLevelQueryNonPartTblInnerJoin.mdp | 2 +-
.../gporca/data/dxl/minidump/JoinOrderDPE.mdp | 2 +-
.../gporca/data/dxl/minidump/JoinTinterval.mdp | 2 +-
.../dxl/minidump/JoinWithSubqueryProjectColumn.mdp | 2 +-
.../data/dxl/minidump/LOJ-Condition-False.mdp | 2 +-
.../data/dxl/minidump/LOJ-DynBitmapIndex.mdp | 2 +-
.../dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp | 2 +-
.../gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp | 2 +-
.../dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp | 2 +-
...LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp | 2 +-
.../minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp | 2 +-
.../LOJ-IndexApply-CompsiteKey-NoMotion.mdp | 2 +-
.../LOJ-IndexApply-DistKey-Multiple-Predicates.mdp | 2 +-
.../minidump/LOJ-IndexApply-MasterOnly-Table.mdp | 2 +-
...ly-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp | 2 +-
.../LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp | 2 +-
...Apply-MultiDistKeys-Bitmap-WithComplexPreds.mdp | 2 +-
.../LOJ-IndexApply-MultiDistKeys-Bitmap.mdp | 2 +-
.../LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp | 2 +-
...J-IndexApply-MultiDistKeys-WithComplexPreds.mdp | 2 +-
.../dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp | 2 +-
.../LOJ-IndexApply-Negative-NonEqual-Predicate.mdp | 2 +-
.../dxl/minidump/LOJ-IndexApply-NonDistKey.mdp | 2 +-
.../LOJ-IndexApply-WithComplexPredicates.mdp | 2 +-
.../gporca/data/dxl/minidump/LOJ-PushDown.mdp | 2 +-
.../gporca/data/dxl/minidump/LOJ-With-Agg.mdp | 2 +-
.../dxl/minidump/LOJNonNullRejectingPredicates.mdp | 2 +-
.../dxl/minidump/LOJNullRejectingPredicates.mdp | 2 +-
.../LOJNullRejectingZeroPlacePredicates.mdp | 2 +-
.../dxl/minidump/LOJReorderComplexNestedLOJs.mdp | 2 +-
.../minidump/LOJReorderWithComplexPredicate.mdp | 2 +-
.../gporca/data/dxl/minidump/LOJReorderWithIDF.mdp | 2 +-
.../minidump/LOJReorderWithNestedLOJAndFilter.mdp | 2 +-
.../dxl/minidump/LOJReorderWithOneSidedFilter.mdp | 2 +-
.../dxl/minidump/LOJReorderWithSimplePredicate.mdp | 2 +-
...DF_no_convert_outer_ref_predicate_with_NULL.mdp | 2 +-
..._convert_outer_ref_predicate_with_inner_ref.mdp | 2 +-
.../gporca/data/dxl/minidump/LOJ_bb_mpph.mdp | 2 +-
.../LOJ_convert_to_inner_with_and_predicate.mdp | 2 +-
...J_convert_to_inner_with_inner_predicate_IDF.mdp | 2 +-
.../LOJ_convert_to_inner_with_or_predicate.mdp | 2 +-
...ert_to_inner_with_inner_predicate_IDF_const.mdp | 2 +-
..._convert_to_inner_with_outer_predicate_INDF.mdp | 2 +-
...rt_to_inner_with_outer_predicate_INDF_const.mdp | 2 +-
.../data/dxl/minidump/LargeMultiColumnInList.mdp | 2 +-
.../gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp | 2 +-
.../dxl/minidump/LeftJoin-DPv2-With-Select.mdp | 2 +-
.../LeftJoin-UnsupportedFilter-Cardinality.mdp | 2 +-
.../minidump/LeftJoinBroadcastTableHashSpec.mdp | 2 +-
.../data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp | 2 +-
.../dxl/minidump/LeftJoinNullsNotColocated.mdp | 2 +-
.../data/dxl/minidump/ListPartLossyCastEq.mdp | 2 +-
.../data/dxl/minidump/ListPartLossyCastLT.mdp | 2 +-
.../data/dxl/minidump/ListPartLossyCastNEq.mdp | 2 +-
.../dxl/minidump/LogicalIndexGetDroppedCols.mdp | 2 +-
.../data/dxl/minidump/ManyTextUnionsInSubquery.mdp | 2 +-
.../MotionHazard-MaterializeUnderResult.mdp | 2 +-
...MotionHazard-NoMaterializeGatherUnderResult.mdp | 2 +-
...otionHazard-NoMaterializeHashAggUnderResult.mdp | 2 +-
.../MotionHazard-NoMaterializeSortUnderResult.mdp | 2 +-
.../MultiColumnAggWithDefaultOpfamilies.mdp | 2 +-
...tiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp | 2 +-
.../dxl/minidump/MultiDistKeyJoinCardinality.mdp | 2 +-
.../MultiDistKeyWithOtherPredsJoinCardinality.mdp | 2 +-
.../dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp | 2 +-
.../dxl/minidump/MultiLevelPartLossyCastNEq.mdp | 2 +-
.../minidump/MultipleDampedPredJoinCardinality.mdp | 2 +-
.../MultipleIndependentPredJoinCardinality.mdp | 2 +-
.../data/dxl/minidump/MultipleIndexPredicate.mdp | 2 +-
.../minidump/MultipleSetReturningFunction-1.mdp | 2 +-
.../minidump/MultipleSetReturningFunction-2.mdp | 2 +-
.../minidump/MultipleSetReturningFunction-3.mdp | 2 +-
.../minidump/MultipleUpdateWithJoinOnDistCol.mdp | 207 +++++++--------
.../data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp | 2 +-
.../dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp | 2 +-
.../NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp | 2 +-
.../NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp | 2 +-
.../data/dxl/minidump/NLJ-Rewindability-CTAS.mdp | 2 +-
.../gporca/data/dxl/minidump/NLJ-Rewindability.mdp | 2 +-
.../gporca/data/dxl/minidump/Name-Cardinality.mdp | 2 +-
.../dxl/minidump/NaryWithLojAndNonLojChilds.mdp | 2 +-
.../data/dxl/minidump/Negative-IndexApply1.mdp | 2 +-
.../data/dxl/minidump/Negative-IndexApply2.mdp | 2 +-
.../NestedInSubqWithPrjListOuterRefNoInnerRef.mdp | 2 +-
.../dxl/minidump/NestedJoinWithCastedColumn.mdp | 2 +-
.../dxl/minidump/NestedNLJWithBlockingSpool.mdp | 2 +-
.../data/dxl/minidump/NestedSubqLimitBindings.mdp | 2 +-
.../data/dxl/minidump/NewBtreeIndexScanCost.mdp | 2 +-
.../NoBroadcastUnderGatherForWindowFunction.mdp | 2 +-
.../minidump/NoDistKeyMultiPredJoinCardinality.mdp | 2 +-
...PartConstraint-WhenNoDefaultPartsAndIndices.mdp | 2 +-
.../minidump/NoPushdownPredicateWithCTEAnchor.mdp | 2 +-
.../data/dxl/minidump/NoRedistributeOnAppend.mdp | 2 +-
...ngHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp | 2 +-
.../gporca/data/dxl/minidump/NonSingleton.mdp | 2 +-
.../gporca/data/dxl/minidump/NonSplittableAgg.mdp | 2 +-
.../NotExists-SuperflousOuterRefWithGbAgg.mdp | 2 +-
.../gporca/data/dxl/minidump/NotInToLASJ.mdp | 2 +-
.../NotWellDefinedDisjunctConjunctPredicates.mdp | 2 +-
.../gporca/data/dxl/minidump/OR-WithIsNullPred.mdp | 2 +-
.../OneDistKeyMultiPredJoinCardinality.mdp | 2 +-
.../gporca/data/dxl/minidump/OneSegmentGather.mdp | 2 +-
.../OrderedAggUsingGroupColumnInDirectArg.mdp | 2 +-
.../dxl/minidump/OrderedAgg_array_fraction.mdp | 2 +-
.../data/dxl/minidump/OrderedAgg_computed_col.mdp | 2 +-
.../dxl/minidump/OrderedAgg_multiple_diffcol.mdp | 2 +-
.../dxl/minidump/OrderedAgg_multiple_samecol.mdp | 2 +-
.../OrderedAgg_multiple_samecol_difforderespec.mdp | 2 +-
.../gporca/data/dxl/minidump/OrderedAgg_single.mdp | 2 +-
.../data/dxl/minidump/OrderedAgg_skewed_data.mdp | 2 +-
.../data/dxl/minidump/OrderedAgg_with_groupby.mdp | 2 +-
.../dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp | 2 +-
.../minidump/OrderedAgg_with_nonconst_fraction.mdp | 2 +-
.../minidump/OuterJoinOnViewWithCastedColumn.mdp | 2 +-
...ngHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp | 2 +-
.../OverlappingHomogenousIndexesOnRoot-HEAP.mdp | 2 +-
.../PartConstraint-WhenDefaultPartsAndIndices.mdp | 2 +-
...PartConstraint-WhenIndicesAndNoDefaultParts.mdp | 2 +-
.../PartConstraint-WithOnlyDefaultPartInfo.mdp | 2 +-
.../data/dxl/minidump/PartPredsWithRandom.mdp | 2 +-
.../data/dxl/minidump/PartSelectorOnJoinSide.mdp | 2 +-
.../data/dxl/minidump/PartSelectorOnJoinSide2.mdp | 2 +-
.../PartTbl-AggWithExistentialSubquery.mdp | 2 +-
.../data/dxl/minidump/PartTbl-ArrayCoerce.mdp | 2 +-
.../dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp | 2 +-
.../minidump/PartTbl-DPE-Correlated-NLOuter.mdp | 2 +-
.../minidump/PartTbl-EqPredicateWithCastRange.mdp | 2 +-
.../gporca/data/dxl/minidump/PartTbl-IDFList.mdp | 2 +-
.../gporca/data/dxl/minidump/PartTbl-IDFNull.mdp | 2 +-
.../data/dxl/minidump/PartTbl-IDFWithCast.mdp | 2 +-
.../PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp | 2 +-
.../PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp | 2 +-
.../minidump/PartTbl-List-DPE-Int-Predicates.mdp | 2 +-
.../PartTbl-List-DPE-Varchar-Predicates.mdp | 2 +-
.../data/dxl/minidump/PartTbl-MultiWayJoin.mdp | 2 +-
.../dxl/minidump/PartTbl-PredicateWithCast.mdp | 2 +-
.../dxl/minidump/PartTbl-PredicateWithCastList.mdp | 2 +-
.../PartTbl-PredicateWithCastMultiLevelList.mdp | 2 +-
.../PartTbl-RightOuterHashJoin-DPE-IsNull.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-List-Cost1.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-List-Cost2.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-List-Cost3.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-List-Cost4.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-List-Cost5.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp | 2 +-
.../PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp | 2 +-
.../PartTbl-WindowFuncNoDisjunctPredPushDown.mdp | 2 +-
.../minidump/PartTbl-WindowFuncNoPredPushDown.mdp | 2 +-
.../PartTbl-WindowFuncPartialPredPushDown.mdp | 2 +-
.../minidump/PartTbl-WindowFuncPredPushDown.mdp | 2 +-
.../PartTbl-WindowFuncSinglePredPushDown.mdp | 2 +-
.../PredicateWithConjunctsAndDisjuncts.mdp | 2 +-
.../minidump/PredicateWithConjunctsOfDisjuncts.mdp | 2 +-
.../dxl/minidump/PredicateWithLongConjunction.mdp | 2 +-
.../dxl/minidump/Project-With-NonScalar-Func.mdp | 2 +-
.../data/dxl/minidump/ProjectSetFunction.mdp | 4 +-
.../dxl/minidump/PushFilterToSemiJoinLeftChild.mdp | 2 +-
.../data/dxl/minidump/PushGbBelowNaryUnion-2.mdp | 2 +-
.../RangePartLossyCastEqInPartitionRange.mdp | 2 +-
.../RangePartLossyCastEqOnEndPartitionRange.mdp | 2 +-
.../RangePartLossyCastLTEqInPartitionRange.mdp | 2 +-
.../RangePartLossyCastLTEqOnEndPartitionRange.mdp | 2 +-
.../RangePartLossyCastLTInPartitionRange.mdp | 2 +-
.../RangePartLossyCastLTOnEndPartitionRange.mdp | 2 +-
.../dxl/minidump/Remove-Distinct-From-Subquery.mdp | 2 +-
.../minidump/RemoveImpliedPredOnBCCPredicates.mdp | 2 +-
.../dxl/minidump/ReplicatedHashJoinReplicated.mdp | 2 +-
.../ReplicatedJoinHashDistributedTable.mdp | 2 +-
.../minidump/ReplicatedJoinPartitionedTable.mdp | 2 +-
.../ReplicatedJoinRandomDistributedTable.mdp | 2 +-
.../minidump/ReplicatedLOJHashDistributedTable.mdp | 2 +-
.../ReplicatedLOJRandomDistributedTable.mdp | 2 +-
.../data/dxl/minidump/ReplicatedLOJReplicated.mdp | 2 +-
.../data/dxl/minidump/ReplicatedNLJReplicated.mdp | 2 +-
.../data/dxl/minidump/ReplicatedTable-CTAS.mdp | 2 +-
.../data/dxl/minidump/ReplicatedTableAggregate.mdp | 2 +-
.../data/dxl/minidump/ReplicatedTableCTE.mdp | 2 +-
.../data/dxl/minidump/ReplicatedTableGroupBy.mdp | 2 +-
.../data/dxl/minidump/ReplicatedTableInClause.mdp | 2 +-
.../data/dxl/minidump/ReplicatedTableInsert.mdp | 4 +-
.../data/dxl/minidump/ReplicatedTableSelect.mdp | 2 +-
.../dxl/minidump/ReplicatedTableSequenceInsert.mdp | 4 +-
.../minidump/ReplicatedTableWithAggNoMotion.mdp | 4 +-
.../data/dxl/minidump/RightJoinBothReplicated.mdp | 2 +-
.../gporca/data/dxl/minidump/RightJoinDPS.mdp | 2 +-
.../gporca/data/dxl/minidump/RightJoinHashed.mdp | 2 +-
.../data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp | 2 +-
.../data/dxl/minidump/RightJoinRedistribute.mdp | 2 +-
.../data/dxl/minidump/RightJoinReplicated.mdp | 2 +-
.../gporca/data/dxl/minidump/RightJoinTVF.mdp | 2 +-
.../data/dxl/minidump/ScSubqueryWithOuterRef.mdp | 2 +-
.../minidump/ScalarCorrelatedSubqueryCountStar.mdp | 2 +-
.../dxl/minidump/ScalarDQAWithNonScalarAgg.mdp | 2 +-
.../dxl/minidump/ScalarFuncPushedBelowGather.mdp | 2 +-
.../data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp | 2 +-
.../data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp | 2 +-
.../data/dxl/minidump/ScalarSubqueryCountStar.mdp | 2 +-
.../dxl/minidump/ScalarSubqueryCountStarInJoin.mdp | 2 +-
.../minidump/SelfJoinDampedPredJoinCardinality.mdp | 2 +-
.../gporca/data/dxl/minidump/SelfUpdate.mdp | 113 ++++----
.../minidump/SemiJoinWithWindowsFuncInSubquery.mdp | 2 +-
.../data/dxl/minidump/SimpleArrayCoerceCast.mdp | 2 +-
.../dxl/minidump/SimplifyExistsSubquery2Limit.mdp | 2 +-
.../SingleColumnHomogenousIndexOnRoot-AO.mdp | 2 +-
.../SingleColumnHomogenousIndexOnRoot-HEAP.mdp | 2 +-
.../gporca/data/dxl/minidump/SixWayDPv2.mdp | 2 +-
...SpoolShouldInvalidateUnresolvedDynamicScans.mdp | 2 +-
.../gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp | 4 +-
.../gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp | 4 +-
.../gporca/data/dxl/minidump/SqlFuncNullReject.mdp | 2 +-
.../data/dxl/minidump/SqlFuncPredFactorize.mdp | 2 +-
.../minidump/StatsFilter-AnyWithNewColStats.mdp | 2 +-
.../data/dxl/minidump/Subq-With-OuterRefCol.mdp | 2 +-
.../data/dxl/minidump/Subq2CorrSQInLOJOn.mdp | 2 +-
.../data/dxl/minidump/Subq2NotInWhereLOJ.mdp | 2 +-
.../data/dxl/minidump/Subq2OuterRef2InJoin.mdp | 2 +-
.../dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp | 2 +-
.../data/dxl/minidump/Subq2PartialDecorrelate.mdp | 2 +-
.../minidump/SubqAll-InsideScalarExpression.mdp | 2 +-
.../minidump/SubqAny-InsideScalarExpression.mdp | 2 +-
.../data/dxl/minidump/SubqEnforceSubplan.mdp | 2 +-
.../gporca/data/dxl/minidump/SubqInIndexPred.mdp | 2 +-
.../dxl/minidump/SubqOuterReferenceInClause.mdp | 2 +-
.../dxl/minidump/Subquery-AnyAllAggregates.mdp | 2 +-
.../dxl/minidump/Subquery-ExistsAllAggregates.mdp | 2 +-
.../Subquery-ExistsAllAggregatesWithDisjuncts.mdp | 2 +-
.../data/dxl/minidump/SubqueryInsideScalarIf.mdp | 2 +-
.../SubqueryNoPullUpTableValueFunction.mdp | 2 +-
.../gporca/data/dxl/minidump/SubqueryNullTest.mdp | 2 +-
.../data/dxl/minidump/SubqueryOuterRefLimit.mdp | 2 +-
.../data/dxl/minidump/SubqueryOuterRefTVF.mdp | 2 +-
.../data/dxl/minidump/TaintedReplicatedAgg.mdp | 4 +-
.../data/dxl/minidump/TaintedReplicatedFilter.mdp | 4 +-
.../data/dxl/minidump/TaintedReplicatedLimit.mdp | 4 +-
.../dxl/minidump/TaintedReplicatedTablesCTE.mdp | 2 +-
.../dxl/minidump/TaintedReplicatedWindowAgg.mdp | 4 +-
.../data/dxl/minidump/TextMCVCardinalityEquals.mdp | 2 +-
.../dxl/minidump/TextMCVCardinalityGreaterThan.mdp | 2 +-
.../dxl/minidump/TimeTypeStatsNotComparable.mdp | 2 +-
.../dxl/minidump/TranslateFilterDisjunctQuals.mdp | 2 +-
...thCTEAndTableScanIntoFilterAndOneTimeFilter.mdp | 2 +-
.../TranslateOneTimeFilterConjunctQuals.mdp | 2 +-
.../data/dxl/minidump/TypeModifierArrayRef.mdp | 2 +-
.../gporca/data/dxl/minidump/TypeModifierCast.mdp | 2 +-
.../data/dxl/minidump/TypeModifierColumn.mdp | 2 +-
.../gporca/data/dxl/minidump/TypeModifierConst.mdp | 2 +-
.../minidump/TypeModifierDoubleMappableConst.mdp | 2 +-
.../dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp | 2 +-
.../gporca/data/dxl/minidump/Union-On-HJNs.mdp | 2 +-
.../gporca/data/dxl/minidump/UnionWithCTE.mdp | 2 +-
.../gporca/data/dxl/minidump/UnnestSQJoins.mdp | 2 +-
.../data/dxl/minidump/UpdateCardinalityAssert.mdp | 192 ++++++--------
.../data/dxl/minidump/UpdateCheckConstraint.mdp | 184 ++++++-------
.../UpdateDistKeyMismatchedDistribution.mdp | 282 +++++++++-----------
.../dxl/minidump/UpdateDistKeyWithNestedJoin.mdp | 231 ++++++++---------
.../gporca/data/dxl/minidump/UpdateDistrKey.mdp | 197 ++++++--------
.../gporca/data/dxl/minidump/UpdateDroppedCols.mdp | 2 +-
.../dxl/minidump/UpdateNoCardinalityAssert.mdp | 131 ++++------
.../UpdateNoDistKeyMismatchedDistribution.mdp | 282 +++++++++-----------
.../dxl/minidump/UpdateNoEnforceConstraints.mdp | 33 ++-
.../gporca/data/dxl/minidump/UpdateNotNullCols.mdp | 227 ++++++++--------
.../gporca/data/dxl/minidump/UpdatePartTable.mdp | 2 +-
.../gporca/data/dxl/minidump/UpdateRandomDistr.mdp | 29 +--
.../data/dxl/minidump/UpdateUniqueConstraint-2.mdp | 29 +--
.../data/dxl/minidump/UpdateUniqueConstraint.mdp | 139 ++++------
.../data/dxl/minidump/UpdateVolatileFunction.mdp | 129 ++++------
.../data/dxl/minidump/UpdateWindowGatherMerge.mdp | 284 ++++++++++-----------
.../data/dxl/minidump/UpdateWithHashJoin.mdp | 156 +++++------
.../gporca/data/dxl/minidump/UpdateZeroRows.mdp | 207 +++++++--------
.../dxl/minidump/UpdatingDistributionColumn.mdp | 161 +++++-------
.../data/dxl/minidump/UpdatingMultipleColumn.mdp | 113 ++++----
.../dxl/minidump/UpdatingNonDistColSameTable.mdp | 89 +++----
.../minidump/UpdatingNonDistributionColumnFunc.mdp | 31 +--
.../ValueScanWithDuplicateAndSelfComparison.mdp | 2 +-
.../dxl/minidump/VarcharMCVCardinalityEquals.mdp | 2 +-
.../minidump/VarcharMCVCardinalityGreaterThan.mdp | 2 +-
.../minidump/VolatileFunctionsBelowScalarAgg.mdp | 4 +-
.../data/dxl/minidump/WindowFrame-SingleEdged.mdp | 2 +-
.../dxl/minidump/WindowFrameExcludeCurrentRow.mdp | 2 +-
.../data/dxl/minidump/WindowFrameExcludeGroup.mdp | 2 +-
.../data/dxl/minidump/WindowFrameExcludeTies.mdp | 2 +-
.../gporca/data/dxl/minidump/WindowFrameGroups.mdp | 2 +-
.../WindowFrameRangePrecedingAndFollowing.mdp | 2 +-
.../data/dxl/minidump/window-count-gpdb6.mdp | 2 +-
.../data/dxl/parse_tests/OptimizerConfig.xml | 2 +-
.../gporca/data/dxl/parse_tests/q57-DMLDelete.xml | 2 +-
.../gporca/data/dxl/parse_tests/q60-DMLUpdate.xml | 2 +-
.../gporca/libgpopt/include/gpopt/engine/CHint.h | 18 +-
.../libgpopt/include/gpopt/operators/CLogicalDML.h | 14 +-
.../gpopt/operators/CLogicalPartitionSelector.h | 13 +-
.../include/gpopt/operators/CPhysicalDML.h | 27 +-
.../gpopt/translate/CTranslatorExprToDXLUtils.h | 7 -
.../libgpopt/include/gpopt/xforms/CXformUtils.h | 7 -
.../gporca/libgpopt/src/operators/CLogicalDML.cpp | 23 +-
.../src/operators/CLogicalPartitionSelector.cpp | 24 +-
.../gporca/libgpopt/src/operators/CPhysicalDML.cpp | 61 +----
.../libgpopt/src/optimizer/COptimizerConfig.cpp | 3 -
.../src/translate/CTranslatorExprToDXL.cpp | 12 +-
.../src/translate/CTranslatorExprToDXLUtils.cpp | 52 ----
.../libgpopt/src/xforms/CXformImplementDML.cpp | 3 +-
.../libgpopt/src/xforms/CXformUpdate2DML.cpp | 37 +--
.../gporca/libgpopt/src/xforms/CXformUtils.cpp | 42 +--
.../include/naucrates/dxl/operators/CDXLOperator.h | 1 -
.../naucrates/dxl/operators/CDXLPhysicalDML.h | 24 +-
.../naucrates/dxl/operators/CDXLScalarPartOid.h | 88 -------
.../naucrates/dxl/parser/CParseHandlerFactory.h | 5 -
.../dxl/parser/CParseHandlerPhysicalDML.h | 6 -
.../dxl/parser/CParseHandlerScalarPartOid.h | 63 -----
.../include/naucrates/dxl/parser/parsehandlers.h | 1 -
.../include/naucrates/dxl/xml/dxltokens.h | 4 -
.../libnaucrates/src/operators/CDXLPhysicalDML.cpp | 11 +-
.../src/operators/CDXLScalarPartOid.cpp | 105 --------
.../gporca/libnaucrates/src/operators/Makefile | 1 -
.../src/parser/CParseHandlerFactory.cpp | 12 -
.../libnaucrates/src/parser/CParseHandlerHint.cpp | 5 -
.../src/parser/CParseHandlerPhysicalDML.cpp | 18 +-
.../src/parser/CParseHandlerScalarPartOid.cpp | 99 -------
.../gporca/libnaucrates/src/parser/Makefile | 1 -
.../gporca/libnaucrates/src/xml/dxltokens.cpp | 5 -
src/backend/gporca/server/dxl.xsd | 5 -
.../src/unittest/gpopt/minidump/CDMLTest.cpp | 3 -
src/test/regress/expected/gporca_optimizer.out | 4 +-
src/test/regress/expected/update_gp.out | 81 ++++++
src/test/regress/expected/update_gp_optimizer.out | 57 +++++
src/test/regress/sql/update_gp.sql | 33 +++
665 files changed, 2337 insertions(+), 3383 deletions(-)
diff --git a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
index 0a9737ebc1..c1e631bd11 100644
--- a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
+++ b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
@@ -4391,10 +4391,8 @@ CTranslatorDXLToPlStmt::TranslateDXLDml(
dml_target_list = target_list_with_dropped_cols;
// Add junk columns to the target list for the 'action', 'ctid',
- // 'gp_segment_id', and tuple's 'oid'. The ModifyTable node will find
- // these based on the resnames. ORCA also includes a similar column for
- // partition Oid in the child's target list, but we don't use it for
- // anything in GPDB.
+ // 'gp_segment_id'. The ModifyTable node will find these based
+ // on the resnames.
if (m_cmd_type == CMD_UPDATE && isSplit)
{
(void) AddJunkTargetEntryForColId(&dml_target_list, &child_context,
@@ -4417,7 +4415,7 @@ CTranslatorDXLToPlStmt::TranslateDXLDml(
// needed, as the child node could do the projection, but we don't have
// the information to determine that here. There's a step in the
// backend optimize_query() function to eliminate unnecessary Results
- // throught the plan, hopefully this Result gets eliminated there.
+ // through the plan, hopefully this Result gets eliminated there.
Result *result = MakeNode(Result);
Plan *result_plan = &(result->plan);
diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/src/backend/gpopt/utils/COptTasks.cpp
index 30e3c00d24..c7431ccd77 100644
--- a/src/backend/gpopt/utils/COptTasks.cpp
+++ b/src/backend/gpopt/utils/COptTasks.cpp
@@ -377,8 +377,7 @@ COptTasks::CreateOptimizerConfig(CMemoryPool *mp, ICostModel *cost_model)
damping_factor_groupby, MAX_STATS_BUCKETS),
GPOS_NEW(mp) CCTEConfig(cte_inlining_cutoff), cost_model,
GPOS_NEW(mp)
- CHint(gpos::int_max /* optimizer_parts_to_force_sort_on_insert */,
- join_arity_for_associativity_commutativity,
+ CHint(join_arity_for_associativity_commutativity,
array_expansion_threshold, join_order_threshold,
broadcast_threshold,
false, /* don't create Assert nodes for constraints, we'll
diff --git a/src/backend/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml b/src/backend/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml
index 2269b8e261..898d751c8b 100644
--- a/src/backend/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml
+++ b/src/backend/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml
@@ -18,7 +18,7 @@
</dxl:Type>
</dxl:Metadata>
<dxl:Plan>
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="4" CtidCol="0" SegmentIdCol="0">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="100.000000" Rows="1000.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp b/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp
index c65e4eb399..bdc8283e74 100644
--- a/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp
+++ b/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp
@@ -46,7 +46,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102002,102003,102073,102074,102113,102120,102144,102146,103001,103006,103007,103008,103014,103015,103022,103027,103029,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp b/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp
index b9f563a127..06002ee143 100644
--- a/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp
+++ b/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp
@@ -42,7 +42,7 @@ t1.a = t2.a and t2.a = t3.a and t1.b = t3.b and t2.b = t3.b;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102002,102003,102073,102074,102113,102120,102144,102146,103001,103006,103007,103008,103014,103015,103022,103027,103029,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp b/src/backend/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp
index 166d6d4e3f..cf1363b582 100644
--- a/src/backend/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp
+++ b/src/backend/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp
@@ -86,7 +86,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102002,102003,102073,102074,102120,102144,102146,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp b/src/backend/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp
index c10a8bf7ad..a48607e6f0 100644
--- a/src/backend/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp
+++ b/src/backend/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp
@@ -50,7 +50,7 @@ explain select * from cs catalog_sales, it item, sr store_returns, ss store_sale
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp b/src/backend/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp
index 0045a12bb0..c5eabc235e 100644
--- a/src/backend/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp
@@ -27,7 +27,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp
index 97f67ba54f..444743d8f6 100644
--- a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp
@@ -42,7 +42,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -242,7 +242,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.023480" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp
index 228f343e05..52fa57d0b9 100644
--- a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp
@@ -54,7 +54,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101001,102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -250,7 +250,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="10">
- <dxl:DMLInsert Columns="0,1" ActionCol="11" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="11" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="882688.190319" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp
index 3f5094fc20..3468f9588a 100644
--- a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp
@@ -49,7 +49,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -378,7 +378,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="10">
- <dxl:DMLInsert Columns="0,1" ActionCol="11" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="11" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="882688.190319" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp
index 72aeb3903a..88666927c8 100644
--- a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp
@@ -65,7 +65,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -432,7 +432,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="42">
- <dxl:DMLInsert Columns="0,1" ActionCol="22" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="22" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1765376.357180" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp
index 04f74a6ecc..9e22be3cee 100644
--- a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp
@@ -47,7 +47,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -299,7 +299,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.015653" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp b/src/backend/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp
index d1c6646afe..224c101418 100644
--- a/src/backend/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp
@@ -26,7 +26,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp b/src/backend/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp
index 3c6fb58006..19cc62df3f 100644
--- a/src/backend/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp
@@ -41,7 +41,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp b/src/backend/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp
index 9c9eae8f9a..1f6fa10ce7 100644
--- a/src/backend/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101006,101010,102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AggregateWithSkew.mdp b/src/backend/gporca/data/dxl/minidump/AggregateWithSkew.mdp
index 8ee177d774..9a44464880 100644
--- a/src/backend/gporca/data/dxl/minidump/AggregateWithSkew.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AggregateWithSkew.mdp
@@ -47,7 +47,7 @@ group by b;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp b/src/backend/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp
index 174bc781b6..af78091bd3 100644
--- a/src/backend/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp
@@ -25,7 +25,7 @@ explain select distinct a from t1 where a is not null and not (a = b);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp b/src/backend/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp
index fe66a7ffa9..1e7cb73d6b 100644
--- a/src/backend/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp b/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp
index 0bb83b1c21..ef5be5f270 100644
--- a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,101013,102024,102025,102074,102146,102119,102120,102128,102131,102132,102133,102134,102135,102136,102140,102141,102142,102143,103001,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp b/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp
index 7a6bb0a455..2ecbd77a0c 100644
--- a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102024,102025,102074,102119,102120,102128,102131,102132,102133,102134,102135,102136,102140,102141,102142,102143,102144,103001,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp b/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp
index b8734c5fe0..ce31c9bcd6 100644
--- a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102024,102025,102074,102119,102120,102128,102131,102132,102133,102134,102135,102136,102140,102141,102142,102143,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp b/src/backend/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp
index 28d2f33227..fe76044efa 100644
--- a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp b/src/backend/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp
index 001f80a2f3..71cc6348fc 100644
--- a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp
@@ -16,7 +16,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp b/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp
index 06c666eb22..19a7af2f55 100644
--- a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp
@@ -67,7 +67,7 @@ Physical plan:
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp b/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp
index c7159106e1..9b0aaed7a6 100644
--- a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp
@@ -63,7 +63,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp b/src/backend/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp
index e6bc339be3..28080ec9c7 100644
--- a/src/backend/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp
@@ -71,7 +71,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp b/src/backend/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp
index 4b073e18a5..f4ae584eb9 100644
--- a/src/backend/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp b/src/backend/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp
index 6e2dfae3e7..0f2df0c8b5 100644
--- a/src/backend/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp
@@ -25,7 +25,7 @@ explain select 1 from foo where foo.a = all('{}');
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp b/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp
index baa9b534e3..b0ccbbf618 100644
--- a/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp
@@ -27,7 +27,7 @@ explain select 1 from foo where foo.a=ANY('{}');
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp b/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp
index d2e005a1e4..cd8c89f3fc 100644
--- a/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp
@@ -25,7 +25,7 @@ explain select 1 from foo where foo.a < any('{}');
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpInList.mdp b/src/backend/gporca/data/dxl/minidump/ArrayCmpInList.mdp
index c95de00552..f00c30efc5 100644
--- a/src/backend/gporca/data/dxl/minidump/ArrayCmpInList.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ArrayCmpInList.mdp
@@ -38,7 +38,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="3" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="3" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCoerceCast.mdp b/src/backend/gporca/data/dxl/minidump/ArrayCoerceCast.mdp
index 20311cf2ac..78b9cc3932 100644
--- a/src/backend/gporca/data/dxl/minidump/ArrayCoerceCast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ArrayCoerceCast.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp b/src/backend/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp
index be23c6416f..04d636e676 100644
--- a/src/backend/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp
@@ -15,7 +15,7 @@ explain select * from foo where d in ('a', 'b');
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp b/src/backend/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp
index 01b15faeee..0e717140e4 100644
--- a/src/backend/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp
+++ b/src/backend/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp
@@ -15,7 +15,7 @@ select * from like_error where some_text LIKE ANY (ARRAY['%text1%']);
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BRINScan-Or.mdp b/src/backend/gporca/data/dxl/minidump/BRINScan-Or.mdp
index e0da9f4c19..2f021adb2e 100644
--- a/src/backend/gporca/data/dxl/minidump/BRINScan-Or.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BRINScan-Or.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102004,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp b/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp
index 9fc5792428..7f448dfaf9 100644
--- a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp
@@ -17,7 +17,7 @@ SELECT * FROM test WHERE a in (1, 47);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp b/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp
index 1e555e8981..f05329ab96 100644
--- a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp b/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp
index 20a10a9bb3..80bc1059fa 100644
--- a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp
@@ -16,7 +16,7 @@ SELECT * FROM btree_test WHERE a in (select 1);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp
index 476e7de866..62bd9b8639 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp
@@ -16,7 +16,7 @@ SELECT * FROM bitmap_test WHERE a in (1, 47);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp
index 1bc79274b4..1fa05ab0fc 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp
@@ -34,7 +34,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102113,102120,102146,102147,103001,103014,103015,103022,103027,103029,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp
index e447fedf51..4cba548edf 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp
@@ -53,7 +53,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp
index 06be806cc7..e8e4ed1e28 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp
@@ -51,7 +51,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp
index 86fb3979ee..e75624240b 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp
@@ -52,7 +52,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp
index 8168e9bbf1..29392b41bd 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102029,102046,102048,102053,102054,102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000,102157,102158"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexProbeMergeFilters.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndexProbeMergeFilters.mdp
index 53a26985f2..2f4aba5646 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndexProbeMergeFilters.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndexProbeMergeFilters.mdp
@@ -26,7 +26,7 @@ EXPLAIN SELECT * FROM table_with_two_indices_ao WHERE b = 15 AND c BETWEEN 10000
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="true"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="true"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103023,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp
index 73282109f2..9ba12a8623 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp
@@ -30,7 +30,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp
index 4b31388f57..7026c7468f 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp
@@ -61,7 +61,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102074,102113,102120,102146,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp b/src/backend/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp
index b77fb7443b..d7cdae602c 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp
@@ -32,7 +32,7 @@ undefined for Bitmap Index Scan. ORCA should find a plan transforming
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102004,102005,102006,102007,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp b/src/backend/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp
index 47f23b7b9e..fc64db25af 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp
@@ -44,7 +44,7 @@ explain select * from t where b=3;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp b/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp
index 4cf528a7ae..9579418305 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp b/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp
index 206bd36f67..0a88b11a82 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp
@@ -43,7 +43,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp b/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp
index 96822595c8..e7e55a3753 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp
@@ -46,7 +46,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102004,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp b/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp
index da40b27726..46a55027f0 100644
--- a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp
@@ -48,7 +48,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102113,102120,102146,102147,103001,103014,103015,103022,103027,103029,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp b/src/backend/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp
index 678c335c19..f5c5163989 100644
--- a/src/backend/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp
@@ -28,7 +28,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103025,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp b/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp
index bc7e10224e..d1086f1ee7 100644
--- a/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp b/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp
index 1f489dd64e..8875b26ed8 100644
--- a/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp b/src/backend/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp
index af64ef2bd8..ec5c7f6426 100644
--- a/src/backend/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp
@@ -38,7 +38,7 @@ Intent: The join should pick up a Broadcast over Redistribute. The hashjoin is s
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp b/src/backend/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp
index 1421516908..c7f0c308ba 100644
--- a/src/backend/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp
@@ -48,7 +48,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102029,102046,102048,102053,102054,102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp b/src/backend/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp
index 1c61bc9b63..55dfe32ba6 100644
--- a/src/backend/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp
+++ b/src/backend/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp
@@ -53,7 +53,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp b/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp
index 99488b7e0b..faa22807f9 100644
--- a/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp
@@ -18,7 +18,7 @@ select a,b from foo, bar where foo.a in (1,2,3,4,5,6) and foo.a = bar.c;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="6"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="6"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp b/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp
index 54f3dac9b2..53ca3f1655 100644
--- a/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp
@@ -18,7 +18,7 @@ select a,b from foo, bar where foo.a in (1,2,3,4,5,6) and foo.a = bar.c;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="5"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="5"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp b/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp
index 74468c95a6..67814dcfb7 100644
--- a/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp
@@ -95,7 +95,7 @@ INNER JOIN (SELECT FOO10.i1 AS i1 FROM foo10 FOO10 WHERE FOO10.i2 = 'EN' ) FOO1
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102146,102120,102144,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp b/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp
index e65bec8c6c..564656b753 100644
--- a/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp
@@ -69,7 +69,7 @@ INNER JOIN (SELECT FOO10.i1 AS i1
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="3"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="3"/>
<dxl:TraceFlags Value="103027,101013,102120,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp
index 2d636c462a..92029bae94 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp
@@ -21,7 +21,7 @@ SELECT * FROM pp WHERE b=2 AND c=2;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="103027,102006,102120,103001,103014,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp
index 5dc08e414a..b398b3adb9 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp
@@ -16,7 +16,7 @@ EXPLAIN SELECT b, a FROM foo UNION ALL SELECT b, a FROM foo INTERSECT ALL SELECT
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp
index 86fcae6092..3cacec28c2 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp
@@ -16,7 +16,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp
index d45163e799..feb7a2d5b0 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp
@@ -15,7 +15,7 @@ INSERT INTO t VALUES (11),(12),(13);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -190,7 +190,7 @@ INSERT INTO t VALUES (11),(12),(13);
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="0">
- <dxl:DMLInsert Columns="0" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.031272" Rows="3.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp
index fc8a19b402..5f44e9655b 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp
@@ -16,7 +16,7 @@ explain select * from foo union select * from bar;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103014,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp
index aeb773059f..161f898398 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp
@@ -18,7 +18,7 @@ EXPLAIN SELECT xmin FROM tbl1 UNION ALL SELECT xmin FROM tbl2;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp
index c0c21c2b8d..e264f41ff1 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp
@@ -17,7 +17,7 @@ EXPLAIN SELECT a,b FROM foo UNION ALL SELECT c,d FROM bar;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="103027,102120,103001,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp
index 84ff359232..ce76ad8b55 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp
@@ -17,7 +17,7 @@ EXPLAIN SELECT * FROM foo UNION ALL SELECT * FROM bar;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103014,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp
index d19a4c09a7..a2479404f8 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp
@@ -17,7 +17,7 @@ EXPLAIN SELECT xmin FROM foo UNION ALL SELECT xmin FROM bar;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp
index e8eafaacc1..5e53a794bf 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp
@@ -15,7 +15,7 @@ select * from t, (select * from t union all select * from t) tt where t.c = tt.c
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,103025,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp
index 03a9a93058..b819c5a7aa 100644
--- a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp
@@ -16,7 +16,7 @@ EXPLAIN SELECT * FROM foo UNION ALL SELECT * FROM bar;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-Random.mdp b/src/backend/gporca/data/dxl/minidump/CTAS-Random.mdp
index cba096c256..c686d08b91 100644
--- a/src/backend/gporca/data/dxl/minidump/CTAS-Random.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTAS-Random.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp b/src/backend/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp
index 26108b6650..bc382491bb 100644
--- a/src/backend/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp b/src/backend/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp
index ec24692300..308baec548 100644
--- a/src/backend/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-with-Limit.mdp b/src/backend/gporca/data/dxl/minidump/CTAS-with-Limit.mdp
index 374878c4a2..541ae5cc52 100644
--- a/src/backend/gporca/data/dxl/minidump/CTAS-with-Limit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTAS-with-Limit.mdp
@@ -36,7 +36,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp b/src/backend/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp
index 08bfe241a5..fad275c0f9 100644
--- a/src/backend/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp
@@ -20,7 +20,7 @@ EXPLAIN CREATE TABLE Test AS SELECT * FROM test_gpfdist_ext DISTRIBUTED BY (a);
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp b/src/backend/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp
index be308eebb9..d436334bde 100644
--- a/src/backend/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp
@@ -17,7 +17,7 @@ EXPLAIN CREATE TABLE Test AS SELECT * FROM test_ext DISTRIBUTED RANDOMLY;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS.mdp b/src/backend/gporca/data/dxl/minidump/CTAS.mdp
index 39d8d7a58d..2c452d15e5 100644
--- a/src/backend/gporca/data/dxl/minidump/CTAS.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTAS.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp b/src/backend/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp
index 6116e99d13..caa3d3ca42 100644
--- a/src/backend/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp
@@ -106,7 +106,7 @@ EXPLAIN CREATE TABLE test AS
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp b/src/backend/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp
index a86efee9d8..55621b3c8d 100644
--- a/src/backend/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-PushProperties.mdp b/src/backend/gporca/data/dxl/minidump/CTE-PushProperties.mdp
index 4827945d51..3c14cce68f 100644
--- a/src/backend/gporca/data/dxl/minidump/CTE-PushProperties.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTE-PushProperties.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp b/src/backend/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp
index 5613ea7a4e..ed005b30b2 100644
--- a/src/backend/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp
@@ -16,7 +16,7 @@ SELECT * FROM T2;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103003,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-with-random-filter.mdp b/src/backend/gporca/data/dxl/minidump/CTE-with-random-filter.mdp
index 96a83d1403..8a06c1060c 100644
--- a/src/backend/gporca/data/dxl/minidump/CTE-with-random-filter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTE-with-random-filter.mdp
@@ -15,7 +15,7 @@ explain with t as (select * from foo) select count(*) from t where random() < 0.
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647"/>
+ <dxl:Hint/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp b/src/backend/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp
index 2f93339ab2..179e6be408 100644
--- a/src/backend/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp
@@ -25,7 +25,7 @@ pivotal=# explain with negcte as (select distinct a from t1 where a is not null
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp b/src/backend/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp
index 4ad65cfef0..b212228c4e 100644
--- a/src/backend/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp
@@ -17,7 +17,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp b/src/backend/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp
index 93bc53fb93..865e9dce3a 100644
--- a/src/backend/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp
@@ -15,7 +15,7 @@ SELECT 1 FROM (SELECT * FROM foo) t2 FULL JOIN (SELECT 1) t1 ON true;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,103032,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp b/src/backend/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp
index ce0f8eb2fc..2625b7b280 100644
--- a/src/backend/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp
@@ -37,7 +37,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTEinlining.mdp b/src/backend/gporca/data/dxl/minidump/CTEinlining.mdp
index f3367f11cb..d2b4d22a0e 100644
--- a/src/backend/gporca/data/dxl/minidump/CTEinlining.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTEinlining.mdp
@@ -19,7 +19,7 @@ explain with v as (select x,y from bar) select v1.x from v v1, v v2 where v1.x =
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103002,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CTG-Filter.mdp b/src/backend/gporca/data/dxl/minidump/CTG-Filter.mdp
index ac009c2800..aa76cf5ab8 100644
--- a/src/backend/gporca/data/dxl/minidump/CTG-Filter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CTG-Filter.mdp
@@ -22,7 +22,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103003,103014,103015,103022,103027,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp b/src/backend/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp
index edb04f23a2..fa0965fc07 100644
--- a/src/backend/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp
@@ -19,7 +19,7 @@ explain select * from n1 where a in (1, (select count(*) from n1));
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp b/src/backend/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp
index c75b63a113..971844e175 100644
--- a/src/backend/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Char-Cardinality.mdp b/src/backend/gporca/data/dxl/minidump/Char-Cardinality.mdp
index 5105c81bb5..dcee358f9c 100644
--- a/src/backend/gporca/data/dxl/minidump/Char-Cardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Char-Cardinality.mdp
@@ -20,7 +20,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Citext-Cardinality.mdp b/src/backend/gporca/data/dxl/minidump/Citext-Cardinality.mdp
index 23cfea03b4..bfd912f9e1 100644
--- a/src/backend/gporca/data/dxl/minidump/Citext-Cardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Citext-Cardinality.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CoerceViaIO.mdp b/src/backend/gporca/data/dxl/minidump/CoerceViaIO.mdp
index 4c077c0aa7..bd9649fb5b 100644
--- a/src/backend/gporca/data/dxl/minidump/CoerceViaIO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CoerceViaIO.mdp
@@ -16,7 +16,7 @@ SELECT * FROM foo WHERE id::text = 'foo';
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="100"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="100"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp b/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp
index fa32371d25..b20ea445bf 100644
--- a/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp
@@ -25,7 +25,7 @@ select * from t2;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp b/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp
index 572180a5ac..2d165750a7 100644
--- a/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp
@@ -18,7 +18,7 @@ from (select regexp_split_to_table(a, ',') as c, b from t) dumb(c, b);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp b/src/backend/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp
index 7bc28d0f50..535816c85d 100644
--- a/src/backend/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp
@@ -33,7 +33,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp b/src/backend/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp
index f6e6bd0fd7..3eff842898 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp
@@ -36,7 +36,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp b/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp
index 6e3bfe5768..a4fae28fba 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp
@@ -14,7 +14,7 @@ EXPLAIN SELECT (VALUES (true));
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103003,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp b/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp
index 8c14a45288..72bba942d7 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp
@@ -17,7 +17,7 @@ SELECT (SELECT a) FROM foo;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp b/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp
index 34ecd7540f..75b3e1b86f 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp
@@ -17,7 +17,7 @@ SELECT * FROM foo,bar WHERE a=(VALUES (1));
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="103027,101000,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp b/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp
index 1953f88608..6dc560f1c7 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp
@@ -18,7 +18,7 @@ SELECT * FROM foo,bar WHERE a=(SELECT c);
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp
index fda8793b94..2756610acb 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp
@@ -23,7 +23,7 @@ Gather Motion 1:1 (slice1; segments: 1) (cost=0.00..431.00 rows=1 width=4)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp
index 328451a3a7..7587bb5042 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp
@@ -23,7 +23,7 @@ Rows out: 0 rows with 0.007 ms to end.
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp
index 87582cad29..b94e6d7adc 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp
@@ -23,7 +23,7 @@ Rows out: 1 rows at destination with 0.241 ms to first row, 0.242 ms to end.
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp
index b63d10fc59..2f32af8854 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp
@@ -23,7 +23,7 @@ Rows out: 0 rows with 0.002 ms to end.
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102074,102113,102120,102146,102147,103001,103014,103015,103022,103027,103029,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp
index f44345d39a..4a439724ef 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp
@@ -23,7 +23,7 @@ Rows out: 1 rows at destination with 0.253 ms to end.
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp
index 6152902774..da0583a9d6 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103026,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp
index c492326500..debbb42063 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp
@@ -23,7 +23,7 @@ Rows out: 0 rows with 0.010 ms to end.
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp
index 2268dbc6fe..8f3bed94a4 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp
@@ -23,7 +23,7 @@ Rows out: 1 rows at destination with 1693 ms to end.
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp
index 5be856ecec..e874979ce8 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp
@@ -23,7 +23,7 @@ Rows out: 0 rows with 0.002 ms to end.
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102074,102113,102120,102146,102147,103001,103014,103015,103022,103027,103029,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp
index cb9db2982d..5ebb2a8c87 100644
--- a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp
@@ -23,7 +23,7 @@ Rows out: 1 rows at destination with 0.250 ms to first row, 0.251 ms to end.
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp b/src/backend/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp
index 123d10b407..35e42d253f 100644
--- a/src/backend/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp
@@ -16,7 +16,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp b/src/backend/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp
index e9cc581fe4..4a2088de54 100644
--- a/src/backend/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp
@@ -640,7 +640,7 @@ explain analyze insert into t1 select t2.a,t3.b from t2, t3 where t2.a = t3.a;
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="18">
- <dxl:DMLInsert Columns="0,6" ActionCol="10" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,6" ActionCol="10" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="877.746838" Rows="1000.000000" Width="7"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp b/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp
index 4385c9b1af..3212fb7b4d 100644
--- a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp b/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp
index 446ee3a7b7..5c774324bc 100644
--- a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp
@@ -34,7 +34,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp b/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp
index ca50b36c50..16d41cbd8a 100644
--- a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp
@@ -77,7 +77,7 @@ create table customer
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp b/src/backend/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp
index 68acae3b97..904d9f88b6 100644
--- a/src/backend/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102047,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp b/src/backend/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp
index f07bbbea30..f479d202a0 100644
--- a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp
@@ -19,7 +19,7 @@ EXPLAIN SELECT pk from partitioned_table WHERE a > (select d from other_table wh
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp b/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp
index 86aed17faf..f9ec2fb855 100644
--- a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp
@@ -20,7 +20,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp b/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp
index 1daf9aadf9..61f38c69bc 100644
--- a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp
@@ -101,7 +101,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103021,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp b/src/backend/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp
index beb529f719..59da7a94e3 100644
--- a/src/backend/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp
+++ b/src/backend/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp
@@ -33,7 +33,7 @@ explain select C.i from C where C.i in (select avg(i) over (partition by i) from
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp b/src/backend/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp
index 2a0515d154..f537e3d055 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -317,7 +317,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="96">
- <dxl:DMLInsert Columns="0" ActionCol="29" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="29" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1356691880.647039" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp b/src/backend/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp
index 5897754351..1a2b5b0757 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp
@@ -45,7 +45,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103015,103022,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -338,7 +338,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1620">
- <dxl:DMLInsert Columns="0" ActionCol="32" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="32" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1356691694.210227" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-Replicated-Input.mdp b/src/backend/gporca/data/dxl/minidump/DML-Replicated-Input.mdp
index 597b843706..079463711c 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-Replicated-Input.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-Replicated-Input.mdp
@@ -337,7 +337,7 @@ WHERE sach_vsnr = 465132477;
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1,10" ActionCol="11" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1,10" ActionCol="11" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.001226" Rows="1.000000" Width="10"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp b/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp
index 16baf32006..da19e263ee 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp
@@ -47,7 +47,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -384,7 +384,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="354">
- <dxl:DMLInsert Columns="0" ActionCol="41" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="41" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1808628108.398402" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp b/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp
index db85a066df..97825d3d17 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -268,7 +268,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1">
- <dxl:DMLInsert Columns="1" ActionCol="10" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1" ActionCol="10" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.020983" Rows="2.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-Volatile-Function.mdp b/src/backend/gporca/data/dxl/minidump/DML-Volatile-Function.mdp
index 5f89fe14a3..efb354542d 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-Volatile-Function.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-Volatile-Function.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -247,7 +247,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="3">
- <dxl:DMLInsert Columns="8" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="8" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.010506" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp b/src/backend/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp
index 8261526245..fbba4c10c8 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103021,103022,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -281,7 +281,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="16">
- <dxl:DMLInsert Columns="1" ActionCol="14" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1" ActionCol="14" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="882688.057927" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp b/src/backend/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp
index c6498cdb5c..081b04ae8d 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103006,103007,103008,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -710,7 +710,7 @@
</dxl:LogicalDelete>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="156">
- <dxl:DMLDelete Columns="0" ActionCol="23" OidCol="0" CtidCol="1" SegmentIdCol="7" InputSorted="false">
+ <dxl:DMLDelete Columns="0" ActionCol="23" CtidCol="1" SegmentIdCol="7">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1324032.570616" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp b/src/backend/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp
index 962adb0f6d..556d00edcf 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp
@@ -22,7 +22,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -236,7 +236,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1">
- <dxl:DMLInsert Columns="2" ActionCol="11" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="2" ActionCol="11" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="882688.097734" Rows="2.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-MasterOnlyTable-1.mdp b/src/backend/gporca/data/dxl/minidump/DML-With-MasterOnlyTable-1.mdp
index 1c42be5929..46dbc93595 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-With-MasterOnlyTable-1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-With-MasterOnlyTable-1.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -365,7 +365,7 @@
</dxl:LogicalDelete>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="42">
- <dxl:DMLDelete Columns="0" ActionCol="29" OidCol="0" CtidCol="1" SegmentIdCol="7" InputSorted="false">
+ <dxl:DMLDelete Columns="0" ActionCol="29" CtidCol="1" SegmentIdCol="7">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1324032.712669" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp b/src/backend/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp
index 31b72907a9..bc98517872 100644
--- a/src/backend/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DMLCollapseProject.mdp b/src/backend/gporca/data/dxl/minidump/DMLCollapseProject.mdp
index 747e385769..6e4ce5df39 100644
--- a/src/backend/gporca/data/dxl/minidump/DMLCollapseProject.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DMLCollapseProject.mdp
@@ -362,7 +362,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="4">
- <dxl:DMLInsert Columns="1,2,3,13" ActionCol="15" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2,3,13" ActionCol="15" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="862.062827" Rows="1.000000" Width="28"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp b/src/backend/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp
index 89c3fa8eb6..b4023be171 100644
--- a/src/backend/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,103037,104002,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp b/src/backend/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp
index c7b2463e85..197a58d1ba 100644
--- a/src/backend/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp
@@ -38,7 +38,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,102155,102156,103001,103014,103022,103027,103029,103033,103035,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp b/src/backend/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp
index 270deb5cd1..9adcb71d85 100644
--- a/src/backend/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp
@@ -38,7 +38,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,102155,102156,103001,103014,103022,103027,103029,103033,103036,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DPv2QueryOnly.mdp b/src/backend/gporca/data/dxl/minidump/DPv2QueryOnly.mdp
index 7313e78f59..e6ba95258c 100644
--- a/src/backend/gporca/data/dxl/minidump/DPv2QueryOnly.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DPv2QueryOnly.mdp
@@ -38,7 +38,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,102155,102156,103001,103014,103022,103027,103029,103033,103034,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp b/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp
index 5b229956a7..044c779f71 100644
--- a/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp
@@ -30,7 +30,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102056,102059,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp b/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp
index 2c6a3c2549..4a4ef26160 100644
--- a/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp
@@ -33,7 +33,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102056,102059,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp b/src/backend/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp
index 9be7115e4e..605ece3050 100644
--- a/src/backend/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp
@@ -45,7 +45,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102056,102059,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp b/src/backend/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp
index 5d0cc907cd..c559003215 100644
--- a/src/backend/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp
@@ -23,7 +23,7 @@ select (select distinct tint.c from tint as tt) x from tint;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp b/src/backend/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp
index 3f418844e7..bbe9d2647b 100644
--- a/src/backend/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp
@@ -31,7 +31,7 @@ explain select count(distinct h) from testhstore;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp b/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp
index 3390cb57bb..e307e71996 100644
--- a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp
@@ -28,7 +28,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp b/src/backend/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp
index dd78946bb7..6afe85840a 100644
--- a/src/backend/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp
@@ -32,7 +32,7 @@ explain select * from t;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp b/src/backend/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp
index 505a5ad95f..cd55ab698f 100644
--- a/src/backend/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp
@@ -20,7 +20,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -720,7 +720,7 @@
</dxl:LogicalDelete>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="238">
- <dxl:DMLDelete Columns="0" ActionCol="21" OidCol="0" CtidCol="1" SegmentIdCol="7" InputSorted="false">
+ <dxl:DMLDelete Columns="0" ActionCol="21" CtidCol="1" SegmentIdCol="7">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="862.965580" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp b/src/backend/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp
index 7543807143..6a347b4237 100644
--- a/src/backend/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp
@@ -45,7 +45,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -666,7 +666,7 @@
</dxl:LogicalDelete>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="35">
- <dxl:DMLDelete Columns="0,1,2" ActionCol="24" OidCol="0" CtidCol="3" SegmentIdCol="9" InputSorted="false">
+ <dxl:DMLDelete Columns="0,1,2" ActionCol="24" CtidCol="3" SegmentIdCol="9">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="862.034361" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomDistr.mdp b/src/backend/gporca/data/dxl/minidump/DeleteRandomDistr.mdp
index 324616301f..ef459a83b1 100644
--- a/src/backend/gporca/data/dxl/minidump/DeleteRandomDistr.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DeleteRandomDistr.mdp
@@ -202,7 +202,7 @@
</dxl:LogicalDelete>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLDelete Columns="0,1" ActionCol="9" OidCol="0" CtidCol="2" SegmentIdCol="8" InputSorted="false">
+ <dxl:DMLDelete Columns="0,1" ActionCol="9" CtidCol="2" SegmentIdCol="8">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.043023" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp b/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp
index 7a601eff7d..3d5f6d0991 100644
--- a/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp
@@ -26,7 +26,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -195,7 +195,7 @@
</dxl:LogicalDelete>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLDelete Columns="0" ActionCol="8" OidCol="0" CtidCol="1" SegmentIdCol="7" InputSorted="false">
+ <dxl:DMLDelete Columns="0" ActionCol="8" CtidCol="1" SegmentIdCol="7">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.023458" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp b/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp
index c8f3656841..ac9f68d21f 100644
--- a/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp
@@ -33,7 +33,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -276,7 +276,7 @@
</dxl:LogicalDelete>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="17">
- <dxl:DMLDelete Columns="0" ActionCol="16" OidCol="0" CtidCol="1" SegmentIdCol="7" InputSorted="false">
+ <dxl:DMLDelete Columns="0" ActionCol="16" CtidCol="1" SegmentIdCol="7">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="862.023911" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp b/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp
index 76ce141847..a4c2fa090a 100644
--- a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp b/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp
index 2b1db7af0c..3bf766a4b0 100644
--- a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp b/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp
index d1badfee3a..8365ef29f6 100644
--- a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp
@@ -15,7 +15,7 @@ select * from foo where gp_segment_id=2;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp b/src/backend/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp
index edd3675b84..3cc87e91fe 100644
--- a/src/backend/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp
@@ -20,7 +20,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,103039,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp b/src/backend/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp
index 6fa1528653..324b2e213c 100644
--- a/src/backend/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp b/src/backend/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp
index 5fb1eddc66..f5916551c0 100644
--- a/src/backend/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp
@@ -20,7 +20,7 @@ select * from (select * from h order by j limit 2) x where j = 2;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp b/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp
index bebfc88377..a492116bd1 100644
--- a/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp
@@ -85,7 +85,7 @@ Physical plan:
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101001,102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -452,7 +452,7 @@ Physical plan:
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="168">
- <dxl:DMLInsert Columns="0,1" ActionCol="22" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="22" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1765376.357206" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp b/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp
index e0bfb4137f..d35fca902a 100644
--- a/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103025,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -220,7 +220,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1">
- <dxl:DMLInsert Columns="0" ActionCol="16" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="16" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.010432" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp b/src/backend/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp
index 688b83af60..d99409850e 100644
--- a/src/backend/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp
@@ -49,7 +49,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,102155,102156,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DqaHavingMax.mdp b/src/backend/gporca/data/dxl/minidump/DqaHavingMax.mdp
index 9a6971dee4..706cc41744 100644
--- a/src/backend/gporca/data/dxl/minidump/DqaHavingMax.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DqaHavingMax.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DqaMax.mdp b/src/backend/gporca/data/dxl/minidump/DqaMax.mdp
index 343e2f45ef..f90b0da77d 100644
--- a/src/backend/gporca/data/dxl/minidump/DqaMax.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DqaMax.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DqaMin.mdp b/src/backend/gporca/data/dxl/minidump/DqaMin.mdp
index 0877d79e26..fd055cc85e 100644
--- a/src/backend/gporca/data/dxl/minidump/DqaMin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DqaMin.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DqaNoRedistribute.mdp b/src/backend/gporca/data/dxl/minidump/DqaNoRedistribute.mdp
index 3857c9cf11..4d7bf70299 100644
--- a/src/backend/gporca/data/dxl/minidump/DqaNoRedistribute.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DqaNoRedistribute.mdp
@@ -53,7 +53,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102113,102120,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DqaSubqueryMax.mdp b/src/backend/gporca/data/dxl/minidump/DqaSubqueryMax.mdp
index 92419eea76..0c18fc50c4 100644
--- a/src/backend/gporca/data/dxl/minidump/DqaSubqueryMax.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DqaSubqueryMax.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp b/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp
index e4eca2964e..94be440991 100644
--- a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,101001,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp b/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp
index 030df1c3ed..3e6da8b72d 100644
--- a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp b/src/backend/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp
index b46804c79c..9582d7d635 100644
--- a/src/backend/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp
@@ -188,7 +188,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp b/src/backend/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp
index c9dae19c92..b40d909d58 100644
--- a/src/backend/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp
@@ -122,7 +122,7 @@ EXPLAIN SELECT * FROM solo WHERE year_id=2017 AND month_id=6;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp b/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp
index 4addc8c819..60d8c93958 100644
--- a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp
@@ -47,7 +47,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102006,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp b/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp
index 6e6fe1dc84..60a27816c3 100644
--- a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp b/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp
index e864938b0f..2f930d6f87 100644
--- a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp
+++ b/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp b/src/backend/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp
index a96d3e320d..9168e6f754 100644
--- a/src/backend/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103030,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggExpression.mdp b/src/backend/gporca/data/dxl/minidump/EagerAggExpression.mdp
index fbd52489f4..4c201bcb4a 100644
--- a/src/backend/gporca/data/dxl/minidump/EagerAggExpression.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EagerAggExpression.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103022,103027,103030,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp b/src/backend/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp
index 5251f9fb0e..3bfc4a65b5 100644
--- a/src/backend/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp
@@ -44,7 +44,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103030,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMax.mdp b/src/backend/gporca/data/dxl/minidump/EagerAggMax.mdp
index 3254a25cc0..d5997e70cf 100644
--- a/src/backend/gporca/data/dxl/minidump/EagerAggMax.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EagerAggMax.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103030,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp b/src/backend/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp
index e2b9bc7ae3..649d2110c1 100644
--- a/src/backend/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp
@@ -60,7 +60,7 @@
<dxl:CostParam LowerBound="1023.500000" Name="NLJFactor" UpperBound="1024.500000" Value="1024.000000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint ArrayExpansionThreshold="100" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false" JoinArityForAssociativityCommutativity="18" JoinOrderDynamicProgThreshold="10" MinNumOfPartsToRequireSortOnInsert="2147483647"/>
+ <dxl:Hint ArrayExpansionThreshold="100" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false" JoinArityForAssociativityCommutativity="18" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103030,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMinMax.mdp b/src/backend/gporca/data/dxl/minidump/EagerAggMinMax.mdp
index 3c53c46e48..046fe13640 100644
--- a/src/backend/gporca/data/dxl/minidump/EagerAggMinMax.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EagerAggMinMax.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103030,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggSubquery.mdp b/src/backend/gporca/data/dxl/minidump/EagerAggSubquery.mdp
index f4e83e5b00..be38ac32ad 100644
--- a/src/backend/gporca/data/dxl/minidump/EagerAggSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EagerAggSubquery.mdp
@@ -52,7 +52,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102101,102120,103001,103014,103015,103022,103027,103030,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp b/src/backend/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp
index f113e6cd1b..82e05ca934 100644
--- a/src/backend/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp
@@ -46,7 +46,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp b/src/backend/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp
index d7a5468a1f..a3283095be 100644
--- a/src/backend/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp
@@ -43,7 +43,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp b/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp
index a1eece0bce..db61382898 100644
--- a/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp
@@ -40,7 +40,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102002,102003,102073,102074,102113,102120,102144,102146,102147,103001,103014,103015,103022,103027,103029,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp b/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp
index fc14ee13bb..d732b3beda 100644
--- a/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp
+++ b/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp
@@ -34,7 +34,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102002,102003,102073,102074,102113,102120,102144,102146,102147,103001,103014,103015,103022,103027,103029,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp b/src/backend/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp
index 17f9ff79b2..dbe93313b7 100644
--- a/src/backend/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp
@@ -54,7 +54,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp b/src/backend/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp
index 69619386c1..23de8c6837 100644
--- a/src/backend/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp b/src/backend/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp
index b9a2235697..44ce587abb 100644
--- a/src/backend/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102017,102024,102025,102074,102119,102120,102128,102131,102132,102133,102134,102135,102136,102140,102141,102142,102143,102144,103001,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp b/src/backend/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp
index 0c4309d546..e4652246e0 100644
--- a/src/backend/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp
@@ -71,7 +71,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103022,103027,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp b/src/backend/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp
index 33e912d812..1a19994fc2 100644
--- a/src/backend/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp
@@ -18,7 +18,7 @@ select (select b from bar) + 1 from foo;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp b/src/backend/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp
index 3fc9158a09..4f9a117d35 100644
--- a/src/backend/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101012,102001,102002,102003,102074,102090,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FOJ-Condition-False.mdp b/src/backend/gporca/data/dxl/minidump/FOJ-Condition-False.mdp
index 022ec5e8e5..4a0540260f 100644
--- a/src/backend/gporca/data/dxl/minidump/FOJ-Condition-False.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FOJ-Condition-False.mdp
@@ -18,7 +18,7 @@ select * from foo a full join foo b on false;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103032,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FilterScalarCast.mdp b/src/backend/gporca/data/dxl/minidump/FilterScalarCast.mdp
index e68ae59a67..543581e940 100644
--- a/src/backend/gporca/data/dxl/minidump/FilterScalarCast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FilterScalarCast.mdp
@@ -18,7 +18,7 @@ EXPLAIN SELECT * FROM foo WHERE b IN ('xyz', 'asds');
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp
index 3b140b1d0b..e89986aeb9 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Caps.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-Caps.mdp
index 14c9c81210..bac1031a0e 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-Caps.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-Caps.mdp
@@ -17,7 +17,7 @@ explain select * from edges e1 full outer join edges e2 on (e1.grp = e2.grp and
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp
index 2dde0d02be..58a6de6cfa 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp
index 18a323e9cc..4cd2954340 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp
@@ -81,7 +81,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103032,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp
index 0adf771106..da29fafea1 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102120,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp
index cf4e0653e5..b0d09ceee3 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp
index a9f74bbe9d..a1c93e554a 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp
index 51e31115ce..98ea465492 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp
@@ -33,7 +33,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Replicated.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-Replicated.mdp
index e9c7c50156..0cbe4f48f1 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-Replicated.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-Replicated.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp
index 15ceee6397..0f2437c11e 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp
index c26d3bc7e2..e0bf867ad1 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp
index 3543749320..6f8d18146f 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp b/src/backend/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp
index 144b3f990e..8ef3ae3230 100644
--- a/src/backend/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp b/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp
index 1e5161fae2..0469f36815 100644
--- a/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp b/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp
index 4d2cd55398..65cfdf9df3 100644
--- a/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102120,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp b/src/backend/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp
index 257a83e523..2ec8dcda7b 100644
--- a/src/backend/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103003,103014,103015,103022,103027,103029,103032,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp b/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp
index 00a339d649..26fd31b050 100644
--- a/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp
@@ -26,7 +26,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103003,103014,103015,103022,103027,103029,103032,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp b/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp
index c9254e854e..367099ff60 100644
--- a/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103003,103014,103015,103022,103027,103029,103032,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp b/src/backend/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp
index 5e92503e11..f6f43e5f20 100644
--- a/src/backend/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp
+++ b/src/backend/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103003,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/GinIndex.mdp b/src/backend/gporca/data/dxl/minidump/GinIndex.mdp
index 6ff8933f6d..369fb92849 100644
--- a/src/backend/gporca/data/dxl/minidump/GinIndex.mdp
+++ b/src/backend/gporca/data/dxl/minidump/GinIndex.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102004,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp b/src/backend/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp
index f86b06cb69..a78f8b203f 100644
--- a/src/backend/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp
+++ b/src/backend/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102004,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp b/src/backend/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp
index 6c7b3d2cc3..112c6760ea 100644
--- a/src/backend/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp
+++ b/src/backend/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102004,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp
index 4ac3a01ece..1e7f8f05e2 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp
@@ -41,7 +41,7 @@ Gather Motion 3:1 (slice1; segments: 3) (cost=0.00..0.00 rows=1 width=4)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp
index e36ae86273..781d6d6166 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp
@@ -37,7 +37,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102074,102113,102120,102146,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp
index 1c32b6f95d..13b3b922ae 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp
@@ -43,7 +43,7 @@ Gather Motion 3:1 (slice2; segments: 3) (cost=0.00..433.00 rows=1 width=24)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp
index 0ca57511a1..65b7200a7d 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp
@@ -32,7 +32,7 @@ Optimizer status: PQO version 2.65.1
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp
index fcef63dd39..7dac909ca1 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp
@@ -32,7 +32,7 @@ Optimizer status: PQO version 2.65.1
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp
index 478cde96fb..779ba50cf2 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp
@@ -37,7 +37,7 @@ Result (cost=0.00..0.00 rows=1 width=36)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp
index 353630e401..2476a86fed 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp
@@ -38,7 +38,7 @@ Result (cost=0.00..8.00 rows=2 width=36)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp
index 8f3fc6ad5f..211a2d0d14 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp
@@ -39,7 +39,7 @@ Gather Motion 3:1 (slice1; segments: 3) (cost=0.00..6.00 rows=1 width=4)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102115,102116,102120,102128,102134,102135,102136,102140,102142,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp
index 55f0d21a62..e8de20f4ac 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp
@@ -37,7 +37,7 @@ Gather Motion 3:1 (slice1; segments: 3) (cost=0.00..0.00 rows=1 width=4)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp b/src/backend/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp
index 9992318a88..3bc5ea31aa 100644
--- a/src/backend/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp
@@ -35,7 +35,7 @@ Gather Motion 3:1 (slice1; segments: 3) (cost=0.00..431.00 rows=1 width=44)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp b/src/backend/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp
index e06f49fc6d..77c594f4a9 100644
--- a/src/backend/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp
@@ -49,7 +49,7 @@ EXPLAIN SELECT * FROM t1, t2, t3, t4 where b = c;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="2" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="2" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102001,102002,102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryJoin.mdp b/src/backend/gporca/data/dxl/minidump/GreedyNAryJoin.mdp
index f1c1e0ae41..a4a11c4260 100644
--- a/src/backend/gporca/data/dxl/minidump/GreedyNAryJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/GreedyNAryJoin.mdp
@@ -43,7 +43,7 @@ EXPLAIN SELECT * FROM t1 INNER JOIN t2 ON a =b INNER JOIN t3 ON b = c;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="2" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="2" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102001,102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp b/src/backend/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp
index f5808c55b1..c66d4849c4 100644
--- a/src/backend/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp
+++ b/src/backend/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102003,102073,102074,102120,103001,103014,103015,103022,103027,102146,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp b/src/backend/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp
index eb8bb6d5d7..b4a972582c 100644
--- a/src/backend/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp
+++ b/src/backend/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp
@@ -39,7 +39,7 @@ EXPLAIN SELECT * FROM t1, t2, t3;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="2" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="2" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102001,102002,102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp b/src/backend/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp
index f4739c813d..4a17729c09 100644
--- a/src/backend/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp
@@ -20,7 +20,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InClauseWithMCV.mdp b/src/backend/gporca/data/dxl/minidump/InClauseWithMCV.mdp
index 86d923a603..5129c9e0e6 100644
--- a/src/backend/gporca/data/dxl/minidump/InClauseWithMCV.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InClauseWithMCV.mdp
@@ -19,7 +19,7 @@ explain select * from bar where a in (1, (select count(*) from bar));
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp b/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp
index 145d61c106..2dacd98806 100644
--- a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp
@@ -38,7 +38,7 @@ EXPLAIN SELECT * FROM foo WHERE a IN (SELECT b+1 FROM bar);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp b/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp
index 9cbffaf4cf..d36d0f655e 100644
--- a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp
@@ -38,7 +38,7 @@ EXPLAIN SELECT * FROM foo WHERE 1+a IN (SELECT b+1 FROM bar);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,101000,101013,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp b/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp
index 7df4a18214..fc89dd8189 100644
--- a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp
@@ -35,7 +35,7 @@ SELECT * FROM foo WHERE 2 IN (SELECT b+1 FROM bar);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp b/src/backend/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp
index db4ec24dfd..7b254823b8 100644
--- a/src/backend/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp
@@ -57,7 +57,7 @@ select *
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102017,102074,102101,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp b/src/backend/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp
index cf656b57a7..8391cf3b58 100644
--- a/src/backend/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp
@@ -42,7 +42,7 @@ Optimizer: Pivotal Optimizer (GPORCA)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp b/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp
index 2781490508..e4132e7acf 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp
@@ -17,7 +17,7 @@ select * from bar, (select * from foo where foo.a in (select h.a from bar h, bar
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp b/src/backend/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp
index 61365d49fe..391e45d1a3 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp
@@ -64,7 +64,7 @@ explain select * from t0 left join t1 on t0.a=t1.a left join t2 on (t2.a=t0.a an
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp b/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp
index 4046a86d69..34ca56e7b8 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp
@@ -30,7 +30,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp b/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp
index 59603bc45a..49ee1188b1 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp b/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp
index 88f76101b1..5b11211bd6 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp b/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp
index 557056e966..7199ee2792 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp b/src/backend/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp
index 39e35eeda0..df1c90bcd4 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp
@@ -37,7 +37,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp b/src/backend/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp
index 8014010262..457552fc53 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp
@@ -27,7 +27,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp b/src/backend/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp
index 81f0fba947..3e014a1c1a 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp b/src/backend/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp
index 6fb102eb4e..134b8851eb 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp
@@ -41,7 +41,7 @@ explain select * from R1 inner join S1 on a = b union all select * from R2 inner
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp
index 47f8bb5eaf..f83f78f504 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp
@@ -27,7 +27,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p3 WHERE c > 10;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp
index 05a64330b8..8c50dc7859 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp
@@ -26,7 +26,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p3 WHERE c > 10;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp
index 796c9f1986..7dcc8017be 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp
@@ -23,7 +23,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c < 10;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp
index 73e1b4805a..30ab4a96cf 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p2 WHERE c > 10 AND f > 15;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp
index f29dc0f960..aa19d95fb1 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p2 WHERE c > 10 AND f > 12;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp
index 06858f9d4a..f8c102836c 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p2 WHERE c > 10 AND d > 14;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp
index 3e445717a6..e876c0feec 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p2 WHERE e > 20 OR f > 22;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp
index f641cb2cf1..36b940e1af 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c < 10 AND d > 20;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp
index 6b27e2a988..b52a00d5f5 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c < 10 AND d > 20;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp
index 5a9c0f5c3a..d0ad5e537f 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c > 11 OR d > 20;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp
index 7b333dd918..9b16ec3478 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p2 WHERE c > 10 AND d > 13;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp
index de7b7c236c..05e812a9d8 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p2 WHERE d > 10;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp
index 9bb9ea30c2..ba1adb6f5c 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p2 WHERE c > 12 OR d > 13;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp
index ed27d4bb46..7cf13499a0 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c < 10;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp
index 809a67f64c..643a00f5f3 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE c < 10;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp
index c8c94d5183..cc0031f184 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE d < 10;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp
index 7da3e9889c..b453873adb 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp
@@ -24,7 +24,7 @@ EXPLAIN SELECT * FROM foo_1_prt_p1 WHERE d < 10;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp b/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp
index 094ece5fd5..31a9a9175a 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102004,102005,102074,102120,102146,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp b/src/backend/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp
index c50a9f31ae..1e321dd37a 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp
@@ -46,7 +46,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102014,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp b/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp
index 47cd0ab048..c92639b5ae 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp
@@ -57,7 +57,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102006,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp b/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp
index bfc6688e63..ccc7dfd847 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp
@@ -42,7 +42,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102004,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp b/src/backend/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp
index 254dce71e4..161c006396 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp
@@ -35,7 +35,7 @@ SELECT a FROM y WHERE (a IN (SELECT b FROM bar WHERE b = 2));
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102024,102025,102074,102119,102120,102128,102131,102132,102133,102134,102135,102136,102140,102141,102142,102143,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp b/src/backend/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp
index 1c8f693da9..90ade66f65 100644
--- a/src/backend/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp
+++ b/src/backend/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp
@@ -47,7 +47,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102120,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicates.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicates.mdp
index 42c5ab2f1a..029e34286a 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicates.mdp
@@ -43,7 +43,7 @@ explain select 1+row_number() over(partition by foo.c) from foo, bar where foo.a
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp
index 8b06ca2dde..2fdf63ea54 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp
@@ -36,7 +36,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp
index db7cf8f1e8..5373052769 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp
@@ -40,7 +40,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp
index f7e129b572..0b98e8cd90 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp
@@ -43,7 +43,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp
index dcd138f510..55f9d3c25b 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp
@@ -40,7 +40,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102120,103001,103014,103015,103022,103027,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp
index 30d2806f8c..07a663030a 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp
@@ -46,7 +46,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp
index d7b1c2601f..d4fe9e9796 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp
@@ -19,7 +19,7 @@ a < 2 should also be outside the limit but not below.
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp
index ed29ae9ebe..43d241d8be 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp
@@ -56,7 +56,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp
index 18dc6377e1..549eb3c89f 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102074,102120,102146,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp
index 699a3ffd45..5bc35ab59f 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp
@@ -56,7 +56,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp
index d60db1aaab..284e28210b 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp
index b02d9eb8d1..0aa1f2739b 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp
@@ -46,7 +46,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp
index 06e15386e2..cdced1c0db 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp
@@ -53,7 +53,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp
index 4913861cc7..4ab130019e 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp
index e5e0841c22..8f20da2b34 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102074,102120,102146,102155,102156,103001,103014,103022,103027,103029,103038,103041,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp
index c10f8ddda9..f8b373998b 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp
@@ -44,7 +44,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp b/src/backend/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp
index adec46aeb2..76dfe03814 100644
--- a/src/backend/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp b/src/backend/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp
index 9ae0415123..620f815380 100644
--- a/src/backend/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp
@@ -22,7 +22,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp b/src/backend/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp
index 14585b43fc..a4bc9cc9e2 100644
--- a/src/backend/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp
@@ -48,7 +48,7 @@ EXPLAIN SELECT b2, sum(c1) FROM t1, t2 WHERE a1 = b2 GROUP BY b2 ORDER BY b2;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp b/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp
index 74691ed986..1fa55b9c55 100644
--- a/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp
@@ -30,7 +30,7 @@ ON (a.col = b.col);
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -295,7 +295,7 @@ ON (a.col = b.col);
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1248">
- <dxl:DMLInsert Columns="0" ActionCol="32" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="32" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1724.011396" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp b/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp
index 9b187072b1..bea581ab39 100644
--- a/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp
@@ -30,7 +30,7 @@ ON (a.col = b.col);
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -333,7 +333,7 @@ ON (a.col = b.col);
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1127">
- <dxl:DMLInsert Columns="0" ActionCol="34" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="34" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1724.011735" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp b/src/backend/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp
index 828915dc32..d031d7fb67 100644
--- a/src/backend/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp
@@ -49,7 +49,7 @@ EXPLAIN SELECT b2, sum(c1) FROM t1, t2 WHERE a1 = b2 GROUP BY b2 ORDER BY b2;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp b/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp
index a26fd26c11..ef8604939a 100644
--- a/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp
@@ -577,7 +577,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.312819" Rows="20.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp b/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp
index b83f2be5d6..64e4c65c9b 100644
--- a/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp
@@ -536,7 +536,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="10" CtidCol="0" SegmentIdCol="0" InputSorted="true">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0" InputSorted="true">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.418667" Rows="20.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/Insert-AO.mdp b/src/backend/gporca/data/dxl/minidump/Insert-AO.mdp
index 194d2ed325..99c0a273d9 100644
--- a/src/backend/gporca/data/dxl/minidump/Insert-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Insert-AO.mdp
@@ -366,7 +366,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.312819" Rows="20.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp b/src/backend/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp
index ef9c99f347..654e9021b0 100644
--- a/src/backend/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -506,7 +506,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1180">
- <dxl:DMLInsert Columns="38,39,42,43,44" ActionCol="48" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="38,39,42,43,44" ActionCol="48" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="867.122533" Rows="96.000000" Width="36"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/Insert.mdp b/src/backend/gporca/data/dxl/minidump/Insert.mdp
index 2d52fa654f..44d89f511a 100644
--- a/src/backend/gporca/data/dxl/minidump/Insert.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Insert.mdp
@@ -178,7 +178,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="1,0" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,0" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.023484" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertAssertSort.mdp b/src/backend/gporca/data/dxl/minidump/InsertAssertSort.mdp
index 7e1eadc799..a53820d0b6 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertAssertSort.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertAssertSort.mdp
@@ -363,7 +363,7 @@ explain insert into tbl_cds_buysell_orders_new (a,b,c)
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1,2,10,11,12,13" ActionCol="14" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1,2,10,11,12,13" ActionCol="14" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="42587.627692" Rows="1000000.000000" Width="12"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertCheckConstraint.mdp b/src/backend/gporca/data/dxl/minidump/InsertCheckConstraint.mdp
index 76cc0e090e..95464d71cd 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertCheckConstraint.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertCheckConstraint.mdp
@@ -278,7 +278,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="1,2,3,4" ActionCol="5" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2,3,4" ActionCol="5" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.039178" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTuple.mdp b/src/backend/gporca/data/dxl/minidump/InsertConstTuple.mdp
index 1f040db9f5..1025d976bf 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertConstTuple.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertConstTuple.mdp
@@ -192,7 +192,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="3">
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.023474" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp b/src/backend/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp
index de23b46e36..359910a3ee 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -208,7 +208,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.015645" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp b/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp
index 41bc32bad3..2ad6bf6de5 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp
@@ -230,7 +230,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.023595" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp b/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp
index 8335d5b3f3..25c8f0c277 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp
@@ -220,7 +220,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="5">
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.047000" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp b/src/backend/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp
index 88f97371fc..5da497a429 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp
@@ -210,7 +210,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="3,1,2" ActionCol="4" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="3,1,2" ActionCol="4" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.039158" Rows="1.000000" Width="12"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp b/src/backend/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp
index 5fe7cf7958..f36c90bfc7 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp
@@ -18,7 +18,7 @@ EXPLAIN INSERT INTO ColumnMapping VALUES (NULL);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -182,7 +182,7 @@ EXPLAIN INSERT INTO ColumnMapping VALUES (NULL);
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="1" ActionCol="2" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1" ActionCol="2" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.010454" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertMasterOnlyTable.mdp b/src/backend/gporca/data/dxl/minidump/InsertMasterOnlyTable.mdp
index e6a4e50050..d4e4adb2ef 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertMasterOnlyTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertMasterOnlyTable.mdp
@@ -232,7 +232,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.093882" Rows="2.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertMasterOnlyTableConstTuple.mdp b/src/backend/gporca/data/dxl/minidump/InsertMasterOnlyTableConstTuple.mdp
index d7021d88bc..d301665d84 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertMasterOnlyTableConstTuple.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertMasterOnlyTableConstTuple.mdp
@@ -174,7 +174,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="5">
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.046888" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp b/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp
index 6f1f17a5cd..ed468898ee 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp
@@ -525,7 +525,7 @@ explain insert into pt2 select * from r;
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1,2" ActionCol="10" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1,2" ActionCol="10" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.031309" Rows="1.000000" Width="16"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp b/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp
index f4c91c9390..482c93c534 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp
@@ -525,7 +525,7 @@ explain insert into pt2 select * from r;
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1,2" ActionCol="10" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1,2" ActionCol="10" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.031284" Rows="1.000000" Width="16"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp b/src/backend/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp
index ba34ff06a9..943c50b035 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp
@@ -166,7 +166,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="1" ActionCol="2" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1" ActionCol="2" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.015664" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp b/src/backend/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp
index 4262c3b335..55770e3ad8 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp
@@ -20,7 +20,7 @@ insert into constraints_tab values (NULL, -1);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -206,7 +206,7 @@ insert into constraints_tab values (NULL, -1);
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="3">
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.020883" Rows="1.000000" Width="12"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertNonSingleton.mdp b/src/backend/gporca/data/dxl/minidump/InsertNonSingleton.mdp
index 0fb8560e11..c94674ae34 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertNonSingleton.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertNonSingleton.mdp
@@ -34,7 +34,7 @@ EXPLAIN INSERT INTO snackbox SELECT a FROM (SELECT c FROM hottoast LIMIT 3) hott
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102073,102074,102120,102144,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -300,7 +300,7 @@ EXPLAIN INSERT INTO snackbox SELECT a FROM (SELECT c FROM hottoast LIMIT 3) hott
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="6">
- <dxl:DMLInsert Columns="8" ActionCol="16" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="8" ActionCol="16" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="862.031910" Rows="3.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertNotNullCols.mdp b/src/backend/gporca/data/dxl/minidump/InsertNotNullCols.mdp
index c078a8cd08..65ef3415e7 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertNotNullCols.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertNotNullCols.mdp
@@ -211,7 +211,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.031288" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp b/src/backend/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp
index 8f88d30480..9bfe99c990 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp
@@ -234,7 +234,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.047060" Rows="2.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertProjectSort.mdp b/src/backend/gporca/data/dxl/minidump/InsertProjectSort.mdp
index 8756b0d133..6d8ada29bd 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertProjectSort.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertProjectSort.mdp
@@ -292,7 +292,7 @@ explain insert into tbl_cds_buysell_orders_new (a,b,c)
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="5">
- <dxl:DMLInsert Columns="0,1,2,10,11,12,13" ActionCol="14" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1,2,10,11,12,13" ActionCol="14" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="42556.094359" Rows="1000000.000000" Width="12"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertRandomDistr.mdp b/src/backend/gporca/data/dxl/minidump/InsertRandomDistr.mdp
index ae82f2a3d6..9681799edc 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertRandomDistr.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertRandomDistr.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -230,7 +230,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.015649" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp b/src/backend/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp
index c102e70bcb..464ba63f92 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp
@@ -33,7 +33,7 @@ EXPLAIN (COSTS OFF) INSERT INTO distributed_table (val1, val2) SELECT val1, val2
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -318,7 +318,7 @@ EXPLAIN (COSTS OFF) INSERT INTO distributed_table (val1, val2) SELECT val1, val2
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="3">
- <dxl:DMLInsert Columns="9,0,1" ActionCol="10" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="9,0,1" ActionCol="10" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="434.676207" Rows="100.000000" Width="24"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertSort.mdp b/src/backend/gporca/data/dxl/minidump/InsertSort.mdp
index c54858a1ba..c996b8a358 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertSort.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertSort.mdp
@@ -356,7 +356,7 @@ explain insert into nim1 select * from nim order by 1;
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0" ActionCol="8" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="8" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="106371.615338" Rows="10000818.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertSortDistributed2MasterOnly.mdp b/src/backend/gporca/data/dxl/minidump/InsertSortDistributed2MasterOnly.mdp
index 837b59deec..83875ccb59 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertSortDistributed2MasterOnly.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertSortDistributed2MasterOnly.mdp
@@ -283,7 +283,7 @@ explain insert into masteronly select * from distributedtable order by 1;
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1,2" ActionCol="10" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1,2" ActionCol="10" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.078234" Rows="1.000000" Width="20"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp b/src/backend/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp
index 87f90993ca..441eae9337 100644
--- a/src/backend/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp
@@ -239,7 +239,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.023495" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/InvalidDeleteGather.mdp b/src/backend/gporca/data/dxl/minidump/InvalidDeleteGather.mdp
index 745629b471..cab92b3bf4 100644
--- a/src/backend/gporca/data/dxl/minidump/InvalidDeleteGather.mdp
+++ b/src/backend/gporca/data/dxl/minidump/InvalidDeleteGather.mdp
@@ -936,7 +936,7 @@ DELETE FROM dml_heap_r USING dml_heap_s,dml_heap_p WHERE dml_heap_r.a = dml_heap
</dxl:LogicalDelete>
</dxl:Query>
<dxl:Plan Id="1" SpaceSize="429">
- <dxl:DMLDelete Columns="0,1,2" ActionCol="32" OidCol="33" CtidCol="3" SegmentIdCol="9">
+ <dxl:DMLDelete Columns="0,1,2" ActionCol="32" CtidCol="3" SegmentIdCol="9">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="1293.129056" Rows="1.000000" Width="1"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp b/src/backend/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp
index 2a4b6ab6f8..8140981822 100644
--- a/src/backend/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp
@@ -29,7 +29,7 @@ explain select * from foo, testhstore where foo.b = testhstore.h;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp b/src/backend/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp
index 45d3ef7590..1548ad0fe5 100644
--- a/src/backend/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp
@@ -20,7 +20,7 @@ select * from foo, bar where foo.a is not distinct from bar.a;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp b/src/backend/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp
index 393c871fa8..90f231b569 100644
--- a/src/backend/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp
@@ -20,7 +20,7 @@ select * from foo, (select NULL a from bar) other where foo.a is not distinct fr
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp b/src/backend/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp
index aca4646022..566f039cac 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp
@@ -71,7 +71,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp b/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp
index fa70876d79..28095d7627 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp b/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp
index 5b3fe8e313..9ff4431498 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="3"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="3"/>
<dxl:TraceFlags Value="103027,101013,102120,102146,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp b/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp
index cff219edff..7cb41bf8db 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinCitextVarchar.mdp b/src/backend/gporca/data/dxl/minidump/JoinCitextVarchar.mdp
index 574ffef769..c1137e417d 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinCitextVarchar.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinCitextVarchar.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp b/src/backend/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp
index 7141596a95..0de695af7f 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp
@@ -79,7 +79,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp
index acf4c3724b..ab118b7b55 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp
@@ -34,7 +34,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp
index 398d866230..5075cd6dea 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp
index d1f927b0bc..4fd8aa79e5 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp
@@ -52,7 +52,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp
index 5b8300b441..c8e72f2d3c 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp
@@ -36,7 +36,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp
index 36f93821bc..fa8049dde3 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp b/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp
index c82ee12e6e..00d86e7f3a 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102146,102003,102073,102074,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp b/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp
index 65a3ffdbbc..485103082e 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102146,102002,102003,102073,102074,102120,102144,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp b/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp
index 1620e90168..10660d374e 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102146,102002,102003,102073,102074,102120,102144,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOrderDPE.mdp b/src/backend/gporca/data/dxl/minidump/JoinOrderDPE.mdp
index c85824eeaa..fd520ff0c0 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinOrderDPE.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinOrderDPE.mdp
@@ -60,7 +60,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,103001,103014,103022,103026,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinTinterval.mdp b/src/backend/gporca/data/dxl/minidump/JoinTinterval.mdp
index 893c5862be..53c81ec72e 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinTinterval.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinTinterval.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp b/src/backend/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp
index 50a60b09e8..9559fedb0e 100644
--- a/src/backend/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp
@@ -41,7 +41,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-Condition-False.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-Condition-False.mdp
index a8f7a464e0..0a42c883b4 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-Condition-False.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-Condition-False.mdp
@@ -16,7 +16,7 @@ select * from foo a left outer join foo b on false;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp
index c83d33eace..fe9e464a16 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp
@@ -49,7 +49,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102029,102046,102048,102053,102054,102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp
index 8f0fa2953e..74545761de 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp
@@ -49,7 +49,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp
index d6252752b5..dda2957dd1 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp
@@ -45,7 +45,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp
index 39ddfc1557..33760f141f 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp
@@ -49,7 +49,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp
index 48bf94b4a7..97680ba382 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp
index 7b39a50dd8..60a1262d2d 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp
@@ -39,7 +39,7 @@ explain select * from foo left join bar on foo.a = bar.a and foo.b = bar.b left
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,101013,102029,102046,102048,102053,102054,102120,103001,103014,103015,103022,104003,104004,104005,105000,102157,102158"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp
index 4e9b58436e..237d397a3c 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp
@@ -42,7 +42,7 @@ explain select * from foo left join bar on foo.a = bar.a and foo.b = bar.b left
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102043,102046,102048,102053,102054,102074,102120,102144,102157,102158,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp
index 7492bb58d4..1521541618 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp
@@ -43,7 +43,7 @@ explain select * from foo left join bar on bar.a=foo.a and bar.a<foo.b left oute
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102043,102046,102048,102053,102054,102074,102120,102144,102157,102158,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MasterOnly-Table.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MasterOnly-Table.mdp
index 3a2f3704b8..94a279656a 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MasterOnly-Table.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MasterOnly-Table.mdp
@@ -44,7 +44,7 @@ union all
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102120,102144,103001,103004,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp
index 34e07ca516..22a4f9d583 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp
index b634251c1c..a8b791dc99 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp
@@ -33,7 +33,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp
index cbe5ea9a0c..13022fcbca 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp
@@ -33,7 +33,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp
index 4135d73869..836b4ee95c 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp
index a876cc3fd8..a55d0cb477 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp
@@ -49,7 +49,7 @@ explain select * from foo left join bar on foo.a=bar.a and foo.b=bar.b and foo.c
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102043,102046,102048,102053,102054,102074,102120,102144,102157,102158,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp
index fafcdf463f..8e44aad4a5 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp
index 46757c5c63..98b4bf04ef 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp
@@ -25,7 +25,7 @@ set optimizer_enable_hashjoin = off;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102029,102046,102048,102053,102054,102074,102120,103001,103014,103015,103022,103027,104003,104004,104005,105000,106000,,102157,102158"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp
index 5f9eeb05b7..7d77254593 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp
@@ -42,7 +42,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102046,102048,102053,102054,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp
index 2c05f1f857..915ac1b828 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp
@@ -30,7 +30,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102029,102046,102048,102053,102054,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp
index 7c9761c58c..49a1aba0f9 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102027,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-PushDown.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-PushDown.mdp
index 8fdf7700ef..5e90420478 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-PushDown.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-PushDown.mdp
@@ -19,7 +19,7 @@ explain select 1 from push_t3 where exists (
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-With-Agg.mdp b/src/backend/gporca/data/dxl/minidump/LOJ-With-Agg.mdp
index 8cdce92c8a..95f2e43893 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ-With-Agg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ-With-Agg.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103022,104003,104004,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp b/src/backend/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp
index 8ede5e743f..ec80878faa 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp
@@ -40,7 +40,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp b/src/backend/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp
index da570b99ed..d1a7c83650 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp
@@ -37,7 +37,7 @@ explain select * from t1 left join t2 on t1.a=t2.a left join t3 on t2.a=t3.a lef
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp b/src/backend/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp
index 0dd495f8ac..e5667218b7 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp
@@ -45,7 +45,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp b/src/backend/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp
index ae7913c257..50928b9ca4 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp
@@ -27,7 +27,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp b/src/backend/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp
index 647cc61295..bdca9f3b95 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp b/src/backend/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp
index 90ef704947..35198cc8e3 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp b/src/backend/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp
index 4f74f99020..d0ba37ffdd 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp b/src/backend/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp
index e2bce71ef1..a04762b186 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,103001,103014,103015,103022,103027,102146,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp b/src/backend/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp
index 7cedf3edbc..58a6f593d5 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp
index 64c2cb7c03..f74df79864 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp
@@ -33,7 +33,7 @@ EXPLAIN SELECT * FROM t1 LEFT OUTER JOIN t2 ON t1.a = t2.a WHERE t1.b IS DISTINC
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp
index 217db26726..62933e8cbe 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp
@@ -34,7 +34,7 @@ EXPLAIN SELECT * FROM t1 LEFT OUTER JOIN t2 ON t1.a = t2.a WHERE t1.b IS DISTINC
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp
index b9d3f7c873..f6680bc8f1 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp
index 09978f7973..b92befa9b7 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp
@@ -30,7 +30,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp
index 7ccde6e707..d46767e319 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp
@@ -31,7 +31,7 @@ EXPLAIN SELECT * FROM t1 LEFT OUTER JOIN t2 ON t1.a = t2.a WHERE t2.b IS DISTINC
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp
index 62e8f20242..75c065aeba 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102074,102113,102120,102146,102147,103001,103014,103015,103022,103027,103029,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp
index c6ff58e16d..ffe1b2ea22 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp
@@ -32,7 +32,7 @@ EXPLAIN SELECT * FROM t1 LEFT OUTER JOIN t2 ON t1.a = t2.a WHERE t2.b IS DISTINC
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp
index 234edd1fa4..1d6cfc7e60 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp
@@ -32,7 +32,7 @@ EXPLAIN SELECT * FROM t1 LEFT OUTER JOIN t2 ON t1.a = t2.a WHERE t2.b IS NOT DIS
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp b/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp
index 5eb70104ed..f97d328f94 100644
--- a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp
@@ -32,7 +32,7 @@ EXPLAIN SELECT * FROM t1 LEFT OUTER JOIN t2 ON t1.a = t2.a WHERE t2.b IS NOT DIS
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp b/src/backend/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp
index fcf21f3f06..6236e24cd3 100644
--- a/src/backend/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="5" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="5" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp b/src/backend/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp
index d51573e118..c1439b2f3b 100644
--- a/src/backend/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp
@@ -7,7 +7,7 @@
<dxl:CTEConfig CTEInliningCutoff="0"/>
<dxl:WindowOids RowNumber="7000" Rank="7001"/>
<dxl:CostModelConfig CostModelType="1" SegmentsForCosting="2"/>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102144,103001,103027,103033"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp b/src/backend/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp
index c8f483c281..5ec3138930 100644
--- a/src/backend/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp
@@ -46,7 +46,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp b/src/backend/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp
index 76fcebe03a..364b9c2ac0 100644
--- a/src/backend/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp
@@ -39,7 +39,7 @@ explain select * from foo left join bar on foo.a=bar.a left join zoo on foo.a::i
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp b/src/backend/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp
index fa5438c4a8..c77f6d68c0 100644
--- a/src/backend/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp
@@ -54,7 +54,7 @@ EXPLAIN SELECT b2, sum(c1) FROM t1 LEFT JOIN t2 ON a1 = b2 GROUP BY b2 ORDER BY
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp b/src/backend/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp
index 7a1ab774c4..ff63990f0c 100644
--- a/src/backend/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp
@@ -59,7 +59,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp b/src/backend/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp
index 1440990ff9..0c26ef07f2 100644
--- a/src/backend/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp
@@ -74,7 +74,7 @@ on id2 = id3 distributed by (id1);
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp b/src/backend/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp
index 6aa3dba001..004087d08a 100644
--- a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp b/src/backend/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp
index aa4bd6a8c7..7ae2631a41 100644
--- a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp
@@ -25,7 +25,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp b/src/backend/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp
index a085d3af07..54039fd4c4 100644
--- a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp
@@ -29,7 +29,7 @@ Optimizer: Pivotal Optimizer (GPORCA)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp b/src/backend/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp
index e3064ba338..6de63b2f48 100644
--- a/src/backend/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp
+++ b/src/backend/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp
@@ -70,7 +70,7 @@ EXPLAIN SELECT * FROM solo WHERE year_id=2017 AND month_id=6;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp b/src/backend/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp
index b6497e32f0..7e099f3c45 100644
--- a/src/backend/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp
@@ -44,7 +44,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp b/src/backend/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp
index b8655a1351..cb322a3c44 100644
--- a/src/backend/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp
@@ -46,7 +46,7 @@ Optimizer status: PQO version 2.67.0
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="900" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="900" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp b/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp
index 6f9bea8452..669114be89 100644
--- a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp
@@ -42,7 +42,7 @@ explain select tab3.k, (select tab2.k from tab2 where tab2.i = tab1.i limit 1) a
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="900" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="900" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103006,103007,103008,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp b/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp
index b88155c7f9..729fd93f71 100644
--- a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp
@@ -54,7 +54,7 @@ explain select f.k, f.subq from (select tab3.k, (select tab2.k from tab2 where t
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102056,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp b/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp
index 194eb35229..756e36d28e 100644
--- a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp
@@ -48,7 +48,7 @@ explain select tab3.k, (select tab2.k from tab2 where tab2.i = tab1.i limit 1) a
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="900" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="900" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp b/src/backend/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp
index 0013ec1429..aa7a698541 100644
--- a/src/backend/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp b/src/backend/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp
index b4d455016d..f51f317160 100644
--- a/src/backend/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102056,102059,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp b/src/backend/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp
index 0894e5996f..a29926e9ef 100644
--- a/src/backend/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp b/src/backend/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp
index ca0d644a9f..6118862923 100644
--- a/src/backend/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp
@@ -40,7 +40,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp b/src/backend/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp
index d09a3c67a2..335168cc47 100644
--- a/src/backend/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp
@@ -48,7 +48,7 @@ select * from A,B where exists (select * from C where C.j = A.j and B.i not in (
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp b/src/backend/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp
index 26f482bf86..3de8d86528 100644
--- a/src/backend/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp
@@ -49,7 +49,7 @@ default subpartition other2
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp b/src/backend/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp
index b12d48ca4d..c24947d959 100644
--- a/src/backend/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp
@@ -40,7 +40,7 @@ explain select * from t1, t2 where t1.a=t2.a and t1.b=t2.b;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp b/src/backend/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp
index 4ad69276c1..cd1c954001 100644
--- a/src/backend/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp
@@ -49,7 +49,7 @@ explain select * from t1, t2, t3 where t1.a = t2.a and t2.a = t3.a and t1.b = t3
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102002,102003,102073,102074,102113,102120,102144,102146,102147,103001,103014,103015,103022,103027,103029,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp b/src/backend/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp
index 89722e06a6..59ef00dfe5 100644
--- a/src/backend/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp
@@ -75,7 +75,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102074,102146,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp b/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp
index 855ab05d61..63ed72deb6 100644
--- a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp
@@ -14,7 +14,7 @@ select generate_series(0,2) rn, unnest(arr) cnt_div from (select ARRAY['0','1','
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103003,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp b/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp
index 061c594664..203dd5b991 100644
--- a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp
@@ -14,7 +14,7 @@ EXPLAIN select generate_series(0,2) x, generate_series(0,3) y, arr cnt_div from
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103003,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp b/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp
index 0cd78abc92..1a0e759c31 100644
--- a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp
@@ -14,7 +14,7 @@ explain select generate_series(0,2) x, generate_series(0,3) y from (select gener
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103003,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp b/src/backend/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp
index e1eaec4ecc..d9225757ed 100644
--- a/src/backend/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103022,103027,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -299,10 +299,10 @@
</dxl:LogicalJoin>
</dxl:LogicalUpdate>
</dxl:Query>
- <dxl:Plan Id="0" SpaceSize="12">
- <dxl:DMLUpdate Columns="0,1" ActionCol="18" OidCol="19" CtidCol="2" SegmentIdCol="8" InputSorted="false">
+ <dxl:Plan Id="0" SpaceSize="6">
+ <dxl:DMLUpdate Columns="0,1" ActionCol="18" CtidCol="2" SegmentIdCol="8" IsSplitUpdate="true">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="870.880260" Rows="100.000000" Width="1"/>
+ <dxl:Cost StartupCost="0" TotalCost="867.752993" Rows="100.000000" Width="1"/>
</dxl:Properties>
<dxl:DirectDispatchInfo/>
<dxl:ProjList>
@@ -315,20 +315,20 @@
</dxl:ProjList>
<dxl:TableDescriptor Mdid="6.32769.1.0" TableName="s">
<dxl:Columns>
- <dxl:Column ColId="20" Attno="1" ColName="a" TypeMdid="0.1043.1.0" ColWidth="4"/>
- <dxl:Column ColId="21" Attno="2" ColName="b" TypeMdid="0.1043.1.0" ColWidth="4"/>
- <dxl:Column ColId="22" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
- <dxl:Column ColId="23" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="24" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="25" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="26" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="27" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
- <dxl:Column ColId="28" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
+ <dxl:Column ColId="19" Attno="1" ColName="a" TypeMdid="0.1043.1.0" ColWidth="4"/>
+ <dxl:Column ColId="20" Attno="2" ColName="b" TypeMdid="0.1043.1.0" ColWidth="4"/>
+ <dxl:Column ColId="21" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
+ <dxl:Column ColId="22" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="23" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="24" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="25" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="26" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
+ <dxl:Column ColId="27" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
</dxl:Columns>
</dxl:TableDescriptor>
- <dxl:Result>
+ <dxl:RedistributeMotion InputSegments="0,1,2" OutputSegments="0,1,2">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.026093" Rows="200.000000" Width="34"/>
+ <dxl:Cost StartupCost="0" TotalCost="862.023827" Rows="200.000000" Width="22"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -346,15 +346,17 @@
<dxl:ProjElem ColId="18" Alias="ColRef_0018">
<dxl:Ident ColId="18" ColName="ColRef_0018" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="19" Alias="ColRef_0019">
- <dxl:ConstValue TypeMdid="0.26.1.0" Value="32769"/>
- </dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:OneTimeFilter/>
- <dxl:RedistributeMotion InputSegments="0,1,2" OutputSegments="0,1,2">
+ <dxl:SortingColumnList/>
+ <dxl:HashExprList>
+ <dxl:HashExpr>
+ <dxl:Ident ColId="0" ColName="a" TypeMdid="0.1043.1.0"/>
+ </dxl:HashExpr>
+ </dxl:HashExprList>
+ <dxl:Split DeleteColumns="0,1" InsertColumns="9,10" ActionCol="18" CtidCol="2" SegmentIdCol="8">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.023827" Rows="200.000000" Width="22"/>
+ <dxl:Cost StartupCost="0" TotalCost="862.019236" Rows="200.000000" Width="22"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -370,19 +372,12 @@
<dxl:Ident ColId="8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
<dxl:ProjElem ColId="18" Alias="ColRef_0018">
- <dxl:Ident ColId="18" ColName="ColRef_0018" TypeMdid="0.23.1.0"/>
+ <dxl:DMLAction/>
</dxl:ProjElem>
</dxl:ProjList>
- <dxl:Filter/>
- <dxl:SortingColumnList/>
- <dxl:HashExprList>
- <dxl:HashExpr>
- <dxl:Ident ColId="0" ColName="a" TypeMdid="0.1043.1.0"/>
- </dxl:HashExpr>
- </dxl:HashExprList>
- <dxl:Split DeleteColumns="0,1" InsertColumns="9,10" ActionCol="18" CtidCol="2" SegmentIdCol="8">
+ <dxl:HashJoin JoinType="Inner">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.019236" Rows="200.000000" Width="22"/>
+ <dxl:Cost StartupCost="0" TotalCost="862.017769" Rows="100.000000" Width="22"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -391,19 +386,34 @@
<dxl:ProjElem ColId="1" Alias="b">
<dxl:Ident ColId="1" ColName="b" TypeMdid="0.1043.1.0"/>
</dxl:ProjElem>
+ <dxl:ProjElem ColId="9" Alias="a">
+ <dxl:Ident ColId="9" ColName="a" TypeMdid="0.1043.1.0"/>
+ </dxl:ProjElem>
+ <dxl:ProjElem ColId="10" Alias="b">
+ <dxl:Ident ColId="10" ColName="b" TypeMdid="0.1043.1.0"/>
+ </dxl:ProjElem>
<dxl:ProjElem ColId="2" Alias="ctid">
<dxl:Ident ColId="2" ColName="ctid" TypeMdid="0.27.1.0"/>
</dxl:ProjElem>
<dxl:ProjElem ColId="8" Alias="gp_segment_id">
<dxl:Ident ColId="8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="18" Alias="ColRef_0018">
- <dxl:DMLAction/>
- </dxl:ProjElem>
</dxl:ProjList>
- <dxl:HashJoin JoinType="Inner">
+ <dxl:Filter/>
+ <dxl:JoinFilter/>
+ <dxl:HashCondList>
+ <dxl:Comparison ComparisonOperator="=" OperatorMdid="0.98.1.0">
+ <dxl:Cast TypeMdid="0.25.1.0" FuncId="0.0.0.0">
+ <dxl:Ident ColId="0" ColName="a" TypeMdid="0.1043.1.0"/>
+ </dxl:Cast>
+ <dxl:Cast TypeMdid="0.25.1.0" FuncId="0.0.0.0">
+ <dxl:Ident ColId="9" ColName="a" TypeMdid="0.1043.1.0"/>
+ </dxl:Cast>
+ </dxl:Comparison>
+ </dxl:HashCondList>
+ <dxl:TableScan>
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.017769" Rows="100.000000" Width="22"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000697" Rows="100.000000" Width="18"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -412,12 +422,6 @@
<dxl:ProjElem ColId="1" Alias="b">
<dxl:Ident ColId="1" ColName="b" TypeMdid="0.1043.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="9" Alias="a">
- <dxl:Ident ColId="9" ColName="a" TypeMdid="0.1043.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="10" Alias="b">
- <dxl:Ident ColId="10" ColName="b" TypeMdid="0.1043.1.0"/>
- </dxl:ProjElem>
<dxl:ProjElem ColId="2" Alias="ctid">
<dxl:Ident ColId="2" ColName="ctid" TypeMdid="0.27.1.0"/>
</dxl:ProjElem>
@@ -426,81 +430,50 @@
</dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:JoinFilter/>
- <dxl:HashCondList>
- <dxl:Comparison ComparisonOperator="=" OperatorMdid="0.98.1.0">
- <dxl:Cast TypeMdid="0.25.1.0" FuncId="0.0.0.0">
- <dxl:Ident ColId="0" ColName="a" TypeMdid="0.1043.1.0"/>
- </dxl:Cast>
- <dxl:Cast TypeMdid="0.25.1.0" FuncId="0.0.0.0">
- <dxl:Ident ColId="9" ColName="a" TypeMdid="0.1043.1.0"/>
- </dxl:Cast>
- </dxl:Comparison>
- </dxl:HashCondList>
- <dxl:TableScan>
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000697" Rows="100.000000" Width="18"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="0" Alias="a">
- <dxl:Ident ColId="0" ColName="a" TypeMdid="0.1043.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="1" Alias="b">
- <dxl:Ident ColId="1" ColName="b" TypeMdid="0.1043.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="2" Alias="ctid">
- <dxl:Ident ColId="2" ColName="ctid" TypeMdid="0.27.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="8" Alias="gp_segment_id">
- <dxl:Ident ColId="8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Filter/>
- <dxl:TableDescriptor Mdid="6.32769.1.0" TableName="s">
- <dxl:Columns>
- <dxl:Column ColId="0" Attno="1" ColName="a" TypeMdid="0.1043.1.0" ColWidth="4"/>
- <dxl:Column ColId="1" Attno="2" ColName="b" TypeMdid="0.1043.1.0" ColWidth="4"/>
- <dxl:Column ColId="2" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
- <dxl:Column ColId="3" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="4" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="5" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="6" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="7" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
- <dxl:Column ColId="8" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
- </dxl:Columns>
- </dxl:TableDescriptor>
- </dxl:TableScan>
- <dxl:TableScan>
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000623" Rows="100.000000" Width="4"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="9" Alias="a">
- <dxl:Ident ColId="9" ColName="a" TypeMdid="0.1043.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="10" Alias="b">
- <dxl:Ident ColId="10" ColName="b" TypeMdid="0.1043.1.0"/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Filter/>
- <dxl:TableDescriptor Mdid="6.32775.1.0" TableName="r">
- <dxl:Columns>
- <dxl:Column ColId="9" Attno="1" ColName="a" TypeMdid="0.1043.1.0" ColWidth="2"/>
- <dxl:Column ColId="10" Attno="2" ColName="b" TypeMdid="0.1043.1.0" ColWidth="2"/>
- <dxl:Column ColId="11" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
- <dxl:Column ColId="12" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="13" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="14" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="15" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="16" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
- <dxl:Column ColId="17" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
- </dxl:Columns>
- </dxl:TableDescriptor>
- </dxl:TableScan>
- </dxl:HashJoin>
- </dxl:Split>
- </dxl:RedistributeMotion>
- </dxl:Result>
+ <dxl:TableDescriptor Mdid="6.32769.1.0" TableName="s">
+ <dxl:Columns>
+ <dxl:Column ColId="0" Attno="1" ColName="a" TypeMdid="0.1043.1.0" ColWidth="4"/>
+ <dxl:Column ColId="1" Attno="2" ColName="b" TypeMdid="0.1043.1.0" ColWidth="4"/>
+ <dxl:Column ColId="2" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
+ <dxl:Column ColId="3" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="4" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="5" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="6" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="7" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
+ <dxl:Column ColId="8" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
+ </dxl:Columns>
+ </dxl:TableDescriptor>
+ </dxl:TableScan>
+ <dxl:TableScan>
+ <dxl:Properties>
+ <dxl:Cost StartupCost="0" TotalCost="431.000623" Rows="100.000000" Width="4"/>
+ </dxl:Properties>
+ <dxl:ProjList>
+ <dxl:ProjElem ColId="9" Alias="a">
+ <dxl:Ident ColId="9" ColName="a" TypeMdid="0.1043.1.0"/>
+ </dxl:ProjElem>
+ <dxl:ProjElem ColId="10" Alias="b">
+ <dxl:Ident ColId="10" ColName="b" TypeMdid="0.1043.1.0"/>
+ </dxl:ProjElem>
+ </dxl:ProjList>
+ <dxl:Filter/>
+ <dxl:TableDescriptor Mdid="6.32775.1.0" TableName="r">
+ <dxl:Columns>
+ <dxl:Column ColId="9" Attno="1" ColName="a" TypeMdid="0.1043.1.0" ColWidth="2"/>
+ <dxl:Column ColId="10" Attno="2" ColName="b" TypeMdid="0.1043.1.0" ColWidth="2"/>
+ <dxl:Column ColId="11" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
+ <dxl:Column ColId="12" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="13" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="14" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="15" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="16" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
+ <dxl:Column ColId="17" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
+ </dxl:Columns>
+ </dxl:TableDescriptor>
+ </dxl:TableScan>
+ </dxl:HashJoin>
+ </dxl:Split>
+ </dxl:RedistributeMotion>
</dxl:DMLUpdate>
</dxl:Plan>
</dxl:Thread>
diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp b/src/backend/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp
index d9efaecc12..622f7f456c 100644
--- a/src/backend/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp
@@ -28,7 +28,7 @@ explain select * from a1,b1 where a1.a = b1.a;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102046,102048,102053,102054,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp b/src/backend/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp
index 171fa934c2..4c4edd3db0 100644
--- a/src/backend/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp
@@ -29,7 +29,7 @@ explain select * from a1,b1 where a1.a = b1.a and a1.a = b1.b;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102046,102048,102053,102054,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp b/src/backend/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp
index 41015ff4e0..440be729ff 100644
--- a/src/backend/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp
@@ -28,7 +28,7 @@ explain select * from a1,b1 where a1.a = b1.a and a1.a != b1.b;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102029,102046,102048,102053,102054,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp b/src/backend/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp
index 1f650754ce..7bb27b967c 100644
--- a/src/backend/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp
@@ -31,7 +31,7 @@ explain select * from a1,b1 where a1.a != b1.a and a1.a = b1.b;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102029,102046,102048,102053,102054,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp b/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp
index 75c4e0308f..03cc7337a7 100644
--- a/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp
@@ -85,7 +85,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102074,102120,102146,102155,102156,103001,103014,103022,103027,103029,103038,103041,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability.mdp b/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability.mdp
index 33e4f09cdd..fdd0d8fac2 100644
--- a/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability.mdp
@@ -78,7 +78,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103003,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Name-Cardinality.mdp b/src/backend/gporca/data/dxl/minidump/Name-Cardinality.mdp
index 6e0853d014..178fbef557 100644
--- a/src/backend/gporca/data/dxl/minidump/Name-Cardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Name-Cardinality.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp b/src/backend/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp
index df85a8b481..742c037548 100644
--- a/src/backend/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp
@@ -57,7 +57,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102003,102073,102074,102120,103001,103014,103015,103022,103027,102146,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Negative-IndexApply1.mdp b/src/backend/gporca/data/dxl/minidump/Negative-IndexApply1.mdp
index 036045cdfd..030860e256 100644
--- a/src/backend/gporca/data/dxl/minidump/Negative-IndexApply1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Negative-IndexApply1.mdp
@@ -20,7 +20,7 @@ select * from z,tt where tt.i=5 and z.i=6 ;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Negative-IndexApply2.mdp b/src/backend/gporca/data/dxl/minidump/Negative-IndexApply2.mdp
index 28f467473e..ef1598a7b2 100644
--- a/src/backend/gporca/data/dxl/minidump/Negative-IndexApply2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Negative-IndexApply2.mdp
@@ -31,7 +31,7 @@ select * from z_p,tt_p where tt_p.i=5 and z_p.i=6;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp b/src/backend/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp
index 224b073a58..f606fb1f3d 100644
--- a/src/backend/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp
@@ -49,7 +49,7 @@ EXPLAIN SELECT * FROM foo WHERE foo.a IN (SELECT foo.b + 1 FROM (SELECT * FROM b
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp b/src/backend/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp
index 21d81c99d5..f4f8f5c593 100644
--- a/src/backend/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp
@@ -71,7 +71,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp b/src/backend/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp
index f7fe148e3d..c2bda2ad79 100644
--- a/src/backend/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102005,102029,102046,102048,102053,102054,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp b/src/backend/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp
index b7172e34b6..f83e00dd05 100644
--- a/src/backend/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp
@@ -33,7 +33,7 @@ select a from t as t1 where a in (
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="100"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="100"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp b/src/backend/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp
index 6d1fefab20..815337596a 100644
--- a/src/backend/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp
@@ -44,7 +44,7 @@ explain select * from oip oip join ria a on ip=cidr and oip.oid=194073;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp b/src/backend/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp
index 7e0c81972b..4061c4d4b1 100644
--- a/src/backend/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp
@@ -43,7 +43,7 @@ WHERE buyer_name = 'ABC'
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102144,103027,103033"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp b/src/backend/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp
index fe264278dc..4059575dbe 100644
--- a/src/backend/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp
@@ -45,7 +45,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp b/src/backend/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp
index 832fc35f7b..9dbf4a0fad 100644
--- a/src/backend/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp
@@ -32,7 +32,7 @@ EXPLAIN SELECT * FROM date_parts WHERE month BETWEEN 1 AND 4;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp b/src/backend/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp
index 2b9ea9aa22..5a003841e4 100644
--- a/src/backend/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp
@@ -93,7 +93,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp b/src/backend/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp
index df42e304c6..57c76fade4 100644
--- a/src/backend/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp
@@ -47,7 +47,7 @@ GROUP BY b;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp b/src/backend/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp
index 740d1e4d03..55a008f0d4 100644
--- a/src/backend/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NonSingleton.mdp b/src/backend/gporca/data/dxl/minidump/NonSingleton.mdp
index 8c274ea0b1..3f167c1bef 100644
--- a/src/backend/gporca/data/dxl/minidump/NonSingleton.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NonSingleton.mdp
@@ -29,7 +29,7 @@ EXPLAIN SELECT a FROM snackbox JOIN (SELECT c FROM hottoast LIMIT 3) hottoast ON
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NonSplittableAgg.mdp b/src/backend/gporca/data/dxl/minidump/NonSplittableAgg.mdp
index 7b3becc2e4..b1cb0daef8 100644
--- a/src/backend/gporca/data/dxl/minidump/NonSplittableAgg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NonSplittableAgg.mdp
@@ -27,7 +27,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp b/src/backend/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp
index d5d65ba6c3..fe8782b210 100644
--- a/src/backend/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp
@@ -33,7 +33,7 @@ explain select * from A where not exists (select sum(C.i) from C where C.i = A.i
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NotInToLASJ.mdp b/src/backend/gporca/data/dxl/minidump/NotInToLASJ.mdp
index 1f17a6ad94..dafd13c1c2 100644
--- a/src/backend/gporca/data/dxl/minidump/NotInToLASJ.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NotInToLASJ.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102155,102156,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp b/src/backend/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp
index f00473ff8b..db2088877a 100644
--- a/src/backend/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp
@@ -37,7 +37,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp b/src/backend/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp
index ca8a7f553d..c1ecc186b6 100644
--- a/src/backend/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp
@@ -18,7 +18,7 @@ explain select * from test_stat where c <> 'J' or c is null;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp b/src/backend/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp
index 8a6418a55f..499bc84bb6 100644
--- a/src/backend/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp
@@ -41,7 +41,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OneSegmentGather.mdp b/src/backend/gporca/data/dxl/minidump/OneSegmentGather.mdp
index 27c58614aa..804fcce9f3 100644
--- a/src/backend/gporca/data/dxl/minidump/OneSegmentGather.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OneSegmentGather.mdp
@@ -120,7 +120,7 @@ WHERE filter_col = 'TEST'
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp
index 56589accff..0d043748a9 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp
@@ -20,7 +20,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103003,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp
index 9c60ec80bb..af3702651e 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp
@@ -25,7 +25,7 @@ Optimizer: Pivotal Optimizer (GPORCA)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp
index 2de60b08b9..cf2df6a061 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp
@@ -25,7 +25,7 @@ Optimizer: Pivotal Optimizer (GPORCA)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp
index 89ab80b78f..004c7a27d6 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp
@@ -64,7 +64,7 @@ EXPLAIN SELECT percentile_cont(0.5) WITHIN GROUP(ORDER BY a1), percentile_cont(0
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp
index b00f1d012b..adb4a3eb4c 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp
@@ -45,7 +45,7 @@ EXPLAIN SELECT percentile_cont(0.5) WITHIN GROUP(ORDER BY a2), percentile_disc(0
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp
index 2b1a1b1fb0..e7f6adb406 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp
@@ -66,7 +66,7 @@ EXPLAIN SELECT percentile_cont(0.5) WITHIN GROUP(ORDER BY a2), percentile_cont(0
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_single.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_single.mdp
index 72d7be01c7..3a6e98a90f 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_single.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_single.mdp
@@ -44,7 +44,7 @@ EXPLAIN SELECT percentile_cont(0.5) WITHIN GROUP(ORDER BY a2) FROM foo;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp
index b7b953dc72..033df43324 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp
@@ -49,7 +49,7 @@ EXPLAIN ANALYZE SELECT percentile_cont(0.25) WITHIN GROUP (ORDER BY a ASC nulls
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp
index 912beb6660..461d1b0dcd 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp
@@ -28,7 +28,7 @@ Optimizer: Pivotal Optimizer (GPORCA)
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp
index 962b3d7bb2..89442d5e72 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp
@@ -68,7 +68,7 @@ EXPLAIN SELECT percentile_cont(0.5) WITHIN GROUP(ORDER BY a1), percentile_disc(0
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp b/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp
index 90370f4d86..732a0f6d40 100644
--- a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp
@@ -42,7 +42,7 @@ EXPLAIN SELECT percentile_cont(floor(random()*0.1)+0.5) WITHIN GROUP(ORDER BY a1
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp b/src/backend/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp
index 52035e4f08..27d0454a96 100644
--- a/src/backend/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp
@@ -34,7 +34,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101000,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp b/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp
index 59b7fa3598..844f6eef60 100644
--- a/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp b/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp
index 9e8de4161c..15d3d9cd0a 100644
--- a/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp b/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp
index c1ca3c7480..122e7c7fea 100644
--- a/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp
@@ -37,7 +37,7 @@ EXPLAIN SELECT * FROM date_parts WHERE month BETWEEN 1 AND 4;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp b/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp
index b03a1e3ec4..a00513acb7 100644
--- a/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp
@@ -34,7 +34,7 @@ EXPLAIN SELECT * FROM date_parts WHERE year BETWEEN 2002 AND 2003;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp b/src/backend/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp
index 34892f2135..c4f1663879 100644
--- a/src/backend/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp
@@ -35,7 +35,7 @@ EXPLAIN SELECT * FROM date_parts WHERE month BETWEEN 1 AND 4;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartPredsWithRandom.mdp b/src/backend/gporca/data/dxl/minidump/PartPredsWithRandom.mdp
index 208bfd7b73..bfe628b88c 100644
--- a/src/backend/gporca/data/dxl/minidump/PartPredsWithRandom.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartPredsWithRandom.mdp
@@ -27,7 +27,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,103001,103014,103022,103026,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp b/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp
index 0564b68605..2d1053ed9f 100644
--- a/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp
@@ -43,7 +43,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp b/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp
index 44cd1a5110..8fd501c1ea 100644
--- a/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp
@@ -48,7 +48,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp
index c94d69eec2..01e322a01b 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp
@@ -54,7 +54,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp
index 33eaf9a81f..239bde14d1 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp
@@ -21,7 +21,7 @@ select * from pt where gender in ( 'F', 'FM');
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp
index adb1ff76f8..1e885e1f31 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp
@@ -50,7 +50,7 @@ FROM abuela JOIN bar ON a = c AND b BETWEEN d - 1 AND d + 4
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp
index 9558010f92..50b20fa5d3 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp
@@ -20,7 +20,7 @@ select (select h.i from t2) from h where h.j = 1;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp
index 43ca888f4f..a1eea42923 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp
@@ -15,7 +15,7 @@ explain select * from R where b::int8=5::int8;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFList.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-IDFList.mdp
index a95ee14036..b605c083a5 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFList.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-IDFList.mdp
@@ -22,7 +22,7 @@ EXPLAIN SELECT * FROM listfoo WHERE b IS DISTINCT FROM 2;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103026,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp
index 19992db79e..4866221b4f 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp
@@ -22,7 +22,7 @@ EXPLAIN SELECT * FROM listfoo WHERE b IS DISTINCT FROM NULL;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103026,103027,103033,103037,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp
index 2b74c049af..f03fe2cf6e 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp
@@ -20,7 +20,7 @@ explain select * from L where 2::numeric is distinct from b::numeric;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp
index 341cb706f5..2a633a2d79 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp
@@ -19,7 +19,7 @@ select * from t2 left outer join t1 on t1.b = t2.d where t1.b is null;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="103027,101013,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp
index 8b6bc928b8..2cbd43f00f 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp
@@ -20,7 +20,7 @@ select * from t2 left outer join t1 on t1.b = t2.d where t1.b is null;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102046,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp
index 93f2e8b59b..86aac33b17 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp
@@ -21,7 +21,7 @@ select * from foo where b is not null;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp
index fa4588dc8f..6f3e34d481 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp
@@ -24,7 +24,7 @@ select * from pt where gender is null;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp
index 3d4d280a92..090059b0b1 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp
@@ -65,7 +65,7 @@ explain select count(*) from r_p, s c, s d, s e where r_p.a = c.c and r_p.a = d.
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp
index 5d0eb048b9..44bb007a20 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp
@@ -15,7 +15,7 @@ explain select * from R where b::int8=5::int8;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp
index 646d478a7d..35901453c2 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp
@@ -20,7 +20,7 @@ explain select * from L where b::numeric < 3::numeric;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp
index db7c874e9d..cf2acd99f1 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp
@@ -20,7 +20,7 @@ EXPLAIN SELECT * FROM pt_complex WHERE k::numeric = 2::numeric AND j::numeric =
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull.mdp
index a2bc53c884..77c755323a 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull.mdp
@@ -41,7 +41,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp
index 7d2c256090..d36e85603d 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp
@@ -45,7 +45,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp
index 75e7c60de0..6877904210 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp
@@ -49,7 +49,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp
index 4ae55b29cb..4444335c87 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp
index ba13ea4b7c..8fae2a669e 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp
@@ -55,7 +55,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp
index 5a6c16f45b..9b49a884c5 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp
@@ -49,7 +49,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp
index 5436b8d4d8..7088e76962 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp
@@ -50,7 +50,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp
index dc4bafaa34..4f261ee576 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp
@@ -56,7 +56,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp
index e6df178a72..3e87582d39 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp
@@ -64,7 +64,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp
index a62d19e82c..4596e51629 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp
@@ -43,7 +43,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp
index 79fc2ac18c..0fcd6cf6a8 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp
@@ -66,7 +66,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp
index bf0c7d1f6e..55903376ad 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp
index a86a26a7d8..15acbd21a6 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102120,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp
index cda7655e2a..a5bb817eb3 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp
index 24cf8352f1..e7fd908028 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp
index 62af660694..ce35384536 100644
--- a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp b/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp
index a22fcfbbd3..4b1edd529b 100644
--- a/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp
@@ -36,7 +36,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102024,102025,102074,102119,102120,102128,102131,102132,102133,102134,102135,102136,102140,102141,102142,102143,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp b/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp
index 31e44f6015..5a447b1895 100644
--- a/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102024,102025,102074,102119,102120,102128,102131,102132,102133,102134,102135,102136,102140,102141,102142,102143,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp b/src/backend/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp
index 29e081f8e8..432c794208 100644
--- a/src/backend/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102024,102025,102074,102119,102120,102128,102131,102132,102133,102134,102135,102136,102140,102141,102142,102143,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp b/src/backend/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp
index 65d836f6d8..284b0da028 100644
--- a/src/backend/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp
@@ -16,7 +16,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103003,103014,103015,103022,103027,103029,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectSetFunction.mdp b/src/backend/gporca/data/dxl/minidump/ProjectSetFunction.mdp
index 3949c47d68..f5ac33f107 100644
--- a/src/backend/gporca/data/dxl/minidump/ProjectSetFunction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ProjectSetFunction.mdp
@@ -54,7 +54,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -229,7 +229,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="1">
- <dxl:DMLInsert Columns="1,2" ActionCol="3" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="1,2" ActionCol="3" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="0.015771" Rows="1.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp b/src/backend/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp
index 2c795e03f7..ebb237476b 100644
--- a/src/backend/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp b/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp
index 63d9dcb8b5..526e019de6 100644
--- a/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp
@@ -26,7 +26,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp
index 2880f6f9cd..862942feaa 100644
--- a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp
@@ -28,7 +28,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp
index 47511439bd..e7dabad7ec 100644
--- a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp
@@ -26,7 +26,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp
index 1b1b37a0c9..ecc948b124 100644
--- a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp
@@ -27,7 +27,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp
index 486117d8a4..ff20931740 100644
--- a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp
@@ -26,7 +26,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp
index 8ca1cf0606..00348f6967 100644
--- a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp
@@ -26,7 +26,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp
index 70cb3dd46b..016fd1dc5d 100644
--- a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp
@@ -26,7 +26,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp b/src/backend/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp
index dc554a5f2c..f338f0d220 100644
--- a/src/backend/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp
@@ -66,7 +66,7 @@ select * from bar where c not in (select distinct a from foo);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound=".500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp b/src/backend/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp
index 5b07d67859..2316dd84ea 100644
--- a/src/backend/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp
@@ -40,7 +40,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp
index 38c4184b6c..9130811270 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp
index c94428067b..57eeed7e0f 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp
index 675a664aad..b05ef6116d 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp
@@ -18,7 +18,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp
index 39ad531e13..d064d02665 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103022,103027,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp
index 6c4858efcc..b36fbd0ba9 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp
index a63a984732..eee3c5fe43 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp
index 574aa3deae..7b50dbe963 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp
index 3d5791bffb..d8d9bc3e21 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp
index f598f2bcb2..d862864ccf 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp
@@ -14,7 +14,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.CTAS,0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp
index df5710d08d..e86073e367 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp
@@ -17,7 +17,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp
index 898c962694..e20254c4bf 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp
index 712fa193f2..3340775558 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp
@@ -17,7 +17,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp
index 55a77dfba6..b36d4e6d77 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp
index 7083d5ffaf..0c5c77510d 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp
@@ -16,7 +16,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102146,102120,103001,103014,103015,103022,103027,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -177,7 +177,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,0" ActionCol="1" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,0" ActionCol="1" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="31.262000" Rows="1000.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp
index 99ea9745bc..5123c95223 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp
@@ -17,7 +17,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp
index ddd93800f2..57462c6fba 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -298,7 +298,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="3">
- <dxl:DMLInsert Columns="8,0" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="8,0" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.047075" Rows="3.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp b/src/backend/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp
index c4c1560e1b..fd990ec7e7 100644
--- a/src/backend/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -281,7 +281,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="5">
- <dxl:DMLInsert Columns="9" ActionCol="11" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="9" ActionCol="11" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.031385" Rows="3.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp b/src/backend/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp
index bd246ddcc3..7c4951676a 100644
--- a/src/backend/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102155,102156,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinDPS.mdp b/src/backend/gporca/data/dxl/minidump/RightJoinDPS.mdp
index 72fc3b6ed7..434bd38396 100644
--- a/src/backend/gporca/data/dxl/minidump/RightJoinDPS.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RightJoinDPS.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinHashed.mdp b/src/backend/gporca/data/dxl/minidump/RightJoinHashed.mdp
index 74cfcfccbb..51fa7b2d20 100644
--- a/src/backend/gporca/data/dxl/minidump/RightJoinHashed.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RightJoinHashed.mdp
@@ -33,7 +33,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp b/src/backend/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp
index d9ded821b9..be60373eb3 100644
--- a/src/backend/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp
@@ -37,7 +37,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinRedistribute.mdp b/src/backend/gporca/data/dxl/minidump/RightJoinRedistribute.mdp
index 1d7eb24aa3..7e627860cc 100644
--- a/src/backend/gporca/data/dxl/minidump/RightJoinRedistribute.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RightJoinRedistribute.mdp
@@ -39,7 +39,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinReplicated.mdp b/src/backend/gporca/data/dxl/minidump/RightJoinReplicated.mdp
index f7ed16ff32..4b30146f32 100644
--- a/src/backend/gporca/data/dxl/minidump/RightJoinReplicated.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RightJoinReplicated.mdp
@@ -33,7 +33,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102046,102074,102120,102146,102152,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinTVF.mdp b/src/backend/gporca/data/dxl/minidump/RightJoinTVF.mdp
index 0f49169eec..291495bd7d 100644
--- a/src/backend/gporca/data/dxl/minidump/RightJoinTVF.mdp
+++ b/src/backend/gporca/data/dxl/minidump/RightJoinTVF.mdp
@@ -42,7 +42,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102046,102074,102120,102146,102155,102156,103001,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp b/src/backend/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp
index bfb0d12c0f..037dc9a8a7 100644
--- a/src/backend/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp
@@ -18,7 +18,7 @@ select (select b from bar) from foo;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp b/src/backend/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp
index 6543002ec7..a88425e38f 100644
--- a/src/backend/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp
@@ -15,7 +15,7 @@ EXPLAIN SELECT (SELECT count(*) FROM bar where c = a) FROM foo;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp b/src/backend/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp
index 193863527b..a9d0c77f50 100644
--- a/src/backend/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp b/src/backend/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp
index 1a641691da..af063d4a14 100644
--- a/src/backend/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp
@@ -36,7 +36,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp b/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp
index cab06feaff..83ced973ab 100644
--- a/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp
@@ -16,7 +16,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103003,103014,103021,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp b/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp
index 287912b6ba..750e7069ad 100644
--- a/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp
@@ -16,7 +16,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103003,103014,103021,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp b/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp
index 7b1a94e706..f7eec2b946 100644
--- a/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp
@@ -16,7 +16,7 @@ EXPLAIN SELECT (SELECT COUNT(*) FROM bar GROUP BY c LIMIT 1) FROM foo;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp b/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp
index 2fc2099ae7..fb765bf2be 100644
--- a/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp
@@ -24,7 +24,7 @@ SELECT (SELECT jazz.count FROM (SELECT count(*) FROM bar GROUP BY c LIMIT 1) AS
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp b/src/backend/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp
index f4d0c454ca..30499a19a9 100644
--- a/src/backend/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp
@@ -42,7 +42,7 @@ where foo.a=bar.a and bar.b=jazz.b and foo.c=jazz.c;
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SelfUpdate.mdp b/src/backend/gporca/data/dxl/minidump/SelfUpdate.mdp
index ca43918db2..0fb1d0047f 100644
--- a/src/backend/gporca/data/dxl/minidump/SelfUpdate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SelfUpdate.mdp
@@ -214,10 +214,10 @@ update t1 set b = c;
</dxl:LogicalGet>
</dxl:LogicalUpdate>
</dxl:Query>
- <dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLUpdate Columns="0,2,2" ActionCol="10" OidCol="11" CtidCol="3" SegmentIdCol="9" InputSorted="false" IsSplitUpdate="false">
+ <dxl:Plan Id="0" SpaceSize="1">
+ <dxl:DMLUpdate Columns="0,2,2" ActionCol="10" CtidCol="3" SegmentIdCol="9" IsSplitUpdate="false">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.028678" Rows="1.000000" Width="1"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.023462" Rows="1.000000" Width="1"/>
</dxl:Properties>
<dxl:DirectDispatchInfo/>
<dxl:ProjList>
@@ -233,32 +233,32 @@ update t1 set b = c;
</dxl:ProjList>
<dxl:TableDescriptor Mdid="6.47297780.1.1" TableName="t1">
<dxl:Columns>
- <dxl:Column ColId="12" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="13" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="14" Attno="3" ColName="c" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="15" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
- <dxl:Column ColId="16" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="17" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="18" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="19" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="20" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
- <dxl:Column ColId="21" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="11" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="12" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="13" Attno="3" ColName="c" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="14" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
+ <dxl:Column ColId="15" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="16" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="17" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="18" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="19" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
+ <dxl:Column ColId="20" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:Columns>
</dxl:TableDescriptor>
- <dxl:Result>
+ <dxl:Assert ErrorCode="23502">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000032" Rows="1.000000" Width="22"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000025" Rows="1.000000" Width="18"/>
</dxl:Properties>
<dxl:ProjList>
- <dxl:ProjElem ColId="11" Alias="ColRef_0011">
- <dxl:ConstValue TypeMdid="0.26.1.0" Value="47297780"/>
- </dxl:ProjElem>
<dxl:ProjElem ColId="0" Alias="a">
<dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
<dxl:ProjElem ColId="2" Alias="c">
<dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
+ <dxl:ProjElem ColId="2" Alias="c">
+ <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
<dxl:ProjElem ColId="3" Alias="ctid">
<dxl:Ident ColId="3" ColName="ctid" TypeMdid="0.27.1.0"/>
</dxl:ProjElem>
@@ -266,11 +266,18 @@ update t1 set b = c;
<dxl:Ident ColId="9" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
</dxl:ProjList>
- <dxl:Filter/>
- <dxl:OneTimeFilter/>
- <dxl:Assert ErrorCode="23502">
+ <dxl:AssertConstraintList>
+ <dxl:AssertConstraint ErrorMessage="Not null constraint for column b of table t1 was violated">
+ <dxl:Not>
+ <dxl:IsNull>
+ <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
+ </dxl:IsNull>
+ </dxl:Not>
+ </dxl:AssertConstraint>
+ </dxl:AssertConstraintList>
+ <dxl:TableScan>
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000025" Rows="1.000000" Width="18"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000008" Rows="1.000000" Width="18"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -286,51 +293,23 @@ update t1 set b = c;
<dxl:Ident ColId="9" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
</dxl:ProjList>
- <dxl:AssertConstraintList>
- <dxl:AssertConstraint ErrorMessage="Not null constraint for column b of table t1 was violated">
- <dxl:Not>
- <dxl:IsNull>
- <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
- </dxl:IsNull>
- </dxl:Not>
- </dxl:AssertConstraint>
- </dxl:AssertConstraintList>
- <dxl:TableScan>
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000008" Rows="1.000000" Width="18"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="0" Alias="a">
- <dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="2" Alias="c">
- <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="3" Alias="ctid">
- <dxl:Ident ColId="3" ColName="ctid" TypeMdid="0.27.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="9" Alias="gp_segment_id">
- <dxl:Ident ColId="9" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Filter/>
- <dxl:TableDescriptor Mdid="6.47297780.1.1" TableName="t1">
- <dxl:Columns>
- <dxl:Column ColId="0" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="1" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="2" Attno="3" ColName="c" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="3" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
- <dxl:Column ColId="4" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="5" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="6" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="7" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="8" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
- <dxl:Column ColId="9" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:Columns>
- </dxl:TableDescriptor>
- </dxl:TableScan>
- </dxl:Assert>
- </dxl:Result>
+ <dxl:Filter/>
+ <dxl:TableDescriptor Mdid="6.47297780.1.1" TableName="t1">
+ <dxl:Columns>
+ <dxl:Column ColId="0" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="1" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="2" Attno="3" ColName="c" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="3" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
+ <dxl:Column ColId="4" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="5" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="6" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="7" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="8" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
+ <dxl:Column ColId="9" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
+ </dxl:Columns>
+ </dxl:TableDescriptor>
+ </dxl:TableScan>
+ </dxl:Assert>
</dxl:DMLUpdate>
</dxl:Plan>
</dxl:Thread>
diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp b/src/backend/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp
index 0834d22f3e..0d04abe5e4 100644
--- a/src/backend/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp
@@ -16,7 +16,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="7" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp b/src/backend/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp
index 7d1c5e8693..fe7e0619bb 100644
--- a/src/backend/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp
@@ -14,7 +14,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103003,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp b/src/backend/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp
index 7512afd0b3..db2002bc5b 100644
--- a/src/backend/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp
@@ -36,7 +36,7 @@ explain select * from foo where foo.a = 10 and exists (select * from bar);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp b/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp
index adc297bdfe..f237d4b999 100644
--- a/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp b/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp
index 0c5aa3868c..64ecddbf11 100644
--- a/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp
@@ -23,7 +23,7 @@
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SixWayDPv2.mdp b/src/backend/gporca/data/dxl/minidump/SixWayDPv2.mdp
index 6ed5c28f23..5b81d0ac18 100644
--- a/src/backend/gporca/data/dxl/minidump/SixWayDPv2.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SixWayDPv2.mdp
@@ -31,7 +31,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp b/src/backend/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp
index c22c44da4c..7d3c4bf914 100644
--- a/src/backend/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp
@@ -60,7 +60,7 @@ And instead have a plan like
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102146,102002,102003,102073,102074,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp b/src/backend/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp
index 5cbbc22757..1315a7aea6 100644
--- a/src/backend/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp
@@ -48,7 +48,7 @@ LIMIT 999
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -293,7 +293,7 @@ LIMIT 999
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="3">
- <dxl:DMLInsert Columns="8" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="8" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.010525" Rows="1.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp b/src/backend/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp
index da4e9a84be..b4f3407f44 100644
--- a/src/backend/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp
@@ -54,7 +54,7 @@ LIMIT 999
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -304,7 +304,7 @@ LIMIT 999
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="12">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="882720.643838" Rows="999.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncNullReject.mdp b/src/backend/gporca/data/dxl/minidump/SqlFuncNullReject.mdp
index fc17117d9f..1ae812b2f2 100644
--- a/src/backend/gporca/data/dxl/minidump/SqlFuncNullReject.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SqlFuncNullReject.mdp
@@ -40,7 +40,7 @@ yolo(c) = 16
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp b/src/backend/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp
index ffdceb7765..3523d8753a 100644
--- a/src/backend/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp
@@ -46,7 +46,7 @@ WHERE a = c AND
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp b/src/backend/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp
index be145e1c66..22f67e93af 100644
--- a/src/backend/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp
+++ b/src/backend/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp
@@ -32,7 +32,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102113,102120,102146,102147,103001,103014,103015,103022,103027,103029,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp b/src/backend/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp
index 22aebc0ff0..113d87c260 100644
--- a/src/backend/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp
@@ -43,7 +43,7 @@ pivotal=# explain select a, c from r, s where a in (select c from r) order by a,
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp b/src/backend/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp
index d07381406b..ceed4cbbe7 100644
--- a/src/backend/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp
@@ -64,7 +64,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp b/src/backend/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp
index 7de8cdf29d..931e039886 100644
--- a/src/backend/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp
@@ -59,7 +59,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp b/src/backend/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp
index e927780405..5c3799b561 100644
--- a/src/backend/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp
@@ -35,7 +35,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp b/src/backend/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp
index dca064d8c1..c2b0b16845 100644
--- a/src/backend/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp
@@ -64,7 +64,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp b/src/backend/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp
index bb467a9b82..2594892c25 100644
--- a/src/backend/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp
@@ -53,7 +53,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp b/src/backend/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp
index 745f1ed61f..c7d975cc37 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp
@@ -22,7 +22,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102074,102146,102120,103001,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp b/src/backend/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp
index e77cb5f41f..3a87187d45 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp
@@ -24,7 +24,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp b/src/backend/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp
index 1453e1d940..a0556e8f9a 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp
@@ -17,7 +17,7 @@ explain select * from foo,bar where b = (select min(b) from bar where a = b);
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102120,102144,103001,103014,103015,103021,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqInIndexPred.mdp b/src/backend/gporca/data/dxl/minidump/SubqInIndexPred.mdp
index 14bd19304b..1c54aada29 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqInIndexPred.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqInIndexPred.mdp
@@ -34,7 +34,7 @@ ON a = c
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp b/src/backend/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp
index 34eaa12362..d8458ef08b 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp
@@ -17,7 +17,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp b/src/backend/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp
index 05835e8857..d028545a68 100644
--- a/src/backend/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp
@@ -45,7 +45,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp b/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp
index dbd7274142..a056b34906 100644
--- a/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp
@@ -51,7 +51,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp b/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp
index 679f258502..daecdf240e 100644
--- a/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp
@@ -62,7 +62,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102113,102120,102146,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp b/src/backend/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp
index c1d95e421b..d0007f35e7 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp
@@ -44,7 +44,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp b/src/backend/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp
index aa9d1351e6..c50eb60694 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp
@@ -14,7 +14,7 @@ SELECT 0 IS DISTINCT FROM (SELECT COUNT(*) FROM (SELECT UNNEST(ARRAY[1,2,3,4]))
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102120,102144,103001,103003,103014,103015,103022,103027,103033,104004,104005"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryNullTest.mdp b/src/backend/gporca/data/dxl/minidump/SubqueryNullTest.mdp
index c36af8f7b5..233b0bdc81 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqueryNullTest.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqueryNullTest.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp b/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp
index 69b98d989b..44c610a688 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp
@@ -21,7 +21,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp b/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp
index 527a60082a..86aaf01822 100644
--- a/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp
+++ b/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp
@@ -17,7 +17,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102074,102120,103001,103014,103015,103022,103027,103029,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp
index 5ef5ac1921..9cd9fed7e0 100644
--- a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp
@@ -28,7 +28,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -266,7 +266,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="8" ActionCol="10" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="8" ActionCol="10" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.031499" Rows="3.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp
index 61f3e6dfa7..d9af14ab63 100644
--- a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp
@@ -27,7 +27,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,102152,103001,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -250,7 +250,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0,1" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0,1" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.047385" Rows="3.000000" Width="8"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp
index 35699f14db..e94658571a 100644
--- a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102074,102120,102146,103014,103022,103027,103029,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -254,7 +254,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="0" ActionCol="8" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="0" ActionCol="8" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.031503" Rows="3.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp
index c7dd2f18be..1da96f258b 100644
--- a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp
@@ -43,7 +43,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp
index 83c83b100e..dc464a6e39 100644
--- a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp
@@ -29,7 +29,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103014,103022,103027,103029,103033,103038,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -269,7 +269,7 @@
</dxl:LogicalInsert>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLInsert Columns="8" ActionCol="9" OidCol="0" CtidCol="0" SegmentIdCol="0" InputSorted="false">
+ <dxl:DMLInsert Columns="8" ActionCol="9" CtidCol="0" SegmentIdCol="0">
<dxl:Properties>
<dxl:Cost StartupCost="0" TotalCost="431.031499" Rows="3.000000" Width="4"/>
</dxl:Properties>
diff --git a/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp b/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp
index f1056aee98..ad395e8569 100644
--- a/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp b/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp
index 53fdd7345d..2ddfe40189 100644
--- a/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp
@@ -19,7 +19,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103029,103033,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TimeTypeStatsNotComparable.mdp b/src/backend/gporca/data/dxl/minidump/TimeTypeStatsNotComparable.mdp
index a2cedb15c7..f6dbec6c36 100644
--- a/src/backend/gporca/data/dxl/minidump/TimeTypeStatsNotComparable.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TimeTypeStatsNotComparable.mdp
@@ -22,7 +22,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp b/src/backend/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp
index c24921f244..b5a2ed165d 100644
--- a/src/backend/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp
@@ -46,7 +46,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp b/src/backend/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp
index 00e7570490..3c95ac3b94 100644
--- a/src/backend/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp
@@ -77,7 +77,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp b/src/backend/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp
index 3ce242f7c0..58079fafbc 100644
--- a/src/backend/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp
@@ -49,7 +49,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp b/src/backend/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp
index 479ea688ca..c25ee6b66b 100644
--- a/src/backend/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp
@@ -15,7 +15,7 @@ SELECT b[1] AS typmod_in_array_ref FROM foo;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="103027,102120,103001,103014,103015,103022,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierCast.mdp b/src/backend/gporca/data/dxl/minidump/TypeModifierCast.mdp
index 09062f3ba9..ec4e5cece2 100644
--- a/src/backend/gporca/data/dxl/minidump/TypeModifierCast.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TypeModifierCast.mdp
@@ -16,7 +16,7 @@ EXPLAIN SELECT b::varchar(40) FROM tab1;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierColumn.mdp b/src/backend/gporca/data/dxl/minidump/TypeModifierColumn.mdp
index f54b61a57e..863105c78f 100644
--- a/src/backend/gporca/data/dxl/minidump/TypeModifierColumn.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TypeModifierColumn.mdp
@@ -16,7 +16,7 @@ select b from tab1;
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierConst.mdp b/src/backend/gporca/data/dxl/minidump/TypeModifierConst.mdp
index 1181bd4dde..d0913f65ce 100644
--- a/src/backend/gporca/data/dxl/minidump/TypeModifierConst.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TypeModifierConst.mdp
@@ -14,7 +14,7 @@ select '5'::varchar(10);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103003,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp b/src/backend/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp
index b9250e75ad..8b36f38e51 100644
--- a/src/backend/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp
+++ b/src/backend/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp
@@ -14,7 +14,7 @@ SELECT 5::numeric(3);
<dxl:CostParam Name="NLJFactor" Value="1.000000" LowerBound="0.500000" UpperBound="1.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="25" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102120,102144,103001,103003,103014,103015,103022,103027,103033,104003,104004,104005,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp b/src/backend/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp
index 87d4476273..182bdaae6d 100644
--- a/src/backend/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp
@@ -17,7 +17,7 @@ explain SELECT a.f3 FROM tb a JOIN tb b ON a.f1 = b.f1 AND NOT ( a.f2 = 0 OR a.f
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000" EnforceConstraintsOnDML="false"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102120,102144,103001,103014,103015,103022,103027,103033,104003,104004,104005"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/Union-On-HJNs.mdp b/src/backend/gporca/data/dxl/minidump/Union-On-HJNs.mdp
index 6e57e9f344..d8426d86b9 100644
--- a/src/backend/gporca/data/dxl/minidump/Union-On-HJNs.mdp
+++ b/src/backend/gporca/data/dxl/minidump/Union-On-HJNs.mdp
@@ -7,7 +7,7 @@
<dxl:CTEConfig CTEInliningCutoff="0"/>
<dxl:WindowOids RowNumber="7000" Rank="7001"/>
<dxl:CostModelConfig CostModelType="1" SegmentsForCosting="2"/>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="2147483647" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="2147483647" ArrayExpansionThreshold="2147483647" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="10000000"/>
<dxl:TraceFlags Value="103027,102146,103001,103016,103022,104002"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/UnionWithCTE.mdp b/src/backend/gporca/data/dxl/minidump/UnionWithCTE.mdp
index 100550bd60..e6229e1696 100644
--- a/src/backend/gporca/data/dxl/minidump/UnionWithCTE.mdp
+++ b/src/backend/gporca/data/dxl/minidump/UnionWithCTE.mdp
@@ -22,7 +22,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102074,102113,102120,102144,102147,103001,103014,103015,103022,103027,103029,103033,103037,104003,104004,104005,104006,105000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
diff --git a/src/backend/gporca/data/dxl/minidump/UnnestSQJoins.mdp b/src/backend/gporca/data/dxl/minidump/UnnestSQJoins.mdp
index cf246d65d4..023a7d3bb2 100644
--- a/src/backend/gporca/data/dxl/minidump/UnnestSQJoins.mdp
+++ b/src/backend/gporca/data/dxl/minidump/UnnestSQJoins.mdp
@@ -27,7 +27,7 @@ WHERE
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="100" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10"/>
<dxl:TraceFlags Value="102001,102002,102003,102144,103001,103026,103027,103033"/>
</dxl:OptimizerConfig>
<dxl:Stacktrace/>
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp b/src/backend/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp
index f12d276e0d..40f0ba3399 100644
--- a/src/backend/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp
+++ b/src/backend/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp
@@ -273,9 +273,9 @@
</dxl:LogicalUpdate>
</dxl:Query>
<dxl:Plan Id="0" SpaceSize="8">
- <dxl:DMLUpdate Columns="0,1" ActionCol="18" OidCol="19" CtidCol="2" SegmentIdCol="8" InputSorted="false">
+ <dxl:DMLUpdate Columns="0,1" ActionCol="18" CtidCol="2" SegmentIdCol="8" IsSplitUpdate="true">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.102559" Rows="1.000000" Width="1"/>
+ <dxl:Cost StartupCost="0" TotalCost="862.086861" Rows="1.000000" Width="1"/>
</dxl:Properties>
<dxl:DirectDispatchInfo/>
<dxl:ProjList>
@@ -288,20 +288,20 @@
</dxl:ProjList>
<dxl:TableDescriptor Mdid="6.229435.1.1" TableName="r">
<dxl:Columns>
- <dxl:Column ColId="20" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="21" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="22" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
- <dxl:Column ColId="23" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="24" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="25" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="26" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="27" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
- <dxl:Column ColId="28" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="19" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="20" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="21" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
+ <dxl:Column ColId="22" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="23" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="24" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="25" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="26" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
+ <dxl:Column ColId="27" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:Columns>
</dxl:TableDescriptor>
<dxl:RedistributeMotion InputSegments="0" OutputSegments="0,1">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.000997" Rows="2.000000" Width="26"/>
+ <dxl:Cost StartupCost="0" TotalCost="862.000923" Rows="2.000000" Width="22"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -319,9 +319,6 @@
<dxl:ProjElem ColId="18" Alias="ColRef_0018">
<dxl:Ident ColId="18" ColName="ColRef_0018" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="19" Alias="ColRef_0019">
- <dxl:Ident ColId="19" ColName="ColRef_0019" TypeMdid="0.26.1.0"/>
- </dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
<dxl:SortingColumnList/>
@@ -330,9 +327,9 @@
<dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
</dxl:HashExpr>
</dxl:HashExprList>
- <dxl:Result>
+ <dxl:Split DeleteColumns="0,1" InsertColumns="10,1" ActionCol="18" CtidCol="2" SegmentIdCol="8">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.000855" Rows="2.000000" Width="26"/>
+ <dxl:Cost StartupCost="0" TotalCost="862.000803" Rows="2.000000" Width="22"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -348,17 +345,12 @@
<dxl:Ident ColId="8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
<dxl:ProjElem ColId="18" Alias="ColRef_0018">
- <dxl:Ident ColId="18" ColName="ColRef_0018" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="19" Alias="ColRef_0019">
- <dxl:ConstValue TypeMdid="0.26.1.0" Value="229435"/>
+ <dxl:DMLAction/>
</dxl:ProjElem>
</dxl:ProjList>
- <dxl:Filter/>
- <dxl:OneTimeFilter/>
- <dxl:Split DeleteColumns="0,1" InsertColumns="10,1" ActionCol="18" CtidCol="2" SegmentIdCol="8">
+ <dxl:HashJoin JoinType="Inner">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.000803" Rows="2.000000" Width="22"/>
+ <dxl:Cost StartupCost="0" TotalCost="862.000759" Rows="1.000000" Width="22"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -367,19 +359,27 @@
<dxl:ProjElem ColId="1" Alias="b">
<dxl:Ident ColId="1" ColName="b" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
+ <dxl:ProjElem ColId="10" Alias="b">
+ <dxl:Ident ColId="10" ColName="b" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
<dxl:ProjElem ColId="2" Alias="ctid">
<dxl:Ident ColId="2" ColName="ctid" TypeMdid="0.27.1.0"/>
</dxl:ProjElem>
<dxl:ProjElem ColId="8" Alias="gp_segment_id">
<dxl:Ident ColId="8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="18" Alias="ColRef_0018">
- <dxl:DMLAction/>
- </dxl:ProjElem>
</dxl:ProjList>
- <dxl:HashJoin JoinType="Inner">
+ <dxl:Filter/>
+ <dxl:JoinFilter/>
+ <dxl:HashCondList>
+ <dxl:Comparison ComparisonOperator="=" OperatorMdid="0.96.1.0">
+ <dxl:Ident ColId="1" ColName="b" TypeMdid="0.23.1.0"/>
+ <dxl:Ident ColId="9" ColName="a" TypeMdid="0.23.1.0"/>
+ </dxl:Comparison>
+ </dxl:HashCondList>
+ <dxl:GatherMotion InputSegments="0,1" OutputSegments="0">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="862.000759" Rows="1.000000" Width="22"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000108" Rows="1.000000" Width="18"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -388,9 +388,6 @@
<dxl:ProjElem ColId="1" Alias="b">
<dxl:Ident ColId="1" ColName="b" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="10" Alias="b">
- <dxl:Ident ColId="10" ColName="b" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
<dxl:ProjElem ColId="2" Alias="ctid">
<dxl:Ident ColId="2" ColName="ctid" TypeMdid="0.27.1.0"/>
</dxl:ProjElem>
@@ -399,16 +396,10 @@
</dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:JoinFilter/>
- <dxl:HashCondList>
- <dxl:Comparison ComparisonOperator="=" OperatorMdid="0.96.1.0">
- <dxl:Ident ColId="1" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:Ident ColId="9" ColName="a" TypeMdid="0.23.1.0"/>
- </dxl:Comparison>
- </dxl:HashCondList>
- <dxl:GatherMotion InputSegments="0,1" OutputSegments="0">
+ <dxl:SortingColumnList/>
+ <dxl:TableScan>
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000108" Rows="1.000000" Width="18"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000010" Rows="1.000000" Width="18"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -425,44 +416,38 @@
</dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:SortingColumnList/>
- <dxl:TableScan>
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000010" Rows="1.000000" Width="18"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="0" Alias="a">
- <dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="1" Alias="b">
- <dxl:Ident ColId="1" ColName="b" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="2" Alias="ctid">
- <dxl:Ident ColId="2" ColName="ctid" TypeMdid="0.27.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="8" Alias="gp_segment_id">
- <dxl:Ident ColId="8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Filter/>
- <dxl:TableDescriptor Mdid="6.229435.1.1" TableName="r">
- <dxl:Columns>
- <dxl:Column ColId="0" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="1" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="2" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
- <dxl:Column ColId="3" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="4" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="5" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="6" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="7" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
- <dxl:Column ColId="8" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:Columns>
- </dxl:TableDescriptor>
- </dxl:TableScan>
- </dxl:GatherMotion>
- <dxl:GatherMotion InputSegments="0,1" OutputSegments="0">
+ <dxl:TableDescriptor Mdid="6.229435.1.1" TableName="r">
+ <dxl:Columns>
+ <dxl:Column ColId="0" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="1" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="2" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
+ <dxl:Column ColId="3" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="4" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="5" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="6" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="7" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
+ <dxl:Column ColId="8" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
+ </dxl:Columns>
+ </dxl:TableDescriptor>
+ </dxl:TableScan>
+ </dxl:GatherMotion>
+ <dxl:GatherMotion InputSegments="0,1" OutputSegments="0">
+ <dxl:Properties>
+ <dxl:Cost StartupCost="0" TotalCost="431.000108" Rows="1.000000" Width="8"/>
+ </dxl:Properties>
+ <dxl:ProjList>
+ <dxl:ProjElem ColId="9" Alias="a">
+ <dxl:Ident ColId="9" ColName="a" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
+ <dxl:ProjElem ColId="10" Alias="b">
+ <dxl:Ident ColId="10" ColName="b" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
+ </dxl:ProjList>
+ <dxl:Filter/>
+ <dxl:SortingColumnList/>
+ <dxl:TableScan>
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000108" Rows="1.000000" Width="8"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000021" Rows="1.000000" Width="8"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="9" Alias="a">
@@ -473,38 +458,23 @@
</dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:SortingColumnList/>
- <dxl:TableScan>
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000021" Rows="1.000000" Width="8"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="9" Alias="a">
- <dxl:Ident ColId="9" ColName="a" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="10" Alias="b">
- <dxl:Ident ColId="10" ColName="b" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Filter/>
- <dxl:TableDescriptor Mdid="6.229458.1.1" TableName="s">
- <dxl:Columns>
- <dxl:Column ColId="9" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="10" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="11" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
- <dxl:Column ColId="12" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="13" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="14" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="15" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="16" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
- <dxl:Column ColId="17" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:Columns>
- </dxl:TableDescriptor>
- </dxl:TableScan>
- </dxl:GatherMotion>
- </dxl:HashJoin>
- </dxl:Split>
- </dxl:Result>
+ <dxl:TableDescriptor Mdid="6.229458.1.1" TableName="s">
+ <dxl:Columns>
+ <dxl:Column ColId="9" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="10" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="11" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
+ <dxl:Column ColId="12" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="13" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="14" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="15" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="16" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
+ <dxl:Column ColId="17" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
+ </dxl:Columns>
+ </dxl:TableDescriptor>
+ </dxl:TableScan>
+ </dxl:GatherMotion>
+ </dxl:HashJoin>
+ </dxl:Split>
</dxl:RedistributeMotion>
</dxl:DMLUpdate>
</dxl:Plan>
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp b/src/backend/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp
index 31ea8cf646..42435c5a79 100644
--- a/src/backend/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp
+++ b/src/backend/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp
@@ -291,10 +291,10 @@
</dxl:LogicalProject>
</dxl:LogicalUpdate>
</dxl:Query>
- <dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLUpdate Columns="0,11,2,3" ActionCol="12" OidCol="13" CtidCol="4" SegmentIdCol="10" InputSorted="false" IsSplitUpdate="false">
+ <dxl:Plan Id="0" SpaceSize="1">
+ <dxl:DMLUpdate Columns="0,11,2,3" ActionCol="12" CtidCol="4" SegmentIdCol="10" IsSplitUpdate="false">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.058730" Rows="1.000000" Width="1"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.050903" Rows="1.000000" Width="1"/>
</dxl:Properties>
<dxl:DirectDispatchInfo/>
<dxl:ProjList>
@@ -313,22 +313,22 @@
</dxl:ProjList>
<dxl:TableDescriptor Mdid="6.17005.1.1" TableName="r">
<dxl:Columns>
- <dxl:Column ColId="14" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="15" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="16" Attno="3" ColName="c" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="17" Attno="4" ColName="d" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="18" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
- <dxl:Column ColId="19" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="20" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="21" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="22" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="23" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
- <dxl:Column ColId="24" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="13" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="14" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="15" Attno="3" ColName="c" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="16" Attno="4" ColName="d" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="17" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
+ <dxl:Column ColId="18" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="19" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="20" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="21" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="22" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
+ <dxl:Column ColId="23" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:Columns>
</dxl:TableDescriptor>
- <dxl:Result>
+ <dxl:Assert ErrorCode="23514">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000136" Rows="1.000000" Width="30"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000121" Rows="1.000000" Width="26"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -349,15 +349,30 @@
<dxl:ProjElem ColId="10" Alias="gp_segment_id">
<dxl:Ident ColId="10" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="13" Alias="ColRef_0013">
- <dxl:ConstValue TypeMdid="0.26.1.0" Value="17005"/>
- </dxl:ProjElem>
</dxl:ProjList>
- <dxl:Filter/>
- <dxl:OneTimeFilter/>
- <dxl:Assert ErrorCode="23514">
+ <dxl:AssertConstraintList>
+ <dxl:AssertConstraint ErrorMessage="Check constraint r_check for table r was violated">
+ <dxl:IsDistinctFrom OperatorMdid="0.91.1.0">
+ <dxl:Comparison ComparisonOperator="<" OperatorMdid="0.97.1.0">
+ <dxl:Ident ColId="3" ColName="d" TypeMdid="0.23.1.0"/>
+ <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
+ </dxl:Comparison>
+ <dxl:ConstValue TypeMdid="0.16.1.0" Value="false"/>
+ </dxl:IsDistinctFrom>
+ </dxl:AssertConstraint>
+ <dxl:AssertConstraint ErrorMessage="Check constraint r_c_check for table r was violated">
+ <dxl:IsDistinctFrom OperatorMdid="0.91.1.0">
+ <dxl:Comparison ComparisonOperator=">" OperatorMdid="0.521.1.0">
+ <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
+ <dxl:ConstValue TypeMdid="0.23.1.0" Value="0"/>
+ </dxl:Comparison>
+ <dxl:ConstValue TypeMdid="0.16.1.0" Value="false"/>
+ </dxl:IsDistinctFrom>
+ </dxl:AssertConstraint>
+ </dxl:AssertConstraintList>
+ <dxl:Assert ErrorCode="23502">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000121" Rows="1.000000" Width="26"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000108" Rows="1.000000" Width="26"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="a">
@@ -380,30 +395,22 @@
</dxl:ProjElem>
</dxl:ProjList>
<dxl:AssertConstraintList>
- <dxl:AssertConstraint ErrorMessage="Check constraint r_check for table r was violated">
- <dxl:IsDistinctFrom OperatorMdid="0.91.1.0">
- <dxl:Comparison ComparisonOperator="<" OperatorMdid="0.97.1.0">
- <dxl:Ident ColId="3" ColName="d" TypeMdid="0.23.1.0"/>
- <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
- </dxl:Comparison>
- <dxl:ConstValue TypeMdid="0.16.1.0" Value="false"/>
- </dxl:IsDistinctFrom>
- </dxl:AssertConstraint>
- <dxl:AssertConstraint ErrorMessage="Check constraint r_c_check for table r was violated">
- <dxl:IsDistinctFrom OperatorMdid="0.91.1.0">
- <dxl:Comparison ComparisonOperator=">" OperatorMdid="0.521.1.0">
- <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="0"/>
- </dxl:Comparison>
- <dxl:ConstValue TypeMdid="0.16.1.0" Value="false"/>
- </dxl:IsDistinctFrom>
+ <dxl:AssertConstraint ErrorMessage="Not null constraint for column b of table r was violated">
+ <dxl:Not>
+ <dxl:IsNull>
+ <dxl:Ident ColId="11" ColName="b" TypeMdid="0.23.1.0"/>
+ </dxl:IsNull>
+ </dxl:Not>
</dxl:AssertConstraint>
</dxl:AssertConstraintList>
- <dxl:Assert ErrorCode="23502">
+ <dxl:Result>
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000108" Rows="1.000000" Width="26"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000095" Rows="1.000000" Width="26"/>
</dxl:Properties>
<dxl:ProjList>
+ <dxl:ProjElem ColId="11" Alias="b">
+ <dxl:ConstValue TypeMdid="0.23.1.0" Value="2"/>
+ </dxl:ProjElem>
<dxl:ProjElem ColId="0" Alias="a">
<dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
@@ -419,27 +426,14 @@
<dxl:ProjElem ColId="10" Alias="gp_segment_id">
<dxl:Ident ColId="10" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="11" Alias="b">
- <dxl:Ident ColId="11" ColName="b" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
</dxl:ProjList>
- <dxl:AssertConstraintList>
- <dxl:AssertConstraint ErrorMessage="Not null constraint for column b of table r was violated">
- <dxl:Not>
- <dxl:IsNull>
- <dxl:Ident ColId="11" ColName="b" TypeMdid="0.23.1.0"/>
- </dxl:IsNull>
- </dxl:Not>
- </dxl:AssertConstraint>
- </dxl:AssertConstraintList>
- <dxl:Result>
+ <dxl:Filter/>
+ <dxl:OneTimeFilter/>
+ <dxl:TableScan>
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000095" Rows="1.000000" Width="26"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000082" Rows="1.000000" Width="26"/>
</dxl:Properties>
<dxl:ProjList>
- <dxl:ProjElem ColId="11" Alias="b">
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="2"/>
- </dxl:ProjElem>
<dxl:ProjElem ColId="0" Alias="a">
<dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
@@ -456,55 +450,31 @@
<dxl:Ident ColId="10" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
</dxl:ProjList>
- <dxl:Filter/>
- <dxl:OneTimeFilter/>
- <dxl:TableScan>
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000082" Rows="1.000000" Width="26"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="0" Alias="a">
- <dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="2" Alias="c">
- <dxl:Ident ColId="2" ColName="c" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="3" Alias="d">
- <dxl:Ident ColId="3" ColName="d" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="4" Alias="ctid">
- <dxl:Ident ColId="4" ColName="ctid" TypeMdid="0.27.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="10" Alias="gp_segment_id">
- <dxl:Ident ColId="10" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Filter>
- <dxl:Comparison ComparisonOperator=">" OperatorMdid="0.521.1.0">
- <dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
- <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
- </dxl:Comparison>
- </dxl:Filter>
- <dxl:TableDescriptor Mdid="6.17005.1.1" TableName="r">
- <dxl:Columns>
- <dxl:Column ColId="0" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="1" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="2" Attno="3" ColName="c" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="3" Attno="4" ColName="d" TypeMdid="0.23.1.0"/>
- <dxl:Column ColId="4" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
- <dxl:Column ColId="5" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="6" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="7" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
- <dxl:Column ColId="8" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
- <dxl:Column ColId="9" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
- <dxl:Column ColId="10" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:Columns>
- </dxl:TableDescriptor>
- </dxl:TableScan>
- </dxl:Result>
- </dxl:Assert>
+ <dxl:Filter>
+ <dxl:Comparison ComparisonOperator=">" OperatorMdid="0.521.1.0">
+ <dxl:Ident ColId="0" ColName="a" TypeMdid="0.23.1.0"/>
+ <dxl:ConstValue TypeMdid="0.23.1.0" Value="1"/>
+ </dxl:Comparison>
+ </dxl:Filter>
+ <dxl:TableDescriptor Mdid="6.17005.1.1" TableName="r">
+ <dxl:Columns>
+ <dxl:Column ColId="0" Attno="1" ColName="a" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="1" Attno="2" ColName="b" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="2" Attno="3" ColName="c" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="3" Attno="4" ColName="d" TypeMdid="0.23.1.0"/>
+ <dxl:Column ColId="4" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0"/>
+ <dxl:Column ColId="5" Attno="-3" ColName="xmin" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="6" Attno="-4" ColName="cmin" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="7" Attno="-5" ColName="xmax" TypeMdid="0.28.1.0"/>
+ <dxl:Column ColId="8" Attno="-6" ColName="cmax" TypeMdid="0.29.1.0"/>
+ <dxl:Column ColId="9" Attno="-7" ColName="tableoid" TypeMdid="0.26.1.0"/>
+ <dxl:Column ColId="10" Attno="-8" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
+ </dxl:Columns>
+ </dxl:TableDescriptor>
+ </dxl:TableScan>
+ </dxl:Result>
</dxl:Assert>
- </dxl:Result>
+ </dxl:Assert>
</dxl:DMLUpdate>
</dxl:Plan>
</dxl:Thread>
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp b/src/backend/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp
index df0328a532..a7f7d3d301 100644
--- a/src/backend/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp
+++ b/src/backend/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp
@@ -11,7 +11,7 @@
<dxl:CostParam Name="NLJFactor" Value="1024.000000" LowerBound="1023.500000" UpperBound="1024.500000"/>
</dxl:CostParams>
</dxl:CostModelConfig>
- <dxl:Hint MinNumOfPartsToRequireSortOnInsert="2147483647" JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
+ <dxl:Hint JoinArityForAssociativityCommutativity="18" ArrayExpansionThreshold="20" JoinOrderDynamicProgThreshold="10" BroadcastThreshold="100000" EnforceConstraintsOnDML="false" PushGroupByBelowSetopThreshold="10" XformBindThreshold="0"/>
<dxl:TraceFlags Value="101013,102001,102002,102003,102043,102074,102120,102144,103001,103014,103022,103026,103027,103029,103033,103038,103040,104002,104003,104004,104005,105000,106000"/>
</dxl:OptimizerConfig>
<dxl:Metadata SystemIds="0.GPDB">
@@ -561,10 +561,10 @@
</dxl:LogicalProject>
</dxl:LogicalUpdate>
</dxl:Query>
- <dxl:Plan Id="0" SpaceSize="2">
- <dxl:DMLUpdate Columns="0,1,2" ActionCol="21" OidCol="22" CtidCol="3" SegmentIdCol="9" InputSorted="false" IsSplitUpdate="true">
+ <dxl:Plan Id="0" SpaceSize="1">
+ <dxl:DMLUpdate Columns="0,1,2" ActionCol="21" CtidCol="3" SegmentIdCol="9" IsSplitUpdate="true">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="1324066.314981" Rows="1.000000" Width="1"/>
+ <dxl:Cost StartupCost="0" TotalCost="1324066.304544" Rows="1.000000" Width="1"/>
</dxl:Properties>
<dxl:DirectDispatchInfo/>
<dxl:ProjList>
@@ -580,21 +580,21 @@
</dxl:ProjList>
<dxl:TableDescriptor Mdid="6.16514.1.0" TableName="pt2" LockMode="7">
<dxl:Columns>
- <dxl:Column ColId="23" Attno="1" ColName="i" TypeMdid="0.23.1.0" ColWidth="4"/>
- <dxl:Column ColId="24" Attno="2" ColName="j" TypeMdid="0.23.1.0" ColWidth="4"/>
- <dxl:Column ColId="25" Attno="3" ColName="k" TypeMdid="0.23.1.0" ColWidth="4"/>
- <dxl:Column ColId="26" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
- <dxl:Column ColId="27" Attno="-2" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="28" Attno="-3" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="29" Attno="-4" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="30" Attno="-5" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="31" Attno="-6" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
- <dxl:Column ColId="32" Attno="-7" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
+ <dxl:Column ColId="22" Attno="1" ColName="i" TypeMdid="0.23.1.0" ColWidth="4"/>
+ <dxl:Column ColId="23" Attno="2" ColName="j" TypeMdid="0.23.1.0" ColWidth="4"/>
+ <dxl:Column ColId="24" Attno="3" ColName="k" TypeMdid="0.23.1.0" ColWidth="4"/>
+ <dxl:Column ColId="25" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
+ <dxl:Column ColId="26" Attno="-2" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="27" Attno="-3" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="28" Attno="-4" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="29" Attno="-5" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="30" Attno="-6" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
+ <dxl:Column ColId="31" Attno="-7" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
</dxl:Columns>
</dxl:TableDescriptor>
- <dxl:Result>
+ <dxl:RedistributeMotion InputSegments="0,1,2" OutputSegments="0,1,2">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="1324066.236856" Rows="2.000000" Width="30"/>
+ <dxl:Cost StartupCost="0" TotalCost="1324066.236836" Rows="2.000000" Width="26"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="i">
@@ -615,15 +615,17 @@
<dxl:ProjElem ColId="21" Alias="ColRef_0021">
<dxl:Ident ColId="21" ColName="ColRef_0021" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="22" Alias="ColRef_0022">
- <dxl:ConstValue TypeMdid="0.26.1.0" Value="16514"/>
- </dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:OneTimeFilter/>
- <dxl:RedistributeMotion InputSegments="0,1,2" OutputSegments="0,1,2">
+ <dxl:SortingColumnList/>
+ <dxl:HashExprList>
+ <dxl:HashExpr Opfamily="0.1977.1.0">
+ <dxl:Ident ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
+ </dxl:HashExpr>
+ </dxl:HashExprList>
+ <dxl:Split DeleteColumns="0,1,2" InsertColumns="20,1,2" ActionCol="21" CtidCol="3" SegmentIdCol="9">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="1324066.236836" Rows="2.000000" Width="26"/>
+ <dxl:Cost StartupCost="0" TotalCost="1324066.236781" Rows="2.000000" Width="26"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="i">
@@ -642,19 +644,12 @@
<dxl:Ident ColId="9" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
<dxl:ProjElem ColId="21" Alias="ColRef_0021">
- <dxl:Ident ColId="21" ColName="ColRef_0021" TypeMdid="0.23.1.0"/>
+ <dxl:DMLAction/>
</dxl:ProjElem>
</dxl:ProjList>
- <dxl:Filter/>
- <dxl:SortingColumnList/>
- <dxl:HashExprList>
- <dxl:HashExpr Opfamily="0.1977.1.0">
- <dxl:Ident ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
- </dxl:HashExpr>
- </dxl:HashExprList>
- <dxl:Split DeleteColumns="0,1,2" InsertColumns="20,1,2" ActionCol="21" CtidCol="3" SegmentIdCol="9">
+ <dxl:Result>
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="1324066.236781" Rows="2.000000" Width="26"/>
+ <dxl:Cost StartupCost="0" TotalCost="1324066.236764" Rows="1.000000" Width="26"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="0" Alias="i">
@@ -666,55 +661,44 @@
<dxl:ProjElem ColId="2" Alias="k">
<dxl:Ident ColId="2" ColName="k" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
- <dxl:ProjElem ColId="3" Alias="ctid">
- <dxl:Ident ColId="3" ColName="ctid" TypeMdid="0.27.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="9" Alias="gp_segment_id">
- <dxl:Ident ColId="9" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="21" Alias="ColRef_0021">
- <dxl:DMLAction/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Result>
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="1324066.236764" Rows="1.000000" Width="26"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="0" Alias="i">
- <dxl:Ident ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="1" Alias="j">
- <dxl:Ident ColId="1" ColName="j" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="2" Alias="k">
- <dxl:Ident ColId="2" ColName="k" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="20" Alias="i">
- <dxl:SubPlan TypeMdid="0.23.1.0" SubPlanType="ScalarSubPlan">
- <dxl:TestExpr/>
- <dxl:ParamList>
- <dxl:Param ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
- </dxl:ParamList>
- <dxl:Result>
+ <dxl:ProjElem ColId="20" Alias="i">
+ <dxl:SubPlan TypeMdid="0.23.1.0" SubPlanType="ScalarSubPlan">
+ <dxl:TestExpr/>
+ <dxl:ParamList>
+ <dxl:Param ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
+ </dxl:ParamList>
+ <dxl:Result>
+ <dxl:Properties>
+ <dxl:Cost StartupCost="0" TotalCost="431.000541" Rows="3.000000" Width="4"/>
+ </dxl:Properties>
+ <dxl:ProjList>
+ <dxl:ProjElem ColId="12" Alias="c">
+ <dxl:Ident ColId="12" ColName="c" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
+ </dxl:ProjList>
+ <dxl:Filter>
+ <dxl:Comparison ComparisonOperator="=" OperatorMdid="0.96.1.0">
+ <dxl:Ident ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
+ <dxl:Ident ColId="11" ColName="b" TypeMdid="0.23.1.0"/>
+ </dxl:Comparison>
+ </dxl:Filter>
+ <dxl:OneTimeFilter/>
+ <dxl:Materialize Eager="false">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000541" Rows="3.000000" Width="4"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000476" Rows="3.000000" Width="8"/>
</dxl:Properties>
<dxl:ProjList>
+ <dxl:ProjElem ColId="11" Alias="b">
+ <dxl:Ident ColId="11" ColName="b" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
<dxl:ProjElem ColId="12" Alias="c">
<dxl:Ident ColId="12" ColName="c" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
</dxl:ProjList>
- <dxl:Filter>
- <dxl:Comparison ComparisonOperator="=" OperatorMdid="0.96.1.0">
- <dxl:Ident ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
- <dxl:Ident ColId="11" ColName="b" TypeMdid="0.23.1.0"/>
- </dxl:Comparison>
- </dxl:Filter>
- <dxl:OneTimeFilter/>
- <dxl:Materialize Eager="false">
+ <dxl:Filter/>
+ <dxl:BroadcastMotion InputSegments="0,1,2" OutputSegments="0,1,2">
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000476" Rows="3.000000" Width="8"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000468" Rows="3.000000" Width="8"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="11" Alias="b">
@@ -725,9 +709,10 @@
</dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:BroadcastMotion InputSegments="0,1,2" OutputSegments="0,1,2">
+ <dxl:SortingColumnList/>
+ <dxl:TableScan>
<dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000468" Rows="3.000000" Width="8"/>
+ <dxl:Cost StartupCost="0" TotalCost="431.000023" Rows="1.000000" Width="8"/>
</dxl:Properties>
<dxl:ProjList>
<dxl:ProjElem ColId="11" Alias="b">
@@ -738,38 +723,47 @@
</dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:SortingColumnList/>
- <dxl:TableScan>
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000023" Rows="1.000000" Width="8"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="11" Alias="b">
- <dxl:Ident ColId="11" ColName="b" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="12" Alias="c">
- <dxl:Ident ColId="12" ColName="c" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Filter/>
- <dxl:TableDescriptor Mdid="6.16532.1.0" TableName="r" LockMode="1">
- <dxl:Columns>
- <dxl:Column ColId="11" Attno="2" ColName="b" TypeMdid="0.23.1.0" ColWidth="4"/>
- <dxl:Column ColId="12" Attno="3" ColName="c" TypeMdid="0.23.1.0" ColWidth="4"/>
- <dxl:Column ColId="13" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
- <dxl:Column ColId="14" Attno="-2" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="15" Attno="-3" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="16" Attno="-4" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
- <dxl:Column ColId="17" Attno="-5" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
- <dxl:Column ColId="18" Attno="-6" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
- <dxl:Column ColId="19" Attno="-7" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
- </dxl:Columns>
- </dxl:TableDescriptor>
- </dxl:TableScan>
- </dxl:BroadcastMotion>
- </dxl:Materialize>
- </dxl:Result>
- </dxl:SubPlan>
+ <dxl:TableDescriptor Mdid="6.16532.1.0" TableName="r" LockMode="1">
+ <dxl:Columns>
+ <dxl:Column ColId="11" Attno="2" ColName="b" TypeMdid="0.23.1.0" ColWidth="4"/>
+ <dxl:Column ColId="12" Attno="3" ColName="c" TypeMdid="0.23.1.0" ColWidth="4"/>
+ <dxl:Column ColId="13" Attno="-1" ColName="ctid" TypeMdid="0.27.1.0" ColWidth="6"/>
+ <dxl:Column ColId="14" Attno="-2" ColName="xmin" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="15" Attno="-3" ColName="cmin" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="16" Attno="-4" ColName="xmax" TypeMdid="0.28.1.0" ColWidth="4"/>
+ <dxl:Column ColId="17" Attno="-5" ColName="cmax" TypeMdid="0.29.1.0" ColWidth="4"/>
+ <dxl:Column ColId="18" Attno="-6" ColName="tableoid" TypeMdid="0.26.1.0" ColWidth="4"/>
+ <dxl:Column ColId="19" Attno="-7" ColName="gp_segment_id" TypeMdid="0.23.1.0" ColWidth="4"/>
+ </dxl:Columns>
+ </dxl:TableDescriptor>
+ </dxl:TableScan>
+ </dxl:BroadcastMotion>
+ </dxl:Materialize>
+ </dxl:Result>
+ </dxl:SubPlan>
+ </dxl:ProjElem>
+ <dxl:ProjElem ColId="3" Alias="ctid">
+ <dxl:Ident ColId="3" ColName="ctid" TypeMdid="0.27.1.0"/>
+ </dxl:ProjElem>
+ <dxl:ProjElem ColId="9" Alias="gp_segment_id">
+ <dxl:Ident ColId="9" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
+ </dxl:ProjList>
+ <dxl:Filter/>
+ <dxl:OneTimeFilter/>
+ <dxl:DynamicTableScan SelectorIds="">
+ <dxl:Properties>
+ <dxl:Cost StartupCost="0" TotalCost="431.000023" Rows="1.000000" Width="22"/>
+ </dxl:Properties>
+ <dxl:ProjList>
+ <dxl:ProjElem ColId="0" Alias="i">
+ <dxl:Ident ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
+ <dxl:ProjElem ColId="1" Alias="j">
+ <dxl:Ident ColId="1" ColName="j" TypeMdid="0.23.1.0"/>
+ </dxl:ProjElem>
+ <dxl:ProjElem ColId="2" Alias="k">
+ <dxl:Ident ColId="2" ColName="k" TypeMdid="0.23.1.0"/>
</dxl:ProjElem>
<dxl:ProjElem ColId="3" Alias="ctid">
<dxl:Ident ColId="3" ColName="ctid" TypeMdid="0.27.1.0"/>
@@ -779,55 +773,31 @@
</dxl:ProjElem>
</dxl:ProjList>
<dxl:Filter/>
- <dxl:OneTimeFilter/>
- <dxl:DynamicTableScan SelectorIds="">
- <dxl:Properties>
- <dxl:Cost StartupCost="0" TotalCost="431.000023" Rows="1.000000" Width="22"/>
- </dxl:Properties>
- <dxl:ProjList>
- <dxl:ProjElem ColId="0" Alias="i">
- <dxl:Ident ColId="0" ColName="i" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="1" Alias="j">
- <dxl:Ident ColId="1" ColName="j" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="2" Alias="k">
- <dxl:Ident ColId="2" ColName="k" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="3" Alias="ctid">
- <dxl:Ident ColId="3" ColName="ctid" TypeMdid="0.27.1.0"/>
- </dxl:ProjElem>
- <dxl:ProjElem ColId="9" Alias="gp_segment_id">
- <dxl:Ident ColId="9" ColName="gp_segment_id" TypeMdid="0.23.1.0"/>
- </dxl:ProjElem>
- </dxl:ProjList>
- <dxl:Filter/>
- <dxl:Partitions>
- <dxl:Partition Mdid="6.16517.1.0"/>
- <dxl:Partition Mdid="6.16520.1.0"/>
- <dxl:Partition Mdid="6.16523.1.0"/>
- <dxl:Partition Mdid="6.16526.1.0"/>
... 5679 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org