You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/05/15 02:59:18 UTC
git commit: [SPARK-1826] fix the head notation of package object dsl
Repository: spark
Updated Branches:
refs/heads/master 9ad096d55 -> 44165fc91
[SPARK-1826] fix the head notation of package object dsl
Author: wangfei <sc...@yeah.net>
Closes #765 from scwf/dslfix and squashes the following commits:
d2d1a9d [wangfei] Update package.scala
66ff53b [wangfei] fix the head notation of package object dsl
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/44165fc9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/44165fc9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/44165fc9
Branch: refs/heads/master
Commit: 44165fc91a31e6293a79031c89571e139d2c5356
Parents: 9ad096d
Author: wangfei <sc...@yeah.net>
Authored: Wed May 14 17:59:11 2014 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Wed May 14 17:59:11 2014 -0700
----------------------------------------------------------------------
.../apache/spark/sql/catalyst/dsl/package.scala | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/44165fc9/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
index 78d3a1d..3cf163f 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
@@ -31,26 +31,29 @@ import org.apache.spark.sql.catalyst.types._
* A collection of implicit conversions that create a DSL for constructing catalyst data structures.
*
* {{{
- * scala> import catalyst.dsl._
+ * scala> import org.apache.spark.sql.catalyst.dsl.expressions._
*
* // Standard operators are added to expressions.
+ * scala> import org.apache.spark.sql.catalyst.expressions.Literal
* scala> Literal(1) + Literal(1)
- * res1: catalyst.expressions.Add = (1 + 1)
+ * res0: org.apache.spark.sql.catalyst.expressions.Add = (1 + 1)
*
* // There is a conversion from 'symbols to unresolved attributes.
* scala> 'a.attr
- * res2: catalyst.analysis.UnresolvedAttribute = 'a
+ * res1: org.apache.spark.sql.catalyst.analysis.UnresolvedAttribute = 'a
*
* // These unresolved attributes can be used to create more complicated expressions.
* scala> 'a === 'b
- * res3: catalyst.expressions.Equals = ('a = 'b)
+ * res2: org.apache.spark.sql.catalyst.expressions.Equals = ('a = 'b)
*
* // SQL verbs can be used to construct logical query plans.
- * scala> TestRelation('key.int, 'value.string).where('key === 1).select('value).analyze
- * res4: catalyst.plans.logical.LogicalPlan =
- * Project {value#1}
- * Filter (key#0 = 1)
- * TestRelation {key#0,value#1}
+ * scala> import org.apache.spark.sql.catalyst.plans.logical._
+ * scala> import org.apache.spark.sql.catalyst.dsl.plans._
+ * scala> LocalRelation('key.int, 'value.string).where('key === 1).select('value).analyze
+ * res3: org.apache.spark.sql.catalyst.plans.logical.LogicalPlan =
+ * Project [value#3]
+ * Filter (key#2 = 1)
+ * LocalRelation [key#2,value#3], []
* }}}
*/
package object dsl {