HIVE-9043: HiveException: Conflict on row inspector for {table} (Szehon via Xuefu)
merged from trunk, r1644764

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