giraph-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alessandro Presta <alessan...@fb.com>
Subject Re: [jira] [Commented] (GIRAPH-474) Add an option not to use direct byte buffers
Date Mon, 14 Jan 2013 23:13:23 GMT
On 1/14/13 2:56 PM, "Eli Reisman" <apache.mailbox@gmail.com> wrote:

>Alessandro: feeling brave enough to delete the "giraph474" branch from the
>remote repo? 

Done with "git push origin :giraph474"
The other one, "branch-0.1", is probably fine (I assume it's Giraph 0.1).

>Do you know if that commit actually made it into trunk or not?

It did, and you authored it:

commit bc056d1584dc402332a3160e8c15bbe681dd8750
Author: Eli Reisman <ereisman@apache.org>
Date:   Wed Jan 9 16:00:55 2013 -0800

    GIRAPH-474: Add an oprtion not to use direct byte buffers.
(majakabiljo via ereisman)



>
>On Mon, Jan 14, 2013 at 11:11 AM, Alessandro Presta
><alessandro@fb.com>wrote:
>
>> It shouldn't be a problem to work and commit from the same checkout.
>>This
>> is what I do:
>> 1) Create a new branch (say GIRAPH-XYZ)
>> 2) Apply the patch
>> 3) Update the CHANGELOG
>> 4) git commit -a
>> 5) git push origin GIRAPH-XYZ:trunk
>> Those extra branches are the result of someone inadvertently pushing a
>>new
>> branch to the remote.
>> Making changes directly on your master branch is generally not a good
>> practice in git.
>>
>> On 1/14/13 11:05 AM, "Eli Reisman" <apache.mailbox@gmail.com> wrote:
>>
>> >Hey, Giraph-Dev folks. Looking at our
>> >https://git-wip-us.apache.org/repos/asf/giraph.git repo, we have some
>> >funny
>> >branches creeping in. Please disambiguate the situation for me if you
>>can,
>> >but here's what I think:
>> >
>> >When you do dev work, have a repo with your dev branches.
>> >
>> >when you're ready to commit, get the patch itself from the JIRA in
>> >question, and download (or maintain) a SEPARATE repo. This is so you
>>can
>> >commit the patch to TRUNK. What worked for me is:
>> >
>> >1. dl this repo from the HTTPS URL only. Alternately, keep this repo on
>> >TRUNK all the time, and call "git pull" before a new commit
>> >2. apply the patch
>> >3. run mvn verify etc.
>> >4. update the CHANGELOG
>> >5. run git commit -a
>> >6. run git push
>> >
>> >this pushes the current updated commit to TRUNK on the remote repo. If
>>you
>> >commit directly from your dev branch on your dev repo, you have to tell
>> >git
>> >to apply to trunk or it will make a new alternate branch matching your
>>dev
>> >branch.
>> >
>> >I think this is the method for doing commits now. Hows this sound to
>>you
>> >folks?
>> >
>> >
>> >On Sun, Jan 13, 2013 at 9:50 AM, Eli Reisman (JIRA) <jira@apache.org>
>> >wrote:
>> >
>> >>
>> >>     [
>> >>
>> 
>>>>https://issues.apache.org/jira/browse/GIRAPH-474?page=com.atlassian.jir
>>>>a
>> .
>> 
>>>>plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13552260
>>>>#c
>> >>omment-13552260]
>> >>
>> >> Eli Reisman commented on GIRAPH-474:
>> >> ------------------------------------
>> >>
>> >> Hey Maja, try a 'git branch -a' in your Giraph repo, something went
>> >>wrong
>> >> with this commit, it seems to be on its own branch or something.
>> >>
>> >>
>> >> > Add an option not to use direct byte buffers
>> >> > --------------------------------------------
>> >> >
>> >> >                 Key: GIRAPH-474
>> >> >                 URL:
>>https://issues.apache.org/jira/browse/GIRAPH-474
>> >> >             Project: Giraph
>> >> >          Issue Type: Improvement
>> >> >            Reporter: Maja Kabiljo
>> >> >            Assignee: Maja Kabiljo
>> >> >         Attachments: GIRAPH-474.patch, GIRAPH-474.patch
>> >> >
>> >> >
>> >> > Using direct byte buffers makes it harder to control the memory
>>used
>> >>by
>> >> giraph. It's a bit faster than regular buffers though (from some
>> >> experiments I run the difference was about 10%), so I am adding it
>>as an
>> >> option.
>> >>
>> >> --
>> >> This message is automatically generated by JIRA.
>> >> If you think it was sent incorrectly, please contact your JIRA
>> >> administrators
>> >> For more information on JIRA, see:
>> >>http://www.atlassian.com/software/jira
>> >>
>>
>>


Mime
View raw message