forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-14426][SQL] Merge PerserUtils and ParseUtils
## What changes were proposed in this pull request? We have ParserUtils and ParseUtils which are both utility collections for use during the parsing process. Those names and what they are used for is very similar so I think we can merge them. Also, the original unescapeSQLString method may have a fault. When "\u0061" style character literals are passed to the method, it's not unescaped successfully. This patch fix the bug. ## How was this patch tested? Added a new test case. Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp> Closes apache#12199 from sarutak/merge-ParseUtils-and-ParserUtils.
- Loading branch information
Showing
5 changed files
with
144 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 0 additions & 135 deletions
135
sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/parser/ParseUtils.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ParserUtilsSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.spark.sql.catalyst.parser | ||
|
||
import org.apache.spark.SparkFunSuite | ||
|
||
class ParserUtilsSuite extends SparkFunSuite { | ||
|
||
import ParserUtils._ | ||
|
||
test("unescapeSQLString") { | ||
// scalastyle:off nonascii | ||
|
||
// String not including escaped characters and enclosed by double quotes. | ||
assert(unescapeSQLString(""""abcdefg"""") == "abcdefg") | ||
|
||
// String enclosed by single quotes. | ||
assert(unescapeSQLString("""'C0FFEE'""") == "C0FFEE") | ||
|
||
// Strings including single escaped characters. | ||
assert(unescapeSQLString("""'\0'""") == "\u0000") | ||
assert(unescapeSQLString(""""\'"""") == "\'") | ||
assert(unescapeSQLString("""'\"'""") == "\"") | ||
assert(unescapeSQLString(""""\b"""") == "\b") | ||
assert(unescapeSQLString("""'\n'""") == "\n") | ||
assert(unescapeSQLString(""""\r"""") == "\r") | ||
assert(unescapeSQLString("""'\t'""") == "\t") | ||
assert(unescapeSQLString(""""\Z"""") == "\u001A") | ||
assert(unescapeSQLString("""'\\'""") == "\\") | ||
assert(unescapeSQLString(""""\%"""") == "\\%") | ||
assert(unescapeSQLString("""'\_'""") == "\\_") | ||
|
||
// String including '\000' style literal characters. | ||
assert(unescapeSQLString("""'3 + 5 = \070'""") == "3 + 5 = \u0038") | ||
assert(unescapeSQLString(""""\000"""") == "\u0000") | ||
|
||
// String including invalid '\000' style literal characters. | ||
assert(unescapeSQLString(""""\256"""") == "256") | ||
|
||
// String including a '\u0000' style literal characters (\u732B is a cat in Kanji). | ||
assert(unescapeSQLString(""""How cute \u732B are"""") == "How cute \u732B are") | ||
|
||
// String including a surrogate pair character | ||
// (\uD867\uDE3D is Okhotsk atka mackerel in Kanji). | ||
assert(unescapeSQLString(""""\uD867\uDE3D is a fish"""") == "\uD867\uDE3D is a fish") | ||
|
||
// scalastyle:on nonascii | ||
} | ||
|
||
// TODO: Add test cases for other methods in ParserUtils | ||
} |