Skip to content

Commit c5fb514

Browse files
author
Davies Liu
committed
rename
1 parent 8c6d82d commit c5fb514

File tree

10 files changed

+54
-55
lines changed

10 files changed

+54
-55
lines changed

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BoundAttribute.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package org.apache.spark.sql.catalyst.expressions
1919

2020
import org.apache.spark.Logging
2121
import org.apache.spark.sql.catalyst.errors.attachTree
22-
import org.apache.spark.sql.catalyst.expressions.codegen.{EvaluatedExpression, Code, CodeGenContext}
22+
import org.apache.spark.sql.catalyst.expressions.codegen.{GeneratedExpressionCode, Code, CodeGenContext}
2323
import org.apache.spark.sql.types._
2424
import org.apache.spark.sql.catalyst.trees
2525

@@ -43,7 +43,7 @@ case class BoundReference(ordinal: Int, dataType: DataType, nullable: Boolean)
4343

4444
override def exprId: ExprId = throw new UnsupportedOperationException
4545

46-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
46+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
4747
s"""
4848
final boolean ${ev.nullTerm} = i.isNullAt($ordinal);
4949
final ${ctx.primitiveType(dataType)} ${ev.primitiveTerm} = ${ev.nullTerm} ?

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import java.sql.{Date, Timestamp}
2121
import java.text.{DateFormat, SimpleDateFormat}
2222

2323
import org.apache.spark.Logging
24-
import org.apache.spark.sql.catalyst.expressions.codegen.{EvaluatedExpression, Code, CodeGenContext}
24+
import org.apache.spark.sql.catalyst.expressions.codegen.{GeneratedExpressionCode, Code, CodeGenContext}
2525
import org.apache.spark.sql.catalyst.util.DateUtils
2626
import org.apache.spark.sql.types._
2727

@@ -435,15 +435,15 @@ case class Cast(child: Expression, dataType: DataType) extends UnaryExpression w
435435
if (evaluated == null) null else cast(evaluated)
436436
}
437437

438-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = this match {
438+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = this match {
439439

440440
case Cast(child @ BinaryType(), StringType) =>
441441
castOrNull (ctx, ev, c =>
442-
s"new org.apache.spark.sql.types.UTF8String().set($c)")
442+
s"new ${ctx.stringType}().set($c)")
443443

444444
case Cast(child @ DateType(), StringType) =>
445445
castOrNull(ctx, ev, c =>
446-
s"""new org.apache.spark.sql.types.UTF8String().set(
446+
s"""new ${ctx.stringType}().set(
447447
org.apache.spark.sql.catalyst.util.DateUtils.toString($c))""")
448448

449449
case Cast(child @ BooleanType(), dt: NumericType) if !dt.isInstanceOf[DecimalType] =>
@@ -462,7 +462,7 @@ case class Cast(child: Expression, dataType: DataType) extends UnaryExpression w
462462
// does not match the expected output.
463463
case Cast(e, StringType) if e.dataType != TimestampType =>
464464
castOrNull(ctx, ev, c =>
465-
s"new org.apache.spark.sql.types.UTF8String().set(String.valueOf($c))")
465+
s"new ${ctx.stringType}().set(String.valueOf($c))")
466466

467467
case other =>
468468
super.genCode(ctx, ev)

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.spark.sql.catalyst.expressions
1919

2020
import org.apache.spark.sql.catalyst.analysis.{TypeCheckResult, UnresolvedAttribute}
21-
import org.apache.spark.sql.catalyst.expressions.codegen.{EvaluatedExpression, Code, CodeGenContext}
21+
import org.apache.spark.sql.catalyst.expressions.codegen.{GeneratedExpressionCode, Code, CodeGenContext}
2222
import org.apache.spark.sql.catalyst.trees
2323
import org.apache.spark.sql.catalyst.trees.TreeNode
2424
import org.apache.spark.sql.types._
@@ -53,17 +53,17 @@ abstract class Expression extends TreeNode[Expression] {
5353
def eval(input: Row = null): Any
5454

5555
/**
56-
* Returns an [[EvaluatedExpression]], which contains Java source code that
56+
* Returns an [[GeneratedExpressionCode]], which contains Java source code that
5757
* can be used to generate the result of evaluating the expression on an input row.
58-
*
58+
*
5959
* @param ctx a [[CodeGenContext]]
60-
* @return [[EvaluatedExpression]]
60+
* @return [[GeneratedExpressionCode]]
6161
*/
62-
def gen(ctx: CodeGenContext): EvaluatedExpression = {
62+
def gen(ctx: CodeGenContext): GeneratedExpressionCode = {
6363
val nullTerm = ctx.freshName("nullTerm")
6464
val primitiveTerm = ctx.freshName("primitiveTerm")
6565
val objectTerm = ctx.freshName("objectTerm")
66-
val ve = EvaluatedExpression("", nullTerm, primitiveTerm, objectTerm)
66+
val ve = GeneratedExpressionCode("", nullTerm, primitiveTerm, objectTerm)
6767
ve.code = genCode(ctx, ve)
6868
ve
6969
}
@@ -72,10 +72,10 @@ abstract class Expression extends TreeNode[Expression] {
7272
* Returns Java source code for this expression.
7373
*
7474
* @param ctx a [[CodeGenContext]]
75-
* @param ev an [[EvaluatedExpression]] with unique terms.
75+
* @param ev an [[GeneratedExpressionCode]] with unique terms.
7676
* @return Java source code
7777
*/
78-
def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
78+
def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
7979
val e = this.asInstanceOf[Expression]
8080
ctx.references += e
8181
s"""
@@ -164,7 +164,7 @@ abstract class BinaryExpression extends Expression with trees.BinaryNode[Express
164164
* @param f a function from two primitive term names to a tree that evaluates them.
165165
*/
166166
def evaluate(ctx: CodeGenContext,
167-
ev: EvaluatedExpression,
167+
ev: GeneratedExpressionCode,
168168
f: (String, String) => String): String = {
169169
// TODO: Right now some timestamp tests fail if we enforce this...
170170
if (left.dataType != right.dataType) {
@@ -198,7 +198,7 @@ abstract class LeafExpression extends Expression with trees.LeafNode[Expression]
198198
abstract class UnaryExpression extends Expression with trees.UnaryNode[Expression] {
199199
self: Product =>
200200
def castOrNull(ctx: CodeGenContext,
201-
ev: EvaluatedExpression,
201+
ev: GeneratedExpressionCode,
202202
f: String => String): String = {
203203
val eval = child.gen(ctx)
204204
eval.code + s"""

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.spark.sql.catalyst.expressions
1919

2020
import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
21-
import org.apache.spark.sql.catalyst.expressions.codegen.{Code, EvaluatedExpression, CodeGenContext}
21+
import org.apache.spark.sql.catalyst.expressions.codegen.{Code, GeneratedExpressionCode, CodeGenContext}
2222
import org.apache.spark.sql.catalyst.util.TypeUtils
2323
import org.apache.spark.sql.types._
2424

@@ -117,7 +117,7 @@ abstract class BinaryArithmetic extends BinaryExpression {
117117
}
118118
}
119119

120-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
120+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
121121
if (left.dataType.isInstanceOf[DecimalType]) {
122122
evaluate(ctx, ev, { case (eval1, eval2) => s"$eval1.$decimalMethod($eval2)" } )
123123
} else {
@@ -205,7 +205,7 @@ case class Divide(left: Expression, right: Expression) extends BinaryArithmetic
205205
}
206206
}
207207

208-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
208+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
209209
val eval1 = left.gen(ctx)
210210
val eval2 = right.gen(ctx)
211211
val test = if (left.dataType.isInstanceOf[DecimalType]) {
@@ -263,7 +263,7 @@ case class Remainder(left: Expression, right: Expression) extends BinaryArithmet
263263
}
264264
}
265265

266-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
266+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
267267
val eval1 = left.gen(ctx)
268268
val eval2 = right.gen(ctx)
269269
val test = if (left.dataType.isInstanceOf[DecimalType]) {
@@ -406,7 +406,7 @@ case class MaxOf(left: Expression, right: Expression) extends BinaryArithmetic {
406406
}
407407
}
408408

409-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
409+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
410410
if (ctx.isNativeType(left.dataType)) {
411411
val eval1 = left.gen(ctx)
412412
val eval2 = right.gen(ctx)
@@ -460,7 +460,7 @@ case class MinOf(left: Expression, right: Expression) extends BinaryArithmetic {
460460
}
461461
}
462462

463-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
463+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
464464
if (ctx.isNativeType(left.dataType)) {
465465

466466
val eval1 = left.gen(ctx)

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class LongHashSet extends org.apache.spark.util.collection.OpenHashSet[Long]
4141
* valid if `nullTerm` is set to `true`.
4242
* @param objectTerm A possibly boxed version of the result of evaluating this expression.
4343
*/
44-
case class EvaluatedExpression(var code: Code,
45-
nullTerm: Term,
46-
primitiveTerm: Term,
47-
objectTerm: Term)
44+
case class GeneratedExpressionCode(var code: Code,
45+
nullTerm: Term,
46+
primitiveTerm: Term,
47+
objectTerm: Term)
4848

4949
/**
5050
* A context for codegen, which is used to bookkeeping the expressions those are not supported
@@ -58,8 +58,8 @@ class CodeGenContext {
5858
*/
5959
val references: Seq[Expression] = new mutable.ArrayBuffer[Expression]()
6060

61-
protected val stringType = classOf[UTF8String].getName
62-
protected val decimalType = classOf[Decimal].getName
61+
val stringType = classOf[UTF8String].getName
62+
val decimalType = classOf[Decimal].getName
6363

6464
private val curId = new java.util.concurrent.atomic.AtomicInteger()
6565

@@ -75,7 +75,7 @@ class CodeGenContext {
7575

7676
def getColumn(dataType: DataType, ordinal: Int): Code = {
7777
dataType match {
78-
case StringType => s"(org.apache.spark.sql.types.UTF8String)i.apply($ordinal)"
78+
case StringType => s"($stringType)i.apply($ordinal)"
7979
case dt: DataType if isNativeType(dt) => s"i.${accessorForType(dt)}($ordinal)"
8080
case _ => s"(${boxedType(dataType)})i.apply($ordinal)"
8181
}

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/decimalFunctions.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.spark.sql.catalyst.expressions
1919

20-
import org.apache.spark.sql.catalyst.expressions.codegen.{EvaluatedExpression, Code, CodeGenContext}
20+
import org.apache.spark.sql.catalyst.expressions.codegen.{GeneratedExpressionCode, Code, CodeGenContext}
2121
import org.apache.spark.sql.types._
2222

2323
/** Return the unscaled Long value of a Decimal, assuming it fits in a Long */
@@ -37,7 +37,7 @@ case class UnscaledValue(child: Expression) extends UnaryExpression {
3737
}
3838
}
3939

40-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
40+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
4141
val eval = child.gen(ctx)
4242
eval.code + s"""
4343
boolean ${ev.nullTerm} = ${eval.nullTerm};
@@ -63,7 +63,7 @@ case class MakeDecimal(child: Expression, precision: Int, scale: Int) extends Un
6363
}
6464
}
6565

66-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
66+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
6767
val eval = child.gen(ctx)
6868
eval.code + s"""
6969
boolean ${ev.nullTerm} = ${eval.nullTerm};

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package org.apache.spark.sql.catalyst.expressions
2020
import java.sql.{Date, Timestamp}
2121

2222
import org.apache.spark.sql.catalyst.CatalystTypeConverters
23-
import org.apache.spark.sql.catalyst.expressions.codegen.{Code, CodeGenContext, EvaluatedExpression}
23+
import org.apache.spark.sql.catalyst.expressions.codegen.{Code, CodeGenContext, GeneratedExpressionCode}
2424
import org.apache.spark.sql.catalyst.util.DateUtils
2525
import org.apache.spark.sql.types._
2626

@@ -81,7 +81,7 @@ case class Literal protected (value: Any, dataType: DataType) extends LeafExpres
8181

8282
override def eval(input: Row): Any = value
8383

84-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
84+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
8585
if (value == null) {
8686
s"""
8787
final boolean ${ev.nullTerm} = true;
@@ -94,8 +94,7 @@ case class Literal protected (value: Any, dataType: DataType) extends LeafExpres
9494
val arr = s"new byte[]{${v.getBytes.map(_.toString).mkString(", ")}}"
9595
s"""
9696
final boolean ${ev.nullTerm} = false;
97-
org.apache.spark.sql.types.UTF8String ${ev.primitiveTerm} =
98-
new org.apache.spark.sql.types.UTF8String().set(${arr});
97+
${ctx.stringType} ${ev.primitiveTerm} = new ${ctx.stringType}().set(${arr});
9998
"""
10099
case FloatType =>
101100
s"""

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/nullFunctions.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.spark.sql.catalyst.expressions
1919

20-
import org.apache.spark.sql.catalyst.expressions.codegen.{EvaluatedExpression, CodeGenContext}
20+
import org.apache.spark.sql.catalyst.expressions.codegen.{GeneratedExpressionCode, CodeGenContext}
2121
import org.apache.spark.sql.catalyst.trees
2222
import org.apache.spark.sql.catalyst.analysis.UnresolvedException
2323
import org.apache.spark.sql.types.DataType
@@ -53,7 +53,7 @@ case class Coalesce(children: Seq[Expression]) extends Expression {
5353
result
5454
}
5555

56-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
56+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
5757
s"""
5858
boolean ${ev.nullTerm} = true;
5959
${ctx.primitiveType(dataType)} ${ev.primitiveTerm} = ${ctx.defaultValue(dataType)};
@@ -81,7 +81,7 @@ case class IsNull(child: Expression) extends Predicate with trees.UnaryNode[Expr
8181
child.eval(input) == null
8282
}
8383

84-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
84+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
8585
val eval = child.gen(ctx)
8686
eval.code + s"""
8787
final boolean ${ev.nullTerm} = false;
@@ -101,7 +101,7 @@ case class IsNotNull(child: Expression) extends Predicate with trees.UnaryNode[E
101101
child.eval(input) != null
102102
}
103103

104-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
104+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
105105
val eval = child.gen(ctx)
106106
eval.code + s"""
107107
boolean ${ev.nullTerm} = false;
@@ -132,7 +132,7 @@ case class AtLeastNNonNulls(n: Int, children: Seq[Expression]) extends Predicate
132132
numNonNulls >= n
133133
}
134134

135-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
135+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
136136
val nonnull = ctx.freshName("nonnull")
137137
val code = children.map { e =>
138138
val eval = e.gen(ctx)

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package org.apache.spark.sql.catalyst.expressions
1919

2020
import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
2121
import org.apache.spark.sql.catalyst.util.TypeUtils
22-
import org.apache.spark.sql.catalyst.expressions.codegen.{EvaluatedExpression, Code, CodeGenContext}
22+
import org.apache.spark.sql.catalyst.expressions.codegen.{GeneratedExpressionCode, Code, CodeGenContext}
2323
import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
2424
import org.apache.spark.sql.types._
2525

@@ -84,7 +84,7 @@ case class Not(child: Expression) extends UnaryExpression with Predicate with Ex
8484
}
8585
}
8686

87-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
87+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
8888
castOrNull(ctx, ev, c => s"!($c)")
8989
}
9090
}
@@ -146,7 +146,7 @@ case class And(left: Expression, right: Expression)
146146
}
147147
}
148148
}
149-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
149+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
150150
val eval1 = left.gen(ctx)
151151
val eval2 = right.gen(ctx)
152152
s"""
@@ -192,7 +192,7 @@ case class Or(left: Expression, right: Expression)
192192
}
193193
}
194194
}
195-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
195+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
196196
val eval1 = left.gen(ctx)
197197
val eval2 = right.gen(ctx)
198198
s"""
@@ -218,7 +218,7 @@ case class Or(left: Expression, right: Expression)
218218

219219
abstract class BinaryComparison extends BinaryExpression with Predicate {
220220
self: Product =>
221-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
221+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
222222
left.dataType match {
223223
case dt: NumericType if ctx.isNativeType(dt) => evaluate (ctx, ev, {
224224
(c1, c3) => s"$c1 $symbol $c3"
@@ -276,7 +276,7 @@ case class EqualTo(left: Expression, right: Expression) extends BinaryComparison
276276
if (left.dataType != BinaryType) l == r
277277
else java.util.Arrays.equals(l.asInstanceOf[Array[Byte]], r.asInstanceOf[Array[Byte]])
278278
}
279-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
279+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
280280
evaluate(ctx, ev, ctx.equalFunc(left.dataType))
281281
}
282282
}
@@ -300,7 +300,7 @@ case class EqualNullSafe(left: Expression, right: Expression) extends BinaryComp
300300
}
301301
}
302302

303-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
303+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
304304
val eval1 = left.gen(ctx)
305305
val eval2 = right.gen(ctx)
306306
val equalCode = ctx.equalFunc(left.dataType)(eval1.primitiveTerm, eval2.primitiveTerm)
@@ -383,7 +383,7 @@ case class If(predicate: Expression, trueValue: Expression, falseValue: Expressi
383383
falseValue.eval(input)
384384
}
385385
}
386-
override def genCode(ctx: CodeGenContext, ev: EvaluatedExpression): Code = {
386+
override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): Code = {
387387
val condEval = predicate.gen(ctx)
388388
val trueEval = trueValue.gen(ctx)
389389
val falseEval = falseValue.gen(ctx)

0 commit comments

Comments
 (0)