[SQL]fix spark sql hive tests time out issue#2566

scwf wants to merge 2 commits intoapache:masterapache/spark:masterfrom

scwf:patch-2scwf/spark:patch-2Copy head branch name to clipboard