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.

Sign up for GitHub

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

Jump to bottom

Maven goal to convert an old-style shim to a shimple shim #7528

Closed
Tracked by #7487
gerashegalov opened this issue Jan 18, 2023 · 0 comments · Fixed by #7561
Closed
Tracked by #7487

Maven goal to convert an old-style shim to a shimple shim #7528

gerashegalov opened this issue Jan 18, 2023 · 0 comments · Fixed by #7561
Assignees
@gerashegalov
Labels
build Related to CI / CD or cleanly building

Comments

@gerashegalov
Copy link
Collaborator

gerashegalov commented Jan 18, 2023 •
edited
Loading

Shims are actively developed. Maintaining a branch with many merge conflicts is cumbersome. Luckily conversion can be fully automated.
This was referenced Jan 18, 2023
Closed
Merged
@gerashegalov gerashegalov self-assigned this Feb 10, 2023
@gerashegalov gerashegalov added the build Related to CI / CD or cleanly building label Feb 10, 2023
gerashegalov added a commit that referenced this issue Feb 23, 2023
@gerashegalov @nartal1
@jlowe @razajafri
Ant task to automatically convert to a simple shim layout (#7561)
c5b8016 
Closes #7528

Usage:

```bash
mvn -B clean generate-sources antrun:run@shimplify-shim-sources -pl sql-plugin -Dshimplify=true -Dshimplify.add.base=323 -Dshimplify.add.shim=324
```

- Prints warning if detects a shim containing multiple source roots not shared with other shims. By construction a shim should have only a single directory that is not shared. Example:
```
shimplify - WARNING - Consider consolidating 340, it spans multiple dedicated directories ['/home/user/gits/NVIDIA/spark-rapids/sql-plugin/src/main/340+/scala', '/home/user/gits/NVIDIA/spark-rapids/sql-plugin/src/main/340/scala']
shimplify - WARNING - Consider consolidating 312db, it spans multiple dedicated directories ['/home/user/gits/NVIDIA/spark-rapids/sql-plugin/src/main/312db/scala', '/home/user/gits/NVIDIA/spark-rapids/sql-plugin/src/main/31xdb/scala']
```
- Updates shimplfy json comments without moving the files they are the old locations
- Move files to the canonical fist-shim-affected location
- Clones an existing shim to a new shim
- Removes an existing shim

The goal is to deprecate the range dirs.
 
Signed-off-by: Gera Shegalov <[email protected]>
Co-authored-by: Niranjan Artal <[email protected]>
Co-authored-by: Jason Lowe <[email protected]>
Co-authored-by: Raza Jafri <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@gerashegalov gerashegalov

Labels
build Related to CI / CD or cleanly building
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Ant task to automatically convert to a simple shim layout gerashegalov/spark-rapids
1 participant
@gerashegalov