Skip to content

Commit 2bf40c5

Browse files
vinodkcsrowen
authored andcommitted
[SPARK-6337][Documentation, SQL]Spark 1.3 doc fixes
Author: vinodkc <[email protected]> Closes apache#5112 from vinodkc/spark_1.3_doc_fixes and squashes the following commits: 2c6aee6 [vinodkc] Spark 1.3 doc fixes
1 parent 7a0da47 commit 2bf40c5

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

docs/sql-programming-guide.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,11 @@ val people = sc.textFile("examples/src/main/resources/people.txt")
509509
// The schema is encoded in a string
510510
val schemaString = "name age"
511511

512-
// Import Spark SQL data types and Row.
513-
import org.apache.spark.sql._
512+
// Import Row.
513+
import org.apache.spark.sql.Row;
514+
515+
// Import Spark SQL data types
516+
import org.apache.spark.sql.types.{StructType,StructField,StringType};
514517

515518
// Generate the schema based on the string of schema
516519
val schema =

mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import org.apache.spark.sql.types.StructType
3333
abstract class PipelineStage extends Serializable with Logging {
3434

3535
/**
36-
* :: DeveloperAPI ::
36+
* :: DeveloperApi ::
3737
*
3838
* Derives the output schema from the input schema and parameters.
3939
* The schema describes the columns and types of the data.

sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private[sql] object DataFrame {
8989
* val people = sqlContext.parquetFile("...")
9090
* val department = sqlContext.parquetFile("...")
9191
*
92-
* people.filter("age" > 30)
92+
* people.filter("age > 30")
9393
* .join(department, people("deptId") === department("id"))
9494
* .groupBy(department("name"), "gender")
9595
* .agg(avg(people("salary")), max(people("age")))

0 commit comments

Comments
 (0)