Hi Daniel, Yes, you are right. Looks like it doesn't work HIVE-1234.01-branch-3.patch format. I think the reason it was done that way is because we use '-' in the branch naming convention and its easier to parse the patch name to determine the profile. I think it would be helpful to support both '.' and '-' to delimit the branch names. The code which parses the patch name to figure out the profile is here https://github.com/apache/hive/blob/master/dev-support/jenkins-common.sh#L95
Feel free to create a JIRA (or use HIVE-20191) to provide a patch to improve this. I would be happy to review it. Thanks, Vihang On Tue, Jul 17, 2018 at 11:43 PM, Dániel Vörös <daniel.vo...@gmail.com> wrote: > Hi, > > Thanks Zoltan for starting this discussion. I ran into this a couple times > lately. > > I've just opened https://issues.apache.org/jira/browse/HIVE-20191 to > mitigate the > effect of a wrong submission. Since I was backporting from master, I did't > even > notice that the patches were applied on master. > > I'd be in favor of changing the pattern, or allowing both '.' and '-'. > > @Vihang, from the Hive QE comments it seems that your first two patches > were > also applied on master instead of branch-3. > > Regards, > Daniel > > On Tue, Jul 17, 2018 at 6:29 PM Vihang Karajgaonkar > <vih...@cloudera.com.invalid> wrote: > > > It doesn't matter if you use a dot v/s a dash to separate the patch > version > > with the profile name (same as branch name but its technically > different). > > See https://issues.apache.org/jira/browse/HIVE-18885 as an example > where I > > had submitted both the naming styles and precommit picked it up. Having > > said that I find this naming convention confusing too. Does anyone know > how > > do the other projects handle branch specific patch names? > > > > On Tue, Jul 17, 2018 at 2:26 AM, Zoltan Haindrich <k...@rxd.hu> wrote: > > > > > Hello! > > > > > > I've seen a few people running into some problems because the current > > > patch naming convention is a little bit odd: > > > > > > HIVE-<JIRA-NUMBER>[.<patch-num>][-<branch-name>].patch > > > > > > ...so if you would like to submit patch #02 to branch-2: > > > > > > A file named: HIVE-111.02-branch-2 patch should be uploaded (note that > > > there is a mandatory dash after the patch number) > > > I think this looks a bit odd also because most of the branch-es has a > "-" > > > in there name (branch-2/branch-3). > > > > > > Because most people are naturally uploading files with the following > > > format, I would like to recommend to change the convention to: > > > HIVE-<JIRA-NUMBER>[.<patch-num>][.<branch-name>].patch > > > > > > Examples: > > > HIVE-111.feature-branch.patch > > > HIVE-111.123.feature-branch.patch > > > HIVE-111.123.feature-branch.patch > > > > > > cheers, > > > Zoltan > > > > > >
