Repository navigation
feat(patchable)!: Use consistent long index in patches - #1705
Open
NickLarsenNZ wants to merge 7 commits into
Open
NickLarsenNZ wants to merge 7 commits into
NickLarsenNZ wants to merge 7 commits into
Conversation
Otherwise git chooses a reasonable length based on how many objects are checked out, to try to avoid ambiguity. But that means some people will export a product version and a change will appear for existing patches they didn't touch.
Techassi
previously approved these changes
Oct 16, 2026
Note: - One patch had the Subject fixed so that the exported filename doesn't change. - Other patches have the Form line show a different hash. Previously they were stale (eg: earlier patch removed after export, or perhaps a reordering of the patch files). - Other differences are due to the diff algorithm when the export happened on my machine. Will look at fixing that here.
…for consistency My local config uses histogram, so the previous commit showed changes in the patches. This reverts those changes.
NickLarsenNZ
commented
Oct 16, 2026
| errMsg = "Could not open client transport for any of the Server URI's in ZooKeeper: "; | ||
| // Try next available server in zookeeper, or retry all the servers again if retry is enabled | ||
| @@ -267,15 +273,15 @@ public HiveConnection(String uri, Properties info) throws SQLException { | ||
| @@ -267,15 +273,15 @@ public class HiveConnection implements java.sql.Connection { |
Member
Author
There was a problem hiding this comment.
This appears to be happening for old diffs that were done in the checkout directory. Patchable doesn't enter the checkout directory, so exports are missing the language diff set in .gitattributes of the checked out repo.
Eg: for hive 3.1.3, it is:
# Auto detect text files and perform LF normalization
* text=auto
*.cs text diff=csharp
*.java text diff=java
*.html text diff=html
*.py text diff=python
*.pl text diff=perl
*.pm text diff=perl
*.css text
*.js text
*.sql text
*.q text
*.q.out text diff
*.sh text eol=lf
#test files, use lf so that size is same on windows as well
data/files/*.dat text eol=lf
*.bat text eol=crlf
*.cmd text eol=crlf
*.csproj text merge=union eol=crlf
*.sln text merge=union eol=crlfIt probably makes sense that we use the .gitattributes (so our patches look like upstream patches).
Member
Author
There was a problem hiding this comment.
I will look into this in a different PR. There are other things I want to fix and this PR is getting big.
NickLarsenNZ
commented
Oct 16, 2026
Member
Author
There was a problem hiding this comment.
To the reviewer, this is the cause of all the patch file changes.
NickLarsenNZ
marked this pull request as ready for review
October 16, 2026 14:06
NickLarsenNZ
moved this from Development: In Progress
to Development: Waiting for Review
in Stackable Engineering
This comment was marked as resolved.
This comment was marked as resolved.
NickLarsenNZ
commented
Oct 16, 2026
Member
Author
There was a problem hiding this comment.
I need to look at this one
Member
Author
There was a problem hiding this comment.
ok, I think this is fine. The original patch was done with histogram, and now it's being forced back to myers.
In a later PR, I will make it configurable.
Techassi
approved these changes
Oct 16, 2026
Techassi
moved this from Development: Waiting for Review
to Development: In Review
in Stackable Engineering
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Otherwise git chooses a reasonable length based on how many objects are checked out, to try to avoid ambiguity.
But that means some people will export a product version and a change will appear for existing patches they didn't touch. Eg: #1686 (review)
This change sets a consistent long hash format for the patch index lines.
It also hard-codes the diff algorithm to
myers, which is the git default. I use histogram, so it changed how some patches were presented.versions re-exported
airflow
druid
hadoop
hbase
hive
kafka
nifi
omid
opensearch
opensearch-dashboards
shared
spark-k8s
superset
trino
superset
trino
zookeeper