Resolve conflicts

Author: ash211

core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala

@@ -232,17 +232,11 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, val rpcEnv: Rp
         removeWorker(workerId, host, message)
         context.reply(true)
 
-<<<<<<< HEAD
       case RetrieveSparkAppConfig(_) =>
-        val reply = SparkAppConfig(sparkProperties,
-          SparkEnv.get.securityManager.getIOEncryptionKey())
-=======
-      case RetrieveSparkAppConfig =>
         val reply = SparkAppConfig(
           sparkProperties,
           SparkEnv.get.securityManager.getIOEncryptionKey(),
           hadoopDelegationCreds)
->>>>>>> origin/master
         context.reply(reply)
     }
 

mllib/src/test/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifierSuite.scala

@@ -84,9 +84,6 @@ class MultilayerPerceptronClassifierSuite
     }
   }
 
-<<<<<<< HEAD
-  ignore("Test setWeights by training restart -- ignore palantir/spark") {
-=======
   test("Predicted class probabilities: calibration on toy dataset") {
     val layers = Array[Int](4, 5, 2)
 
@@ -128,8 +125,7 @@ class MultilayerPerceptronClassifierSuite
     }
   }
 
-  test("Test setWeights by training restart") {
->>>>>>> origin/master
+  ignore("Test setWeights by training restart -- ignore palantir/spark") {
     val dataFrame = Seq(
       (Vectors.dense(0.0, 0.0), 0.0),
       (Vectors.dense(0.0, 1.0), 1.0),

pom.xml

@@ -193,10 +193,7 @@
     <jsr305.version>3.0.1</jsr305.version>
     <libthrift.version>0.9.3</libthrift.version>
     <antlr4.version>4.7</antlr4.version>
-<<<<<<< HEAD
     <antlr.version>3.4</antlr.version>
-=======
->>>>>>> origin/master
     <jpam.version>1.1</jpam.version>
     <selenium.version>2.52.0</selenium.version>
     <paranamer.version>2.6</paranamer.version>

sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4

@@ -64,11 +64,7 @@ singleDataType
     : dataType EOF
     ;
 
-<<<<<<< HEAD
-standaloneColTypeList
-=======
 singleTableSchema
->>>>>>> origin/master
     : colTypeList EOF
     ;
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala

@@ -89,16 +89,9 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
     visitSparkDataType(ctx.dataType)
   }
 
-<<<<<<< HEAD
-  override def visitStandaloneColTypeList(ctx: StandaloneColTypeListContext): Seq[StructField] =
-    withOrigin(ctx) {
-      visitColTypeList(ctx.colTypeList)
-    }
-=======
   override def visitSingleTableSchema(ctx: SingleTableSchemaContext): StructType = {
     withOrigin(ctx)(StructType(visitColTypeList(ctx.colTypeList)))
   }
->>>>>>> origin/master
 
   /* ********************************************************************************************
    * Plan parsing

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParseDriver.scala

@@ -61,11 +61,7 @@ abstract class AbstractSqlParser extends ParserInterface with Logging {
    * definitions which will preserve the correct Hive metadata.
    */
   override def parseTableSchema(sqlText: String): StructType = parse(sqlText) { parser =>
-<<<<<<< HEAD
-    StructType(astBuilder.visitStandaloneColTypeList(parser.standaloneColTypeList()))
-=======
     astBuilder.visitSingleTableSchema(parser.singleTableSchema())
->>>>>>> origin/master
   }
 
   /** Creates LogicalPlan for a given SQL string. */

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala

@@ -57,7 +57,6 @@ class ParquetFilterSuite extends QueryTest with ParquetTest with SharedSQLContex
       expected: Seq[Row]): Unit = {
     val output = predicate.collect { case a: Attribute => a }.distinct
 
-<<<<<<< HEAD
     withSQLConf(SQLConf.PARQUET_FILTER_PUSHDOWN_ENABLED.key -> "true",
       SQLConf.PARQUET_VECTORIZED_READER_ENABLED.key -> "false",
       ParquetInputFormat.RECORD_FILTERING_ENABLED -> "true") {
@@ -67,7 +66,8 @@ class ParquetFilterSuite extends QueryTest with ParquetTest with SharedSQLContex
 
       var maybeRelation: Option[HadoopFsRelation] = None
       val maybeAnalyzedPredicate = query.queryExecution.optimizedPlan.collect {
-        case PhysicalOperation(_, filters, LogicalRelation(relation: HadoopFsRelation, _, _)) =>
+        case PhysicalOperation(_, filters,
+                               LogicalRelation(relation: HadoopFsRelation, _, _, _)) =>
           maybeRelation = Some(relation)
           filters
       }.flatten.reduceLeftOption(_ && _)
@@ -83,34 +83,6 @@ class ParquetFilterSuite extends QueryTest with ParquetTest with SharedSQLContex
         assert(maybeFilter.isDefined, s"Couldn't generate filter predicate for $pred")
         // Doesn't bother checking type parameters here (e.g. `Eq[Integer]`)
         maybeFilter.exists(_.getClass === filterClass)
-=======
-    withSQLConf(SQLConf.PARQUET_FILTER_PUSHDOWN_ENABLED.key -> "true") {
-      withSQLConf(SQLConf.PARQUET_VECTORIZED_READER_ENABLED.key -> "false") {
-        val query = df
-          .select(output.map(e => Column(e)): _*)
-          .where(Column(predicate))
-
-        var maybeRelation: Option[HadoopFsRelation] = None
-        val maybeAnalyzedPredicate = query.queryExecution.optimizedPlan.collect {
-          case PhysicalOperation(_, filters,
-                                 LogicalRelation(relation: HadoopFsRelation, _, _, _)) =>
-            maybeRelation = Some(relation)
-            filters
-        }.flatten.reduceLeftOption(_ && _)
-        assert(maybeAnalyzedPredicate.isDefined, "No filter is analyzed from the given query")
-
-        val (_, selectedFilters, _) =
-          DataSourceStrategy.selectFilters(maybeRelation.get, maybeAnalyzedPredicate.toSeq)
-        assert(selectedFilters.nonEmpty, "No filter is pushed down")
-
-        selectedFilters.foreach { pred =>
-          val maybeFilter = ParquetFilters.createFilter(df.schema, pred)
-          assert(maybeFilter.isDefined, s"Couldn't generate filter predicate for $pred")
-          // Doesn't bother checking type parameters here (e.g. `Eq[Integer]`)
-          maybeFilter.exists(_.getClass === filterClass)
-        }
-        checker(stripSparkFilter(query), expected)
->>>>>>> origin/master
       }
       checker(stripSparkFilter(query), expected)
     }

sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCWriteSuite.scala

@@ -468,11 +468,7 @@ class JDBCWriteSuite extends SharedSQLContext with BeforeAndAfter {
         .option("createTableColumnTypes", "`name char(20)") // incorrectly quoted column
         .jdbc(url1, "TEST.USERDBTYPETEST", properties)
     }.getMessage()
-<<<<<<< HEAD
-    assert(msg.contains("extraneous input '`' expecting"))
-=======
     assert(msg.contains("extraneous input"))
->>>>>>> origin/master
   }
 
   test("SPARK-10849: jdbc CreateTableColumnTypes duplicate columns") {