Re: [DISCUSS] Plan of migrating 4.x codebase to the main branch

[ShaoFeng Shi <sh...@apache.org>]

+1; as most of the development works are on Kylin 4, we need to switch it
as the master/main branch.

Best regards,

Shaofeng Shi 史少锋
Apache Kylin PMC
Email: shaofengshi@apache.org

Apache Kylin FAQ: https://kylin.apache.org/docs/gettingstarted/faq.html
Join Kylin user mail group: user-subscribe@kylin.apache.org
Join Kylin dev mail group: dev-subscribe@kylin.apache.org



Xiaoxiang Yu <xx...@apache.org> 于2021年5月25日周二 下午3:26写道：

> Sorry for above broken table and missing screenshot, I have move all
> contents into Kylin's Wiki, please check this.
>
>
>
> https://cwiki.apache.org/confluence/display/KYLIN/KIP-6+Migrate+patches+from+master+to+kylin-on-parquet-v2
>
>
>
>
> --
>
> Best wishes to you !
> From ：Xiaoxiang Yu
>
>
>
>
> At 2021-05-25 15:12:46, "Xiaoxiang Yu" <xx...@apache.org> wrote:
>
> The original table's format is broken. Let me provided a screenshot for
> this table.
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
> --
>
> Best wishes to you !
> From ：Xiaoxiang Yu
>
>
>
>
>
> At 2021-05-25 15:09:10, "George Ni" <ni...@apache.org> wrote:
> >+1
> >
> >Xiaoxiang Yu <xx...@apache.org> 于2021年5月25日周二 下午2:57写道：
> >
> >> Hi, all:
> >>
> >>
> >>
> >>     At present, the code of Kylin 4.0 is located in the
> >> "kylin-on-parquet-v2" branch of the Kylin repository [
> >> https://github.com/apache/kylin/tree/kylin-on-parquet-v2]. This branch
> >> was separated from the master branch in April 2020 and became the
> >> development branch of Kylin 4.0.
> >>
> >>
> >>
> >>     As more and more development tasks are on the new 4.0 codebase, we
> >> plan to promote it as the new master/main branch; the as-is master,
> which
> >> is 3.x codebase, will be rename to 3.x branch. In the meanwhile, many
> >> commits in the master branch after the separation were not in the
> >> "kylin-on-parquet-v2" branch, we need to catch up with them.
> >>
> >>
> >>
> >>     Our preliminary plan is as follows:
> >>
> >> |
> >>
> >> Phase
> >>
> >> |
> >>
> >> Time Range
> >>
> >> |
> >>
> >> Action for maintainer
> >>
> >> |
> >>
> >> Caution for developer
> >>
> >> |
> >> |
> >>
> >> phase1
> >>
> >> |
> >>
> >> 2021-5-25~
> >>
> >> 2021-06-20
> >>
> >> |
> >> rename "kylin-on-parquet-v2" branch to "4.x"
> >> catch up the commits in master(since April 2020) to "4.x"
> >> |
> >>
> >> When you submit PR to the master branch (for 3.x), please consider
> whether
> >> it is needed for 4.x as well.
> >>
> >> |
> >> |
> >>
> >> phase2
> >>
> >> |
> >>
> >> 2021-6-20~
> >>
> >> 2021-07-10
> >>
> >> |
> >> package and do a round of test on the "4.x"
> >> |
> >>
> >> Same as above
> >>
> >> |
> >> |
> >>
> >> phase3
> >>
> >> |
> >>
> >> After
> >>
> >> 2021-07-10
> >>
> >> |
> >> rename master to "3.x"
> >> rename "4.x" to "main"
> >> update documents, jenkins job and other places, using the new main
> branch
> >> as default branch of Kylin repo.
> >> |
> >>
> >> The main branch becomes Kylin 4 code base; If you want to patch Kylin
> 3.x,
> >> submit PR to the "3.x" branch.
> >>
> >>
> >>
> >> |
> >>
> >>
> >>
> >> The above is the plan of migrating 4.x codebase to the main codebase. If
> >> you have any opinions or suggestions, please reply to the email and let
> us
> >> know. Thank you!
> >>
> >>
> >>
> >>
> >> --
> >>
> >> Best wishes to you !
> >> From ：Xiaoxiang Yu
> >
> >
> >
> >--
> >
> >---------------------
> >
> >Best regards,
> >
> >
> >
> >Ni Chunen / George
>