HyukjinKwon commented on a change in pull request #28150:
[SPARK-31327][SQL][2.4] Write Spark version into Avro file metadata
URL: https://github.com/apache/spark/pull/28150#discussion_r405260745
##########
File path:
external/avro/src/test/scala/org/apache/spark/sql/avro/AvroSuite.scala
##########
@@ -33,7 +33,11 @@ import org.apache.avro.generic.{GenericData,
GenericDatumReader, GenericDatumWri
import org.apache.avro.generic.GenericData.{EnumSymbol, Fixed}
import org.apache.commons.io.FileUtils
+<<<<<<< HEAD
import org.apache.spark.SparkException
+=======
+import org.apache.spark.{SPARK_VERSION_SHORT, SparkConf, SparkException}
+>>>>>>> 6b1ca886c0... [SPARK-31327][SQL] Write Spark version into Avro file
metadata
Review comment:
:-)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
