Merge pull request #1 from peerside/peerside-patch-1

Updated comments use correct sample code for Dataframe joins
rekhajoshm · Mar 2, 2015 · ebc1efa · ebc1efa
2 parents 3f00bb3 + e353340
commit ebc1efa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
@@ -337,11 +337,11 @@ class DataFrame protected[sql](
    * {{{
    *   // Scala:
    *   import org.apache.spark.sql.functions._
-   *   df1.join(df2, "outer", $"df1Key" === $"df2Key")
+   *   df1.join(df2, $"df1Key" === $"df2Key", "outer")
    *
    *   // Java:
    *   import static org.apache.spark.sql.functions.*;
-   *   df1.join(df2, "outer", col("df1Key") === col("df2Key"));
+   *   df1.join(df2, col("df1Key") === col("df2Key"), "outer");
    * }}}
    *
    * @param right Right side of the join.