[SPARK-11787][SPARK-11883] [SQL] [FOLLOW-UP] Cleanup for this patch.#9845

nongli wants to merge 4 commits intoapache:masterapache/spark:masterfrom

nongli:spark-11787nongli/spark:spark-11787Copy head branch name to clipboard