Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FLINK-17965][sql-parser-hive] Hive dialect needs to unescape backslash in string literals #12378

Merged
merged 5 commits into from Jun 11, 2020

Conversation

lirui-apache
Copy link
Contributor

What is the purpose of the change

HiveQL supports escaping by backslash. But SQL CLI will escape backslashes in its input. Therefore hive dialect needs to unescape it.

Brief change log

  • Do the unescape in these places: DB/table/view comments, DB/table/view properties, table SerDe properties, table row format delimiters, partition specs.
  • Fix an issue of unparse ALTER TABLE PROPERTY, and add test case
  • Fix an issue of setting table field terminator, add update test case.

Verifying this change

I have manually verified the test cases (except view tests due to FLINK-17113) in HiveDialectTest via SQL CLI. But cannot add new tests for them since we don't have E2E tests for hive connector.

Does this pull request potentially affect one of the following parts:

  • Dependencies (does it add or upgrade a dependency): no
  • The public API, i.e., is any changed class annotated with @Public(Evolving): no
  • The serializers: no
  • The runtime per-record code paths (performance sensitive): no
  • Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Kubernetes/Yarn/Mesos, ZooKeeper: no
  • The S3 file system connector: no

Documentation

  • Does this pull request introduce a new feature? yes
  • If yes, how is the feature documented? docs

@flinkbot
Copy link
Collaborator

Thanks a lot for your contribution to the Apache Flink project. I'm the @flinkbot. I help the community
to review your pull request. We will use this comment to track the progress of the review.

Automated Checks

Last check on commit 54651d2 (Thu May 28 11:24:06 UTC 2020)

Warnings:

  • No documentation files were touched! Remember to keep the Flink docs up to date!
  • This pull request references an unassigned Jira ticket. According to the code contribution guide, tickets need to be assigned before starting with the implementation work.

Mention the bot in a comment to re-run the automated checks.

Review Progress

  • ❓ 1. The [description] looks good.
  • ❓ 2. There is [consensus] that the contribution should go into to Flink.
  • ❓ 3. Needs [attention] from.
  • ❓ 4. The change fits into the overall [architecture].
  • ❓ 5. Overall code [quality] is good.

Please see the Pull Request Review Guide for a full explanation of the review process.


The Bot is tracking the review progress through labels. Labels are applied according to the order of the review items. For consensus, approval by a Flink committer of PMC member is required Bot commands
The @flinkbot bot supports the following commands:

  • @flinkbot approve description to approve one or more aspects (aspects: description, consensus, architecture and quality)
  • @flinkbot approve all to approve all aspects
  • @flinkbot approve-until architecture to approve everything until architecture
  • @flinkbot attention @username1 [@username2 ..] to require somebody's attention
  • @flinkbot disapprove architecture to remove an approval you gave earlier

@flinkbot
Copy link
Collaborator

flinkbot commented May 28, 2020

CI report:

Bot commands The @flinkbot bot supports the following commands:
  • @flinkbot run travis re-run the last Travis build
  • @flinkbot run azure re-run the last Azure build

public static SqlTableOption unescapeTableOption(SqlTableOption option) {
String key = StringEscapeUtils.unescapeJava(option.getKeyString());
String val = StringEscapeUtils.unescapeJava(option.getValueString());
SqlNode keyNode = SqlLiteral.createCharString(key, option.getKey().getParserPosition());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we only need to unescape the option value.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both key and value can have special characters in Hive.


public static void unescapePartitionSpec(SqlNodeList partSpec) {
if (partSpec != null) {
for (int i = 0; i < partSpec.size(); i++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you try SqlShuttle ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have changed to use SqlShuttle

Copy link
Contributor

@JingsongLi JingsongLi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@JingsongLi JingsongLi merged commit 6f06e3d into apache:master Jun 11, 2020
@lirui-apache lirui-apache deleted the FLINK-17965 branch June 11, 2020 06:47
JingsongLi pushed a commit that referenced this pull request Jun 11, 2020
nicusX pushed a commit to nicusX/flink that referenced this pull request Jun 13, 2020
zhangjun0x01 pushed a commit to zhangjun0x01/flink that referenced this pull request Jul 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants