HIVE-8055: Code cleanup after HIVE-8054 [Spark Branch] (Na via Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1625435 13f79535-47bb-0310-9956-ffa450edef68