[SPARK-28356][SHUFFLE][FOLLOWUP] Fix case with different pre-shuffle partition numbers#25479

peter-toth wants to merge 2 commits intoapache:masterapache/spark:masterfrom

peter-toth:SPARK-28356-followuppeter-toth/spark:SPARK-28356-followupCopy head branch name to clipboard