You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@griffin.apache.org by Nick Sokolov <ch...@gmail.com> on 2019/03/14 04:02:53 UTC
Documentation for merge process
Hi!
Question to committers: is there any documentation for 1) approval process
(how many approvals PR should get to be merged), and 2) what is the process
to merge a PR?
There is a bunch of PRs that I think is ready to merge, I'd like to follow
right process for them. Specifically:
- https://github.com/apache/griffin/pull/486
- https://github.com/apache/griffin/pull/485
- https://github.com/apache/griffin/pull/484
Thanks in advance
Re: Documentation for merge process
Posted by William Guo <gu...@apache.org>.
hi Eugene,
I have granted your the permission also, please try and tell me when you
encounter any issue.
Thanks,
William
On Mon, Mar 18, 2019 at 9:27 AM Eugene Liu <li...@apache.org> wrote:
> William,
>
> Could I merge PRs following steps after getting 2 PMC's approvals?
>
> thx
> Eugene
> ________________________________
> From: William Guo <gu...@apache.org>
> Sent: Sunday, March 17, 2019 8:43 AM
> To: nsokolov@apache.org
> Cc: dev@griffin.apache.org
> Subject: Re: Documentation for merge process
>
> hi Nick,
>
> Could you try to use your account to merge
> https://github.com/apache/griffin/pull/486
> by running merge_pr.py under griffin root.
>
> Let me know if something wrong.
>
> Thanks
> William
>
> On Fri, Mar 15, 2019 at 4:43 PM William Guo <gu...@apache.org> wrote:
>
> > The process is simple and self-descriptive, as follows,
> >
> > (py27) ➜ griffin git:(master) ./merge_pr.py
> > git rev-parse --abbrev-ref HEAD
> > git config --get remote.apache-github.url
> > git config --get remote.apache-git.url
> > Which pull request would you like to merge? (e.g. 34): 484
> > I've re-written the title as follows to match the standard format:
> > Original: GRIFFIN-232 - add support pluggable predicates
> > Modified: [GRIFFIN-232] add support pluggable predicates
> > Would you like to use the modified title? (y/n): y
> > Using modified title:
> > [GRIFFIN-232] add support pluggable predicates
> >
> > === Pull Request #484 ===
> > title [GRIFFIN-232] add support pluggable predicates
> > source aborgatin/feature/GRIFFIN-232
> > target master
> > url https://api.github.com/repos/apache/griffin/pulls/484
> >
> > Proceed with merging pull request #484? (y/n): y
> > git fetch apache-github pull/484/head:PR_TOOL_MERGE_PR_484
> > remote: Enumerating objects: 72, done.
> > remote: Counting objects: 100% (72/72), done.
> > remote: Compressing objects: 100% (38/38), done.
> > remote: Total 92 (delta 38), reused 58 (delta 26), pack-reused 20
> > Unpacking objects: 100% (92/92), done.
> > From https://github.com/apache/griffin
> > * [new ref] refs/pull/484/head -> PR_TOOL_MERGE_PR_484
> > * [new ref] refs/pull/484/head -> apache-github/pr/484/head
> > git fetch apache-git master:PR_TOOL_MERGE_PR_484_MASTER
> > From https://gitbox.apache.org/repos/asf/griffin
> > * [new branch] master -> PR_TOOL_MERGE_PR_484_MASTER
> > git checkout PR_TOOL_MERGE_PR_484_MASTER
> > Switched to branch 'PR_TOOL_MERGE_PR_484_MASTER'
> > ['git', 'merge', 'PR_TOOL_MERGE_PR_484', '--squash']
> > Automatic merge went well; stopped before committing as requested
> > ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_484', '--pretty=format:%an <%ae>']
> > Enter primary author in the format of "name <email>" [Borgatin Alexandr <
> > aborgatin@griddynamics.com>]:
> > ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_484', '--pretty=format:%h [%an]
> %s']
> > ['git', 'commit', '--author="Borgatin Alexandr <
> aborgatin@griddynamics.com>"',
> > '-m', u'[GRIFFIN-232] add support pluggable predicates', '-m',
> u'Classifier
> > "exec" added to spring-boot-maven-plugin for possibility use service as a
> > library. This will allow to create custom predicates without recompiling
> > Griffin-service module. \r\n\r\nThe approach to deserialisation in
> > SparkSubmit changed for possibility to use all fields of SegmentPredicate
> > in custom predicates.', '-m', 'Author: Borgatin Alexandr <
> > aborgatin@griddynamics.com>', '-m', u'Closes #484 from
> > aborgatin/feature/GRIFFIN-232.']
> >
> > Merge complete (local ref PR_TOOL_MERGE_PR_484_MASTER). Push to
> > apache-git? (y/n): y
> > git push apache-git PR_TOOL_MERGE_PR_484_MASTER:master
> > Enumerating objects: 60, done.
> > Counting objects: 100% (60/60), done.
> > Delta compression using up to 8 threads
> > Compressing objects: 100% (27/27), done.
> > Writing objects: 100% (35/35), 7.21 KiB | 1.80 MiB/s, done.
> > Total 35 (delta 14), reused 0 (delta 0)
> > remote: To git@github:apache/griffin.git
> > remote: a021b61..11a3011 11a301190ac087e72880d01251a24251e5a0c8bb ->
> > master
> > remote: Syncing refs/heads/master...
> > remote: Sending notification emails to: ['"commits@griffin.apache.org" <
> > commits@griffin.apache.org>']
> > To https://gitbox.apache.org/repos/asf/griffin.git
> > a021b61a..11a30119 PR_TOOL_MERGE_PR_484_MASTER -> master
> > git rev-parse PR_TOOL_MERGE_PR_484_MASTER
> > Restoring head pointer to master
> > git checkout master
> > Switched to branch 'master'
> > git branch
> > Deleting local branch PR_TOOL_MERGE_PR_484
> > git branch -D PR_TOOL_MERGE_PR_484
> > Deleting local branch PR_TOOL_MERGE_PR_484_MASTER
> > git branch -D PR_TOOL_MERGE_PR_484_MASTER
> > Pull request #484 merged!
> > Merge hash: 11a30119
> >
> > Would you like to pick 11a30119 into another branch? (y/n): n
> >
> > Would you like to update an associated JIRA? (y/n): y
> > Enter a Griffin JIRA number id [GRIFFIN-232]:
> > === JIRA GRIFFIN-232 ===
> > summary Implement pluggable Predicators in PredicatorFactory
> > assignee NOT ASSIGNED!!!
> > status Open
> > url https://issues.apache.org/jira/browse/GRIFFIN-232
> >
> > Enter comma-separated fix version(s) [0.5.0]:
> > Successfully resolved GRIFFIN-232 with fixVersions=[u'0.5.0']!
> > (py27) ➜ griffin git:(master) git pull origin master
> > From https://github.com/apache/griffin
> > * branch master -> FETCH_HEAD
> > a021b61a..11a30119 master -> origin/master
> > Updating a021b61a..11a30119
> > Fast-forward
> > griffin-doc/measure/predicates.md
> > | 100
> >
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > service/pom.xml
> > | 17 ++++++++++++-
> >
> service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java
> > | 4 +++
> > service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
> > | 12 +++------
> >
> service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java
> > | 38 +++++++++++++++++++++++++---
> > service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java
> > | 27 +++++++++++++++++---
> >
> service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
> > | 34 ++++++++++++++++++++-----
> >
> service/src/test/java/org/apache/griffin/core/job/factory/PredicatorFactoryTest.java
> > | 47 +++++++++++++++++++++++++++++++++++
> >
> service/src/test/java/org/apache/griffin/core/util/EntityMocksHelper.java
> > | 18 ++++++++++++--
> > service/src/test/java/org/apache/griffin/core/util/PredicatorMock.java
> > | 16 ++++++++++++
> > 10 files changed, 289 insertions(+), 24 deletions(-)
> > create mode 100644 griffin-doc/measure/predicates.md
> > create mode 100644
> >
> service/src/test/java/org/apache/griffin/core/job/factory/PredicatorFactoryTest.java
> > create mode 100644
> > service/src/test/java/org/apache/griffin/core/util/PredicatorMock.java
> >
> > On Fri, Mar 15, 2019 at 3:58 PM William Guo <gu...@apache.org> wrote:
> >
> >> hi Nick,
> >>
> >> PMC can merge PR after two PMC approved.
> >> I will try to grant your the permission for merging, please have a
> check.
> >>
> >>
> >> Thanks,
> >> William
> >>
> >> On Thu, Mar 14, 2019 at 12:03 PM Nick Sokolov <ch...@gmail.com>
> >> wrote:
> >>
> >>> Hi!
> >>>
> >>> Question to committers: is there any documentation for 1) approval
> >>> process
> >>> (how many approvals PR should get to be merged), and 2) what is the
> >>> process
> >>> to merge a PR?
> >>>
> >>> There is a bunch of PRs that I think is ready to merge, I'd like to
> >>> follow
> >>> right process for them. Specifically:
> >>>
> >>> - https://github.com/apache/griffin/pull/486
> >>> - https://github.com/apache/griffin/pull/485
> >>> - https://github.com/apache/griffin/pull/484
> >>>
> >>> Thanks in advance
> >>>
> >>
>
Re: Documentation for merge process
Posted by Eugene Liu <li...@apache.org>.
William,
Could I merge PRs following steps after getting 2 PMC's approvals?
thx
Eugene
________________________________
From: William Guo <gu...@apache.org>
Sent: Sunday, March 17, 2019 8:43 AM
To: nsokolov@apache.org
Cc: dev@griffin.apache.org
Subject: Re: Documentation for merge process
hi Nick,
Could you try to use your account to merge
https://github.com/apache/griffin/pull/486
by running merge_pr.py under griffin root.
Let me know if something wrong.
Thanks
William
On Fri, Mar 15, 2019 at 4:43 PM William Guo <gu...@apache.org> wrote:
> The process is simple and self-descriptive, as follows,
>
> (py27) ➜ griffin git:(master) ./merge_pr.py
> git rev-parse --abbrev-ref HEAD
> git config --get remote.apache-github.url
> git config --get remote.apache-git.url
> Which pull request would you like to merge? (e.g. 34): 484
> I've re-written the title as follows to match the standard format:
> Original: GRIFFIN-232 - add support pluggable predicates
> Modified: [GRIFFIN-232] add support pluggable predicates
> Would you like to use the modified title? (y/n): y
> Using modified title:
> [GRIFFIN-232] add support pluggable predicates
>
> === Pull Request #484 ===
> title [GRIFFIN-232] add support pluggable predicates
> source aborgatin/feature/GRIFFIN-232
> target master
> url https://api.github.com/repos/apache/griffin/pulls/484
>
> Proceed with merging pull request #484? (y/n): y
> git fetch apache-github pull/484/head:PR_TOOL_MERGE_PR_484
> remote: Enumerating objects: 72, done.
> remote: Counting objects: 100% (72/72), done.
> remote: Compressing objects: 100% (38/38), done.
> remote: Total 92 (delta 38), reused 58 (delta 26), pack-reused 20
> Unpacking objects: 100% (92/92), done.
> From https://github.com/apache/griffin
> * [new ref] refs/pull/484/head -> PR_TOOL_MERGE_PR_484
> * [new ref] refs/pull/484/head -> apache-github/pr/484/head
> git fetch apache-git master:PR_TOOL_MERGE_PR_484_MASTER
> From https://gitbox.apache.org/repos/asf/griffin
> * [new branch] master -> PR_TOOL_MERGE_PR_484_MASTER
> git checkout PR_TOOL_MERGE_PR_484_MASTER
> Switched to branch 'PR_TOOL_MERGE_PR_484_MASTER'
> ['git', 'merge', 'PR_TOOL_MERGE_PR_484', '--squash']
> Automatic merge went well; stopped before committing as requested
> ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_484', '--pretty=format:%an <%ae>']
> Enter primary author in the format of "name <email>" [Borgatin Alexandr <
> aborgatin@griddynamics.com>]:
> ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_484', '--pretty=format:%h [%an] %s']
> ['git', 'commit', '--author="Borgatin Alexandr <ab...@griddynamics.com>"',
> '-m', u'[GRIFFIN-232] add support pluggable predicates', '-m', u'Classifier
> "exec" added to spring-boot-maven-plugin for possibility use service as a
> library. This will allow to create custom predicates without recompiling
> Griffin-service module. \r\n\r\nThe approach to deserialisation in
> SparkSubmit changed for possibility to use all fields of SegmentPredicate
> in custom predicates.', '-m', 'Author: Borgatin Alexandr <
> aborgatin@griddynamics.com>', '-m', u'Closes #484 from
> aborgatin/feature/GRIFFIN-232.']
>
> Merge complete (local ref PR_TOOL_MERGE_PR_484_MASTER). Push to
> apache-git? (y/n): y
> git push apache-git PR_TOOL_MERGE_PR_484_MASTER:master
> Enumerating objects: 60, done.
> Counting objects: 100% (60/60), done.
> Delta compression using up to 8 threads
> Compressing objects: 100% (27/27), done.
> Writing objects: 100% (35/35), 7.21 KiB | 1.80 MiB/s, done.
> Total 35 (delta 14), reused 0 (delta 0)
> remote: To git@github:apache/griffin.git
> remote: a021b61..11a3011 11a301190ac087e72880d01251a24251e5a0c8bb ->
> master
> remote: Syncing refs/heads/master...
> remote: Sending notification emails to: ['"commits@griffin.apache.org" <
> commits@griffin.apache.org>']
> To https://gitbox.apache.org/repos/asf/griffin.git
> a021b61a..11a30119 PR_TOOL_MERGE_PR_484_MASTER -> master
> git rev-parse PR_TOOL_MERGE_PR_484_MASTER
> Restoring head pointer to master
> git checkout master
> Switched to branch 'master'
> git branch
> Deleting local branch PR_TOOL_MERGE_PR_484
> git branch -D PR_TOOL_MERGE_PR_484
> Deleting local branch PR_TOOL_MERGE_PR_484_MASTER
> git branch -D PR_TOOL_MERGE_PR_484_MASTER
> Pull request #484 merged!
> Merge hash: 11a30119
>
> Would you like to pick 11a30119 into another branch? (y/n): n
>
> Would you like to update an associated JIRA? (y/n): y
> Enter a Griffin JIRA number id [GRIFFIN-232]:
> === JIRA GRIFFIN-232 ===
> summary Implement pluggable Predicators in PredicatorFactory
> assignee NOT ASSIGNED!!!
> status Open
> url https://issues.apache.org/jira/browse/GRIFFIN-232
>
> Enter comma-separated fix version(s) [0.5.0]:
> Successfully resolved GRIFFIN-232 with fixVersions=[u'0.5.0']!
> (py27) ➜ griffin git:(master) git pull origin master
> From https://github.com/apache/griffin
> * branch master -> FETCH_HEAD
> a021b61a..11a30119 master -> origin/master
> Updating a021b61a..11a30119
> Fast-forward
> griffin-doc/measure/predicates.md
> | 100
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> service/pom.xml
> | 17 ++++++++++++-
> service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java
> | 4 +++
> service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
> | 12 +++------
> service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java
> | 38 +++++++++++++++++++++++++---
> service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java
> | 27 +++++++++++++++++---
> service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
> | 34 ++++++++++++++++++++-----
> service/src/test/java/org/apache/griffin/core/job/factory/PredicatorFactoryTest.java
> | 47 +++++++++++++++++++++++++++++++++++
> service/src/test/java/org/apache/griffin/core/util/EntityMocksHelper.java
> | 18 ++++++++++++--
> service/src/test/java/org/apache/griffin/core/util/PredicatorMock.java
> | 16 ++++++++++++
> 10 files changed, 289 insertions(+), 24 deletions(-)
> create mode 100644 griffin-doc/measure/predicates.md
> create mode 100644
> service/src/test/java/org/apache/griffin/core/job/factory/PredicatorFactoryTest.java
> create mode 100644
> service/src/test/java/org/apache/griffin/core/util/PredicatorMock.java
>
> On Fri, Mar 15, 2019 at 3:58 PM William Guo <gu...@apache.org> wrote:
>
>> hi Nick,
>>
>> PMC can merge PR after two PMC approved.
>> I will try to grant your the permission for merging, please have a check.
>>
>>
>> Thanks,
>> William
>>
>> On Thu, Mar 14, 2019 at 12:03 PM Nick Sokolov <ch...@gmail.com>
>> wrote:
>>
>>> Hi!
>>>
>>> Question to committers: is there any documentation for 1) approval
>>> process
>>> (how many approvals PR should get to be merged), and 2) what is the
>>> process
>>> to merge a PR?
>>>
>>> There is a bunch of PRs that I think is ready to merge, I'd like to
>>> follow
>>> right process for them. Specifically:
>>>
>>> - https://github.com/apache/griffin/pull/486
>>> - https://github.com/apache/griffin/pull/485
>>> - https://github.com/apache/griffin/pull/484
>>>
>>> Thanks in advance
>>>
>>
Re: Documentation for merge process
Posted by William Guo <gu...@apache.org>.
hi Nick,
Could you try to use your account to merge
https://github.com/apache/griffin/pull/486
by running merge_pr.py under griffin root.
Let me know if something wrong.
Thanks
William
On Fri, Mar 15, 2019 at 4:43 PM William Guo <gu...@apache.org> wrote:
> The process is simple and self-descriptive, as follows,
>
> (py27) ➜ griffin git:(master) ./merge_pr.py
> git rev-parse --abbrev-ref HEAD
> git config --get remote.apache-github.url
> git config --get remote.apache-git.url
> Which pull request would you like to merge? (e.g. 34): 484
> I've re-written the title as follows to match the standard format:
> Original: GRIFFIN-232 - add support pluggable predicates
> Modified: [GRIFFIN-232] add support pluggable predicates
> Would you like to use the modified title? (y/n): y
> Using modified title:
> [GRIFFIN-232] add support pluggable predicates
>
> === Pull Request #484 ===
> title [GRIFFIN-232] add support pluggable predicates
> source aborgatin/feature/GRIFFIN-232
> target master
> url https://api.github.com/repos/apache/griffin/pulls/484
>
> Proceed with merging pull request #484? (y/n): y
> git fetch apache-github pull/484/head:PR_TOOL_MERGE_PR_484
> remote: Enumerating objects: 72, done.
> remote: Counting objects: 100% (72/72), done.
> remote: Compressing objects: 100% (38/38), done.
> remote: Total 92 (delta 38), reused 58 (delta 26), pack-reused 20
> Unpacking objects: 100% (92/92), done.
> From https://github.com/apache/griffin
> * [new ref] refs/pull/484/head -> PR_TOOL_MERGE_PR_484
> * [new ref] refs/pull/484/head -> apache-github/pr/484/head
> git fetch apache-git master:PR_TOOL_MERGE_PR_484_MASTER
> From https://gitbox.apache.org/repos/asf/griffin
> * [new branch] master -> PR_TOOL_MERGE_PR_484_MASTER
> git checkout PR_TOOL_MERGE_PR_484_MASTER
> Switched to branch 'PR_TOOL_MERGE_PR_484_MASTER'
> ['git', 'merge', 'PR_TOOL_MERGE_PR_484', '--squash']
> Automatic merge went well; stopped before committing as requested
> ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_484', '--pretty=format:%an <%ae>']
> Enter primary author in the format of "name <email>" [Borgatin Alexandr <
> aborgatin@griddynamics.com>]:
> ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_484', '--pretty=format:%h [%an] %s']
> ['git', 'commit', '--author="Borgatin Alexandr <ab...@griddynamics.com>"',
> '-m', u'[GRIFFIN-232] add support pluggable predicates', '-m', u'Classifier
> "exec" added to spring-boot-maven-plugin for possibility use service as a
> library. This will allow to create custom predicates without recompiling
> Griffin-service module. \r\n\r\nThe approach to deserialisation in
> SparkSubmit changed for possibility to use all fields of SegmentPredicate
> in custom predicates.', '-m', 'Author: Borgatin Alexandr <
> aborgatin@griddynamics.com>', '-m', u'Closes #484 from
> aborgatin/feature/GRIFFIN-232.']
>
> Merge complete (local ref PR_TOOL_MERGE_PR_484_MASTER). Push to
> apache-git? (y/n): y
> git push apache-git PR_TOOL_MERGE_PR_484_MASTER:master
> Enumerating objects: 60, done.
> Counting objects: 100% (60/60), done.
> Delta compression using up to 8 threads
> Compressing objects: 100% (27/27), done.
> Writing objects: 100% (35/35), 7.21 KiB | 1.80 MiB/s, done.
> Total 35 (delta 14), reused 0 (delta 0)
> remote: To git@github:apache/griffin.git
> remote: a021b61..11a3011 11a301190ac087e72880d01251a24251e5a0c8bb ->
> master
> remote: Syncing refs/heads/master...
> remote: Sending notification emails to: ['"commits@griffin.apache.org" <
> commits@griffin.apache.org>']
> To https://gitbox.apache.org/repos/asf/griffin.git
> a021b61a..11a30119 PR_TOOL_MERGE_PR_484_MASTER -> master
> git rev-parse PR_TOOL_MERGE_PR_484_MASTER
> Restoring head pointer to master
> git checkout master
> Switched to branch 'master'
> git branch
> Deleting local branch PR_TOOL_MERGE_PR_484
> git branch -D PR_TOOL_MERGE_PR_484
> Deleting local branch PR_TOOL_MERGE_PR_484_MASTER
> git branch -D PR_TOOL_MERGE_PR_484_MASTER
> Pull request #484 merged!
> Merge hash: 11a30119
>
> Would you like to pick 11a30119 into another branch? (y/n): n
>
> Would you like to update an associated JIRA? (y/n): y
> Enter a Griffin JIRA number id [GRIFFIN-232]:
> === JIRA GRIFFIN-232 ===
> summary Implement pluggable Predicators in PredicatorFactory
> assignee NOT ASSIGNED!!!
> status Open
> url https://issues.apache.org/jira/browse/GRIFFIN-232
>
> Enter comma-separated fix version(s) [0.5.0]:
> Successfully resolved GRIFFIN-232 with fixVersions=[u'0.5.0']!
> (py27) ➜ griffin git:(master) git pull origin master
> From https://github.com/apache/griffin
> * branch master -> FETCH_HEAD
> a021b61a..11a30119 master -> origin/master
> Updating a021b61a..11a30119
> Fast-forward
> griffin-doc/measure/predicates.md
> | 100
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> service/pom.xml
> | 17 ++++++++++++-
> service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java
> | 4 +++
> service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
> | 12 +++------
> service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java
> | 38 +++++++++++++++++++++++++---
> service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java
> | 27 +++++++++++++++++---
> service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
> | 34 ++++++++++++++++++++-----
> service/src/test/java/org/apache/griffin/core/job/factory/PredicatorFactoryTest.java
> | 47 +++++++++++++++++++++++++++++++++++
> service/src/test/java/org/apache/griffin/core/util/EntityMocksHelper.java
> | 18 ++++++++++++--
> service/src/test/java/org/apache/griffin/core/util/PredicatorMock.java
> | 16 ++++++++++++
> 10 files changed, 289 insertions(+), 24 deletions(-)
> create mode 100644 griffin-doc/measure/predicates.md
> create mode 100644
> service/src/test/java/org/apache/griffin/core/job/factory/PredicatorFactoryTest.java
> create mode 100644
> service/src/test/java/org/apache/griffin/core/util/PredicatorMock.java
>
> On Fri, Mar 15, 2019 at 3:58 PM William Guo <gu...@apache.org> wrote:
>
>> hi Nick,
>>
>> PMC can merge PR after two PMC approved.
>> I will try to grant your the permission for merging, please have a check.
>>
>>
>> Thanks,
>> William
>>
>> On Thu, Mar 14, 2019 at 12:03 PM Nick Sokolov <ch...@gmail.com>
>> wrote:
>>
>>> Hi!
>>>
>>> Question to committers: is there any documentation for 1) approval
>>> process
>>> (how many approvals PR should get to be merged), and 2) what is the
>>> process
>>> to merge a PR?
>>>
>>> There is a bunch of PRs that I think is ready to merge, I'd like to
>>> follow
>>> right process for them. Specifically:
>>>
>>> - https://github.com/apache/griffin/pull/486
>>> - https://github.com/apache/griffin/pull/485
>>> - https://github.com/apache/griffin/pull/484
>>>
>>> Thanks in advance
>>>
>>
Re: Documentation for merge process
Posted by William Guo <gu...@apache.org>.
The process is simple and self-descriptive, as follows,
(py27) ➜ griffin git:(master) ./merge_pr.py
git rev-parse --abbrev-ref HEAD
git config --get remote.apache-github.url
git config --get remote.apache-git.url
Which pull request would you like to merge? (e.g. 34): 484
I've re-written the title as follows to match the standard format:
Original: GRIFFIN-232 - add support pluggable predicates
Modified: [GRIFFIN-232] add support pluggable predicates
Would you like to use the modified title? (y/n): y
Using modified title:
[GRIFFIN-232] add support pluggable predicates
=== Pull Request #484 ===
title [GRIFFIN-232] add support pluggable predicates
source aborgatin/feature/GRIFFIN-232
target master
url https://api.github.com/repos/apache/griffin/pulls/484
Proceed with merging pull request #484? (y/n): y
git fetch apache-github pull/484/head:PR_TOOL_MERGE_PR_484
remote: Enumerating objects: 72, done.
remote: Counting objects: 100% (72/72), done.
remote: Compressing objects: 100% (38/38), done.
remote: Total 92 (delta 38), reused 58 (delta 26), pack-reused 20
Unpacking objects: 100% (92/92), done.
From https://github.com/apache/griffin
* [new ref] refs/pull/484/head -> PR_TOOL_MERGE_PR_484
* [new ref] refs/pull/484/head -> apache-github/pr/484/head
git fetch apache-git master:PR_TOOL_MERGE_PR_484_MASTER
From https://gitbox.apache.org/repos/asf/griffin
* [new branch] master -> PR_TOOL_MERGE_PR_484_MASTER
git checkout PR_TOOL_MERGE_PR_484_MASTER
Switched to branch 'PR_TOOL_MERGE_PR_484_MASTER'
['git', 'merge', 'PR_TOOL_MERGE_PR_484', '--squash']
Automatic merge went well; stopped before committing as requested
['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_484', '--pretty=format:%an <%ae>']
Enter primary author in the format of "name <email>" [Borgatin Alexandr <
aborgatin@griddynamics.com>]:
['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_484', '--pretty=format:%h [%an] %s']
['git', 'commit', '--author="Borgatin Alexandr <ab...@griddynamics.com>"',
'-m', u'[GRIFFIN-232] add support pluggable predicates', '-m', u'Classifier
"exec" added to spring-boot-maven-plugin for possibility use service as a
library. This will allow to create custom predicates without recompiling
Griffin-service module. \r\n\r\nThe approach to deserialisation in
SparkSubmit changed for possibility to use all fields of SegmentPredicate
in custom predicates.', '-m', 'Author: Borgatin Alexandr <
aborgatin@griddynamics.com>', '-m', u'Closes #484 from
aborgatin/feature/GRIFFIN-232.']
Merge complete (local ref PR_TOOL_MERGE_PR_484_MASTER). Push to apache-git?
(y/n): y
git push apache-git PR_TOOL_MERGE_PR_484_MASTER:master
Enumerating objects: 60, done.
Counting objects: 100% (60/60), done.
Delta compression using up to 8 threads
Compressing objects: 100% (27/27), done.
Writing objects: 100% (35/35), 7.21 KiB | 1.80 MiB/s, done.
Total 35 (delta 14), reused 0 (delta 0)
remote: To git@github:apache/griffin.git
remote: a021b61..11a3011 11a301190ac087e72880d01251a24251e5a0c8bb ->
master
remote: Syncing refs/heads/master...
remote: Sending notification emails to: ['"commits@griffin.apache.org" <
commits@griffin.apache.org>']
To https://gitbox.apache.org/repos/asf/griffin.git
a021b61a..11a30119 PR_TOOL_MERGE_PR_484_MASTER -> master
git rev-parse PR_TOOL_MERGE_PR_484_MASTER
Restoring head pointer to master
git checkout master
Switched to branch 'master'
git branch
Deleting local branch PR_TOOL_MERGE_PR_484
git branch -D PR_TOOL_MERGE_PR_484
Deleting local branch PR_TOOL_MERGE_PR_484_MASTER
git branch -D PR_TOOL_MERGE_PR_484_MASTER
Pull request #484 merged!
Merge hash: 11a30119
Would you like to pick 11a30119 into another branch? (y/n): n
Would you like to update an associated JIRA? (y/n): y
Enter a Griffin JIRA number id [GRIFFIN-232]:
=== JIRA GRIFFIN-232 ===
summary Implement pluggable Predicators in PredicatorFactory
assignee NOT ASSIGNED!!!
status Open
url https://issues.apache.org/jira/browse/GRIFFIN-232
Enter comma-separated fix version(s) [0.5.0]:
Successfully resolved GRIFFIN-232 with fixVersions=[u'0.5.0']!
(py27) ➜ griffin git:(master) git pull origin master
From https://github.com/apache/griffin
* branch master -> FETCH_HEAD
a021b61a..11a30119 master -> origin/master
Updating a021b61a..11a30119
Fast-forward
griffin-doc/measure/predicates.md
| 100
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
service/pom.xml
| 17 ++++++++++++-
service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java
| 4 +++
service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
| 12 +++------
service/src/main/java/org/apache/griffin/core/job/factory/PredicatorFactory.java
| 38 +++++++++++++++++++++++++---
service/src/main/java/org/apache/griffin/core/util/MeasureUtil.java
| 27 +++++++++++++++++---
service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java
| 34 ++++++++++++++++++++-----
service/src/test/java/org/apache/griffin/core/job/factory/PredicatorFactoryTest.java
| 47 +++++++++++++++++++++++++++++++++++
service/src/test/java/org/apache/griffin/core/util/EntityMocksHelper.java
| 18 ++++++++++++--
service/src/test/java/org/apache/griffin/core/util/PredicatorMock.java
| 16 ++++++++++++
10 files changed, 289 insertions(+), 24 deletions(-)
create mode 100644 griffin-doc/measure/predicates.md
create mode 100644
service/src/test/java/org/apache/griffin/core/job/factory/PredicatorFactoryTest.java
create mode 100644
service/src/test/java/org/apache/griffin/core/util/PredicatorMock.java
On Fri, Mar 15, 2019 at 3:58 PM William Guo <gu...@apache.org> wrote:
> hi Nick,
>
> PMC can merge PR after two PMC approved.
> I will try to grant your the permission for merging, please have a check.
>
>
> Thanks,
> William
>
> On Thu, Mar 14, 2019 at 12:03 PM Nick Sokolov <ch...@gmail.com>
> wrote:
>
>> Hi!
>>
>> Question to committers: is there any documentation for 1) approval process
>> (how many approvals PR should get to be merged), and 2) what is the
>> process
>> to merge a PR?
>>
>> There is a bunch of PRs that I think is ready to merge, I'd like to follow
>> right process for them. Specifically:
>>
>> - https://github.com/apache/griffin/pull/486
>> - https://github.com/apache/griffin/pull/485
>> - https://github.com/apache/griffin/pull/484
>>
>> Thanks in advance
>>
>
Re: Documentation for merge process
Posted by William Guo <gu...@apache.org>.
hi Nick,
PMC can merge PR after two PMC approved.
I will try to grant your the permission for merging, please have a check.
Thanks,
William
On Thu, Mar 14, 2019 at 12:03 PM Nick Sokolov <ch...@gmail.com> wrote:
> Hi!
>
> Question to committers: is there any documentation for 1) approval process
> (how many approvals PR should get to be merged), and 2) what is the process
> to merge a PR?
>
> There is a bunch of PRs that I think is ready to merge, I'd like to follow
> right process for them. Specifically:
>
> - https://github.com/apache/griffin/pull/486
> - https://github.com/apache/griffin/pull/485
> - https://github.com/apache/griffin/pull/484
>
> Thanks in advance
>