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

Feature upgrade to Spark 3.2.1 #111

Merged
merged 22 commits into from
Nov 28, 2022
Merged

Conversation

ronanstokes-db
Copy link
Contributor

@ronanstokes-db ronanstokes-db commented Oct 4, 2022

Proposed changes

Describe the big picture of your changes here to communicate to the maintainers.
If it fixes a bug or resolves a feature request, please provide a link to that issue.

Types of changes

What types of changes does your code introduce to dbx?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Change to tutorials, tests or examples
  • Non code change (readme, images or other non-code assets)
  • Documentation Update (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask. We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)
  • Any dependent changes have been merged and published in downstream modules
  • Submission does not reduce code coverage numbers
  • Submission does not increase alerts or messages from LGTM

Further comments

Based supported version on Databricks runtime 9.1 LTS or later. May impact users of earlier
runtime versions but instructions are included for using older version of the Databricks Data Generator in a notebook

@ronanstokes-db
Copy link
Contributor Author

ronanstokes-db commented Oct 4, 2022

ready for review

@codecov
Copy link

codecov bot commented Oct 4, 2022

Codecov Report

Merging #111 (e8eb833) into master (109707e) will increase coverage by 2.78%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #111      +/-   ##
==========================================
+ Coverage   84.11%   86.90%   +2.78%     
==========================================
  Files          21       21              
  Lines        2134     2161      +27     
  Branches      365      367       +2     
==========================================
+ Hits         1795     1878      +83     
+ Misses        242      183      -59     
- Partials       97      100       +3     
Impacted Files Coverage Δ
dbldatagen/_version.py 100.00% <100.00%> (ø)
dbldatagen/data_generator.py 83.23% <100.00%> (+0.54%) ⬆️
dbldatagen/datagen_constants.py 100.00% <100.00%> (ø)
dbldatagen/text_generators.py 79.77% <0.00%> (+21.37%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@ronanstokes-db
Copy link
Contributor Author

I also needed to add new code coverage tests as the code coverage threshold was failing - the code coverage tools now seem to discount code coverage for code in _init.py or else code coverage threshold has been raised.

@ronanstokes-db ronanstokes-db self-assigned this Oct 4, 2022
@ronanstokes-db ronanstokes-db added documentation Improvements or additions to documentation code quality dependencies Pull requests that update a dependency file labels Oct 4, 2022
@ronanstokes-db ronanstokes-db linked an issue Oct 4, 2022 that may be closed by this pull request
@ronanstokes-db
Copy link
Contributor Author

Do not commit directly as other fixes need to be commited first

@ronanstokes-db ronanstokes-db marked this pull request as draft October 5, 2022 08:53
Copy link
Contributor

@alexott alexott left a comment

Choose a reason for hiding this comment

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

most things are primarily about README, etc.

CHANGELOG.md Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
CONTRIBUTING.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
dbldatagen/__init__.py Show resolved Hide resolved
@ronanstokes-db ronanstokes-db changed the title Feature upgrade to spark 3 1 2 Feature upgrade to Spark 3.2.1 Oct 21, 2022
Copy link
Collaborator

@nfx nfx left a comment

Choose a reason for hiding this comment

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

please resolve git conflicts, otherwise lgtm

@ronanstokes-db ronanstokes-db marked this pull request as ready for review November 23, 2022 00:28
@lgtm-com
Copy link

lgtm-com bot commented Nov 23, 2022

This pull request introduces 1 alert and fixes 2 when merging d3ebcf2 into 109707e - view on LGTM.com

new alerts:

  • 1 for Syntax error

fixed alerts:

  • 2 for Unused local variable

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. Please enable GitHub code scanning, which uses the same CodeQL engine ⚙️ that powers LGTM.com. For more information, please check out our post on the GitHub blog.

@lgtm-com
Copy link

lgtm-com bot commented Nov 23, 2022

This pull request introduces 1 alert when merging 85478f8 into 109707e - view on LGTM.com

new alerts:

  • 1 for Unreachable code

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. Please enable GitHub code scanning, which uses the same CodeQL engine ⚙️ that powers LGTM.com. For more information, please check out our post on the GitHub blog.

Copy link
Contributor Author

@ronanstokes-db ronanstokes-db left a comment

Choose a reason for hiding this comment

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

conflicts resolved

@ronanstokes-db ronanstokes-db requested a review from nfx November 23, 2022 01:28
@ronanstokes-db
Copy link
Contributor Author

please resolve git conflicts, otherwise lgtm

All conflicts have been resolved

@lgtm-com
Copy link

lgtm-com bot commented Nov 23, 2022

This pull request introduces 1 alert when merging 3b04db4 into 109707e - view on LGTM.com

new alerts:

  • 1 for Unreachable code

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. Please enable GitHub code scanning, which uses the same CodeQL engine ⚙️ that powers LGTM.com. For more information, please check out our post on the GitHub blog.

Copy link
Contributor Author

@ronanstokes-db ronanstokes-db left a comment

Choose a reason for hiding this comment

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

requested changes made

@ronanstokes-db ronanstokes-db enabled auto-merge (squash) November 23, 2022 18:29
self.sparkSession = sparkSession
if sparkSession is None:
raise DataGenError("""Spark session not initialized

Copy link
Collaborator

Choose a reason for hiding this comment

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

Added line #L171 was not covered by tests

and this statement is unreachable :) lgtm.com is soo good at this.
image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

and this statement is unreachable :) lgtm.com is soo good at this.

except the fix for this was checked in 20 hours earlier

Copy link
Contributor Author

Choose a reason for hiding this comment

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

for some reason lgtm is taking 1 day to update results - perhaps due to transition to new code scanning ?

Copy link
Collaborator

@nfx nfx left a comment

Choose a reason for hiding this comment

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

Lgtm

@ronanstokes-db ronanstokes-db merged commit 981a5a4 into master Nov 28, 2022
@nfx nfx deleted the feature-upgrade-to-spark-3_1_2 branch November 28, 2022 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code quality dependencies Pull requests that update a dependency file documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for Spark 3.1.2
3 participants