spark git commit: [SPARK-6337][Documentation, SQL]Spark 1.3 doc fixes
Repository: spark
Updated Branches:
refs/heads/branch-1.3 3ba295fa0 - 857e8a60e
[SPARK-6337][Documentation, SQL]Spark 1.3 doc fixes
Author: vinodkc vinod.kc...@gmail.com
Closes #5112 from vinodkc/spark_1.3_doc_fixes and squashes the following
commits:
2c6aee6 [vinodkc] Spark 1.3 doc fixes
(cherry picked from commit 2bf40c58e6e89e061783c999204107069df17f73)
Signed-off-by: Sean Owen so...@cloudera.com
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/857e8a60
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/857e8a60
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/857e8a60
Branch: refs/heads/branch-1.3
Commit: 857e8a60ed43881ecb27d2e5c33915a8d128b6e8
Parents: 3ba295f
Author: vinodkc vinod.kc...@gmail.com
Authored: Sun Mar 22 20:00:08 2015 +
Committer: Sean Owen so...@cloudera.com
Committed: Sun Mar 22 20:00:19 2015 +
--
docs/sql-programming-guide.md| 7 +--
mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala | 2 +-
sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/857e8a60/docs/sql-programming-guide.md
--
diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index a7d3574..6a333fd 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -509,8 +509,11 @@ val people =
sc.textFile(examples/src/main/resources/people.txt)
// The schema is encoded in a string
val schemaString = name age
-// Import Spark SQL data types and Row.
-import org.apache.spark.sql._
+// Import Row.
+import org.apache.spark.sql.Row;
+
+// Import Spark SQL data types
+import org.apache.spark.sql.types.{StructType,StructField,StringType};
// Generate the schema based on the string of schema
val schema =
http://git-wip-us.apache.org/repos/asf/spark/blob/857e8a60/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
--
diff --git a/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
b/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
index 5bbcd2e..c4a3610 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
@@ -33,7 +33,7 @@ import org.apache.spark.sql.types.StructType
abstract class PipelineStage extends Serializable with Logging {
/**
- * :: DeveloperAPI ::
+ * :: DeveloperApi ::
*
* Derives the output schema from the input schema and parameters.
* The schema describes the columns and types of the data.
http://git-wip-us.apache.org/repos/asf/spark/blob/857e8a60/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
--
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
index 8b8f86c..5aece16 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
@@ -89,7 +89,7 @@ private[sql] object DataFrame {
* val people = sqlContext.parquetFile(...)
* val department = sqlContext.parquetFile(...)
*
- * people.filter(age 30)
+ * people.filter(age 30)
* .join(department, people(deptId) === department(id))
* .groupBy(department(name), gender)
* .agg(avg(people(salary)), max(people(age)))
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-6337][Documentation, SQL]Spark 1.3 doc fixes
Repository: spark
Updated Branches:
refs/heads/master 7a0da4770 - 2bf40c58e
[SPARK-6337][Documentation, SQL]Spark 1.3 doc fixes
Author: vinodkc vinod.kc...@gmail.com
Closes #5112 from vinodkc/spark_1.3_doc_fixes and squashes the following
commits:
2c6aee6 [vinodkc] Spark 1.3 doc fixes
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2bf40c58
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2bf40c58
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2bf40c58
Branch: refs/heads/master
Commit: 2bf40c58e6e89e061783c999204107069df17f73
Parents: 7a0da47
Author: vinodkc vinod.kc...@gmail.com
Authored: Sun Mar 22 20:00:08 2015 +
Committer: Sean Owen so...@cloudera.com
Committed: Sun Mar 22 20:00:08 2015 +
--
docs/sql-programming-guide.md| 7 +--
mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala | 2 +-
sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/2bf40c58/docs/sql-programming-guide.md
--
diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index a7d3574..6a333fd 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -509,8 +509,11 @@ val people =
sc.textFile(examples/src/main/resources/people.txt)
// The schema is encoded in a string
val schemaString = name age
-// Import Spark SQL data types and Row.
-import org.apache.spark.sql._
+// Import Row.
+import org.apache.spark.sql.Row;
+
+// Import Spark SQL data types
+import org.apache.spark.sql.types.{StructType,StructField,StringType};
// Generate the schema based on the string of schema
val schema =
http://git-wip-us.apache.org/repos/asf/spark/blob/2bf40c58/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
--
diff --git a/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
b/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
index 5bbcd2e..c4a3610 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/Pipeline.scala
@@ -33,7 +33,7 @@ import org.apache.spark.sql.types.StructType
abstract class PipelineStage extends Serializable with Logging {
/**
- * :: DeveloperAPI ::
+ * :: DeveloperApi ::
*
* Derives the output schema from the input schema and parameters.
* The schema describes the columns and types of the data.
http://git-wip-us.apache.org/repos/asf/spark/blob/2bf40c58/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
--
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
index 8b8f86c..5aece16 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala
@@ -89,7 +89,7 @@ private[sql] object DataFrame {
* val people = sqlContext.parquetFile(...)
* val department = sqlContext.parquetFile(...)
*
- * people.filter(age 30)
+ * people.filter(age 30)
* .join(department, people(deptId) === department(id))
* .groupBy(department(name), gender)
* .agg(avg(people(salary)), max(people(age)))
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
