Hi! Opened https://issues.apache.org/jira/browse/PHOENIX-6234 to cover this. Feel free to take it if you have the time, as I may not be able to do this in a timely manner.
Preparing PRs for more involved / low level changes for both branches is a good practice anyway, as there are other non-trivial differences between the branches. On Wed, Nov 25, 2020 at 8:34 AM [email protected] <[email protected]> wrote: > > > > I hope that we should applying PHOENIX-6010 to the 4.x, which could > simplify back- and forward porting changes between the branches,or else for > many JIRAs,we should > > > > > prepare separated patches for 4.x and master. > > > > > > > > > > > > At 2020-11-25 00:52:26, "Geoffrey Jacoby" <[email protected]> wrote: > >Istvan, > > > >Harmonizing the uses of guava between the two branches makes a lot of > >sense. The current differences add to the merge conflicts when porting a > >significant change between the branches, and make it easy to mistakenly > use > >an unshaded version of guava in the master branch (as I accidentally did > >once. :-) ) > > > >The main question I see is when to do it -- before the upcoming 4.16 > >release or afterward for a 4.16.1 or 4.17? That depends on release timing. > > > >Geoffrey > > > >On Tue, Nov 24, 2020 at 7:07 AM Istvan Toth <[email protected]> wrote: > > > >> Hi! > >> > >> I'd like to gather your opinion on replacing Guava with the > >> phoenix-thirdparty shaded version on the 4.x branch. > >> > >> The change was not applied on 4.x, as the incompatibilities that the > >> pre-shaded Guava version solves are not present on Hadoop 2/Hbase 1. > >> However, the difference between the branches causes extra work, and > >> frequent problems when porting code between the branches. > >> Applying PHOENIX-6010 to the 4.x branch would make our lives easier, > while > >> having no negative effects that I know of (we already pull in > >> phoenix-thirdparty via Omid 1.0.2) > >> > >> looking forward to hearing your opinion > >> Istvan > >> > -- *István Tóth* | Staff Software Engineer [email protected] <https://www.cloudera.com> [image: Cloudera] <https://www.cloudera.com/> [image: Cloudera on Twitter] <https://twitter.com/cloudera> [image: Cloudera on Facebook] <https://www.facebook.com/cloudera> [image: Cloudera on LinkedIn] <https://www.linkedin.com/company/cloudera> <https://www.cloudera.com/> ------------------------------
