Fixed further more test cases

sarutak · sarutak · commit dd0ddbcba4bb · 2016-08-20T15:01:24.000+09:00
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/ExistenceJoinSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/ExistenceJoinSuite.scala
@@ -62,16 +62,16 @@ class ExistenceJoinSuite extends SparkPlanTest with SharedSQLContext {
       Row(6, null)
     )), new StructType().add("c", IntegerType).add("d", DoubleType))
 
-  private lazy val singleConditionEQ = (left.col("a") === right.col("c")).expr
+  private lazy val singleConditionEQ = (left.colInternal("a") === right.colInternal("c")).expr
 
   private lazy val composedConditionEQ = {
-    And((left.col("a") === right.col("c")).expr,
-      LessThan(left.col("b").expr, right.col("d").expr))
+    And((left.colInternal("a") === right.colInternal("c")).expr,
+      LessThan(left.colInternal("b").expr, right.colInternal("d").expr))
   }
 
   private lazy val composedConditionNEQ = {
-    And((left.col("a") < right.col("c")).expr,
-      LessThan(left.col("b").expr, right.col("d").expr))
+    And((left.colInternal("a") < right.colInternal("c")).expr,
+      LessThan(left.colInternal("b").expr, right.colInternal("d").expr))
   }
 
   // Note: the input dataframes and expression must be evaluated lazily because
@@ -252,6 +252,7 @@ class ExistenceJoinSuite extends SparkPlanTest with SharedSQLContext {
     LeftAnti,
     left,
     rightUniqueKey,
-    (left.col("a") === rightUniqueKey.col("c") && left.col("b") < rightUniqueKey.col("d")).expr,
+    (left.colInternal("a") === rightUniqueKey.colInternal("c") &&
+      left.colInternal("b") < rightUniqueKey.colInternal("d")).expr,
     Seq(Row(1, 2.0), Row(1, 2.0), Row(3, 3.0), Row(null, null), Row(null, 5.0), Row(6, null)))
 }
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/InnerJoinSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/InnerJoinSuite.scala
@@ -219,7 +219,7 @@ class InnerJoinSuite extends SparkPlanTest with SharedSQLContext {
     "inner join, one match per row",
     myUpperCaseData,
     myLowerCaseData,
-    () => (myUpperCaseData.col("N") === myLowerCaseData.col("n")).expr,
+    () => (myUpperCaseData.colInternal("N") === myLowerCaseData.colInternal("n")).expr,
     Seq(
       (1, "A", 1, "a"),
       (2, "B", 2, "b"),
@@ -235,7 +235,7 @@ class InnerJoinSuite extends SparkPlanTest with SharedSQLContext {
       "inner join, multiple matches",
       left,
       right,
-      () => (left.col("a") === right.col("a")).expr,
+      () => (left.colInternal("a") === right.colInternal("a")).expr,
       Seq(
         (1, 1, 1, 1),
         (1, 1, 1, 2),
@@ -252,7 +252,7 @@ class InnerJoinSuite extends SparkPlanTest with SharedSQLContext {
       "inner join, no matches",
       left,
       right,
-      () => (left.col("a") === right.col("a")).expr,
+      () => (left.colInternal("a") === right.colInternal("a")).expr,
       Seq.empty
     )
   }
@@ -264,7 +264,7 @@ class InnerJoinSuite extends SparkPlanTest with SharedSQLContext {
       "inner join, null safe",
       left,
       right,
-      () => (left.col("b") <=> right.col("b")).expr,
+      () => (left.colInternal("b") <=> right.colInternal("b")).expr,
       Seq(
         (1, 0, 1, 0),
         (2, null, 2, null)
@@ -280,7 +280,7 @@ class InnerJoinSuite extends SparkPlanTest with SharedSQLContext {
       "SPARK-15822 - test structs as keys",
       left,
       right,
-      () => (left.col("key") === right.col("key")).expr,
+      () => (left.colInternal("key") === right.colInternal("key")).expr,
       Seq(
         (Row(0, 0), "L0", Row(0, 0), "R0"),
         (Row(1, 1), "L1", Row(1, 1), "R1"),
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/OuterJoinSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/OuterJoinSuite.scala
@@ -57,8 +57,8 @@ class OuterJoinSuite extends SparkPlanTest with SharedSQLContext {
     )), new StructType().add("c", IntegerType).add("d", DoubleType))
 
   private lazy val condition = {
-    And((left.col("a") === right.col("c")).expr,
-      LessThan(left.col("b").expr, right.col("d").expr))
+    And((left.colInternal("a") === right.colInternal("c")).expr,
+      LessThan(left.colInternal("b").expr, right.colInternal("d").expr))
   }
 
   // Note: the input dataframes and expression must be evaluated lazily because

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ class OuterJoinSuite extends SparkPlanTest with SharedSQLContext {`
`57`	`57`	`)), new StructType().add("c", IntegerType).add("d", DoubleType))`
`58`	`58`
`59`	`59`	`private lazy val condition = {`
`60`		`- And((left.col("a") === right.col("c")).expr,`
`61`		`- LessThan(left.col("b").expr, right.col("d").expr))`
	`60`	`+ And((left.colInternal("a") === right.colInternal("c")).expr,`
	`61`	`+ LessThan(left.colInternal("b").expr, right.colInternal("d").expr))`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Note: the input dataframes and expression must be evaluated lazily because`