You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2018/01/23 12:36:25 UTC
spark git commit: [SPARK-20749][SQL][FOLLOW-UP] Override prettyName
for bit_length and octet_length
Repository: spark
Updated Branches:
refs/heads/master 96cb60bc3 -> ee572ba8c
[SPARK-20749][SQL][FOLLOW-UP] Override prettyName for bit_length and octet_length
## What changes were proposed in this pull request?
We need to override the prettyName for bit_length and octet_length for getting the expected auto-generated alias name.
## How was this patch tested?
The existing tests
Author: gatorsmile <ga...@gmail.com>
Closes #20358 from gatorsmile/test2.3More.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ee572ba8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ee572ba8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ee572ba8
Branch: refs/heads/master
Commit: ee572ba8c1339d21c592001ec4f7f270005ff1cf
Parents: 96cb60b
Author: gatorsmile <ga...@gmail.com>
Authored: Tue Jan 23 21:36:20 2018 +0900
Committer: hyukjinkwon <gu...@gmail.com>
Committed: Tue Jan 23 21:36:20 2018 +0900
----------------------------------------------------------------------
.../apache/spark/sql/catalyst/parser/SqlBase.g4 | 2 +-
.../expressions/stringExpressions.scala | 4 ++
.../sql-tests/results/operators.sql.out | 4 +-
.../scalar-subquery-predicate.sql.out | 45 ++++++++++----------
4 files changed, 30 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ee572ba8/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 b/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
index 39d5e4e..5fa75fe 100644
--- a/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
+++ b/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
@@ -141,7 +141,7 @@ statement
(LIKE? pattern=STRING)? #showTables
| SHOW TABLE EXTENDED ((FROM | IN) db=identifier)?
LIKE pattern=STRING partitionSpec? #showTable
- | SHOW DATABASES (LIKE? pattern=STRING)? #showDatabases
+ | SHOW DATABASES (LIKE? pattern=STRING)? #showDatabases
| SHOW TBLPROPERTIES table=tableIdentifier
('(' key=tablePropertyKey ')')? #showTblProperties
| SHOW COLUMNS (FROM | IN) tableIdentifier
http://git-wip-us.apache.org/repos/asf/spark/blob/ee572ba8/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
index e004bfc..5cf783f 100755
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
@@ -1708,6 +1708,8 @@ case class BitLength(child: Expression) extends UnaryExpression with ImplicitCas
case BinaryType => defineCodeGen(ctx, ev, c => s"($c).length * 8")
}
}
+
+ override def prettyName: String = "bit_length"
}
/**
@@ -1735,6 +1737,8 @@ case class OctetLength(child: Expression) extends UnaryExpression with ImplicitC
case BinaryType => defineCodeGen(ctx, ev, c => s"($c).length")
}
}
+
+ override def prettyName: String = "octet_length"
}
/**
http://git-wip-us.apache.org/repos/asf/spark/blob/ee572ba8/sql/core/src/test/resources/sql-tests/results/operators.sql.out
----------------------------------------------------------------------
diff --git a/sql/core/src/test/resources/sql-tests/results/operators.sql.out b/sql/core/src/test/resources/sql-tests/results/operators.sql.out
index 237b618..840655b 100644
--- a/sql/core/src/test/resources/sql-tests/results/operators.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/operators.sql.out
@@ -425,7 +425,7 @@ struct<(7 % 2):int,(7 % 0):int,(0 % 2):int,(7 % CAST(NULL AS INT)):int,(CAST(NUL
-- !query 51
select BIT_LENGTH('abc')
-- !query 51 schema
-struct<bitlength(abc):int>
+struct<bit_length(abc):int>
-- !query 51 output
24
@@ -449,7 +449,7 @@ struct<length(abc):int>
-- !query 54
select OCTET_LENGTH('abc')
-- !query 54 schema
-struct<octetlength(abc):int>
+struct<octet_length(abc):int>
-- !query 54 output
3
http://git-wip-us.apache.org/repos/asf/spark/blob/ee572ba8/sql/core/src/test/resources/sql-tests/results/subquery/scalar-subquery/scalar-subquery-predicate.sql.out
----------------------------------------------------------------------
diff --git a/sql/core/src/test/resources/sql-tests/results/subquery/scalar-subquery/scalar-subquery-predicate.sql.out b/sql/core/src/test/resources/sql-tests/results/subquery/scalar-subquery/scalar-subquery-predicate.sql.out
index a2b86db..dd82efb 100644
--- a/sql/core/src/test/resources/sql-tests/results/subquery/scalar-subquery/scalar-subquery-predicate.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/subquery/scalar-subquery/scalar-subquery-predicate.sql.out
@@ -1,5 +1,5 @@
-- Automatically generated by SQLQueryTestSuite
--- Number of queries: 29
+-- Number of queries: 27
-- !query 0
@@ -307,7 +307,8 @@ struct<t1a:string>
val1c
val1d
--- !query 22
+
+-- !query 20
SELECT count(t1a)
FROM t1 RIGHT JOIN t2
ON t1d = t2d
@@ -315,13 +316,13 @@ WHERE t1a < (SELECT max(t2a)
FROM t2
WHERE t2c = t1c
GROUP BY t2c)
--- !query 22 schema
+-- !query 20 schema
struct<count(t1a):bigint>
--- !query 22 output
+-- !query 20 output
7
--- !query 23
+-- !query 21
SELECT t1a
FROM t1
WHERE t1b <= (SELECT max(t2b)
@@ -332,14 +333,14 @@ AND t1b >= (SELECT min(t2b)
FROM t2
WHERE t2c = t1c
GROUP BY t2c)
--- !query 23 schema
+-- !query 21 schema
struct<t1a:string>
--- !query 23 output
+-- !query 21 output
val1b
val1c
--- !query 24
+-- !query 22
SELECT t1a
FROM t1
WHERE t1a <= (SELECT max(t2a)
@@ -353,14 +354,14 @@ WHERE t1a >= (SELECT min(t2a)
FROM t2
WHERE t2c = t1c
GROUP BY t2c)
--- !query 24 schema
+-- !query 22 schema
struct<t1a:string>
--- !query 24 output
+-- !query 22 output
val1b
val1c
--- !query 25
+-- !query 23
SELECT t1a
FROM t1
WHERE t1a <= (SELECT max(t2a)
@@ -374,9 +375,9 @@ WHERE t1a >= (SELECT min(t2a)
FROM t2
WHERE t2c = t1c
GROUP BY t2c)
--- !query 25 schema
+-- !query 23 schema
struct<t1a:string>
--- !query 25 output
+-- !query 23 output
val1a
val1a
val1b
@@ -387,7 +388,7 @@ val1d
val1d
--- !query 26
+-- !query 24
SELECT t1a
FROM t1
WHERE t1a <= (SELECT max(t2a)
@@ -401,16 +402,16 @@ WHERE t1a >= (SELECT min(t2a)
FROM t2
WHERE t2c = t1c
GROUP BY t2c)
--- !query 26 schema
+-- !query 24 schema
struct<t1a:string>
--- !query 26 output
+-- !query 24 output
val1a
val1b
val1c
val1d
--- !query 27
+-- !query 25
SELECT t1a
FROM t1
WHERE t1a <= (SELECT max(t2a)
@@ -424,13 +425,13 @@ WHERE t1a >= (SELECT min(t2a)
FROM t2
WHERE t2c = t1c
GROUP BY t2c)
--- !query 27 schema
+-- !query 25 schema
struct<t1a:string>
--- !query 27 output
+-- !query 25 output
val1a
--- !query 28
+-- !query 26
SELECT t1a
FROM t1
GROUP BY t1a, t1c
@@ -438,8 +439,8 @@ HAVING max(t1b) <= (SELECT max(t2b)
FROM t2
WHERE t2c = t1c
GROUP BY t2c)
--- !query 28 schema
+-- !query 26 schema
struct<t1a:string>
--- !query 28 output
+-- !query 26 output
val1b
val1c
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org