Update code

apache · May 8, 2021 · d2a12b6 · d2a12b6
1 parent a615825
commit d2a12b6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala
@@ -1356,7 +1356,6 @@ private[spark] object QueryCompilationErrors {
     new AnalysisException("Cannot use interval type in the table schema.")
   }
 
-  <<<<<<< SPARK-35062
   def operateHiveDataSourceDirectlyError(operation: String): Throwable = {
     new AnalysisException("Hive data source can only be used with tables, you can not " +
       s"$operation files of Hive data source directly.")

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala
@@ -876,8 +876,7 @@ object QueryExecutionErrors {
   def cannotCastUTF8StringToDataTypeError(s: UTF8String, to: DataType): Throwable = {
     new DateTimeException(s"Cannot cast $s to $to.")
   }
-
-  <<<<<<< SPARK-35062
+
   def registeringStreamingQueryListenerError(e: Exception): Throwable = {
     new SparkException("Exception when registering StreamingQueryListener", e)
   }