Merge remote-tracking branch 'upstream/master'

sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala

@@ -1572,22 +1572,11 @@ class DataFrameSuite extends QueryTest with SharedSQLContext {
     checkAnswer(joined.filter($"new".isNull), Row("x", null, null))
   }
 
-  test("SPARK-12987: drop column ") {
-    val df = Seq((1, 2)).toDF("a_b", "a.c")
-    val df1 = df.drop("a_b")
-    checkAnswer(df1, Row(2))
-    assert(df1.schema.map(_.name) === Seq("a.c"))
+  test("SPARK-16664: persist with more than 200 columns") {
+    val size = 201L
+    val rdd = sparkContext.makeRDD(Seq(Row.fromSeq(Seq.range(0, size))))
+    val schemas = List.range(0, size).map(a => StructField("name" + a, LongType, true))
+    val df = spark.createDataFrame(rdd, StructType(schemas), false)
+    assert(df.persist.take(1).apply(0).toSeq(100).asInstanceOf[Long] == 100)
   }
-
-  test("SPARK-14759: drop column ") {
-    val df1 = sqlContext.createDataFrame(Seq((1, 2), (3, 4))).toDF("any", "hour")
-    val df2 = sqlContext.createDataFrame(Seq((1, 3))).toDF("any").withColumn("hour", lit(10))
-    val j = df1.join(df2, $"df1.hour" === $"df2.hour", "left")
-    assert(j.schema.map(_.name) === Seq("any","hour","any","hour"))
-    print("Columns after join:{0}".format(j.columns))
-    val jj = j.drop($"df2.hour")
-    assert(jj.schema.map(_.name) === Seq("any"))
-    print("Columns after drop 'hour':{0}".format(jj.columns))
-  }
-
 }