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

[AIRFLOW-5727] SqoopHook: Build --connect parameter correctly when port/schema are not provided #6397

Merged
merged 1 commit into from
Oct 25, 2019

Conversation

Minutis
Copy link
Contributor

@Minutis Minutis commented Oct 23, 2019

Make sure you have checked all steps below.

Jira

  • [AIRFLOW-5727] My PR addresses the following Airflow Jira issues and references them in the PR title. For example, "[AIRFLOW-XXX] My Airflow PR"
    • https://issues.apache.org/jira/browse/AIRFLOW-5727
    • In case you are fixing a typo in the documentation you can prepend your commit with [AIRFLOW-XXX], code changes always need a Jira issue.
    • In case you are proposing a fundamental code change, you need to create an Airflow Improvement Proposal (AIP).
    • In case you are adding a dependency, check if the license complies with the ASF 3rd Party License Policy.

Description

  • Here are some details about my PR, including screenshots of any UI changes:

Tests

  • My PR adds the following unit tests OR does not need testing for this extremely good reason:

Commits

  • My commits all reference Jira issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "How to write a good git commit message":
    1. Subject is separated from body by a blank line
    2. Subject is limited to 50 characters (not including Jira issue reference)
    3. Subject does not end with a period
    4. Subject uses the imperative mood ("add", not "adding")
    5. Body wraps at 72 characters
    6. Body explains "what" and "why", not "how"

Documentation

  • In case of new functionality, my PR adds documentation that describes how to use it.
    • All the public functions and the classes in the PR contain docstrings that explain what it does
    • If you implement backwards incompatible changes, please leave a note in the Updating.md so we can assign it to a appropriate release

self.conn.port,
self.conn.schema
)]
connect_str = "{}".format(self.conn.host)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not just connect_str = self.conn.host?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, updated.

connect_str += ":{}".format(self.conn.port)
if self.conn.schema:
connect_str += "/{}".format(self.conn.schema)
connection_cmd += ["--connect", "{}".format(connect_str)]
Copy link
Contributor

Choose a reason for hiding this comment

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

connection_cmd += ["--connect", connect_str]?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, updated.

@ashb ashb changed the title [AIRFLOW-5727] Build --connect parameter only if port and schema are defined [AIRFLOW-5727] Sqoop_Hook only include --connect in command when port/schema are defined Oct 24, 2019
@ashb ashb changed the title [AIRFLOW-5727] Sqoop_Hook only include --connect in command when port/schema are defined [AIRFLOW-5727] SqoopHook: Build --connect parameter correctly when port/schema are not provided Oct 24, 2019
@codecov-io
Copy link

codecov-io commented Oct 24, 2019

Codecov Report

Merging #6397 into master will decrease coverage by 0.31%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6397      +/-   ##
==========================================
- Coverage   84.25%   83.93%   -0.32%     
==========================================
  Files         627      627              
  Lines       36506    36511       +5     
==========================================
- Hits        30757    30646     -111     
- Misses       5749     5865     +116
Impacted Files Coverage Δ
airflow/contrib/hooks/sqoop_hook.py 95.48% <100%> (+0.15%) ⬆️
airflow/kubernetes/volume_mount.py 44.44% <0%> (-55.56%) ⬇️
airflow/kubernetes/volume.py 52.94% <0%> (-47.06%) ⬇️
airflow/kubernetes/pod_launcher.py 45.25% <0%> (-46.72%) ⬇️
airflow/kubernetes/kube_client.py 33.33% <0%> (-41.67%) ⬇️
...rflow/contrib/operators/kubernetes_pod_operator.py 70.14% <0%> (-28.36%) ⬇️
airflow/jobs/local_task_job.py 85% <0%> (-5%) ⬇️
airflow/jobs/backfill_job.py 89.9% <0%> (-1.53%) ⬇️
airflow/models/taskinstance.py 93.73% <0%> (+0.5%) ⬆️
airflow/contrib/operators/ssh_operator.py 83.75% <0%> (+1.25%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c7ed169...500ed89. Read the comment docs.

@kaxil kaxil merged commit 4649563 into apache:master Oct 25, 2019
ashb pushed a commit that referenced this pull request Dec 14, 2019
ashb pushed a commit that referenced this pull request Dec 16, 2019
kaxil pushed a commit that referenced this pull request Dec 17, 2019
ashb pushed a commit that referenced this pull request Dec 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants