[
https://issues.apache.org/jira/browse/PIG-5132?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15880198#comment-15880198
]
Adam Szita commented on PIG-5132:
---------------------------------
[~kellyzly]: there are still a lot of differences that your patch doesn't have.
I only listed some examples before, not the whole list, see
[^diffOfPatches.png].
Here:
-blue means diff in the file
-black denotes missing files from your side
-green means files that should be deleted but are still present on your side
You can see that throughout ivy, documentation, hadoop-streaming and other
locations there is still differences to be pulled from trunk into your patch.
So your recent patch (PIG-5132.2.fix.patch) only fixes 4 problems and I don't
think it is worth to fix every little issue one-by-one manually.
I still think you should revert the committed patch, and *git apply
PIG-5132.1.patch*. After this you have to *git apply PIG-5132.1_fixes.patch* as
I wrote in the steps above.
The reason why I placed two diffs is:
PIG-5132.1.patch: merge_from_trunk diff (but this is not necessarily results in
a build-able Pig code base)
PIG-5132.1_fixes.patch: takes care of necessary changes on spark branch side to
follow trunk properly (e.g. removing SparkMiniCluster.java from hadoop20,
moving SparkMiniCluster from hadoop23 under pig/test directory
If you apply these patches after each other (using git apply) hadoop20 and
hadoop23 dirs get removed from shims because git doesn't keep empty directory
structures.
> Merge from trunk (5) [Spark Branch]
> -----------------------------------
>
> Key: PIG-5132
> URL: https://issues.apache.org/jira/browse/PIG-5132
> Project: Pig
> Issue Type: Bug
> Components: spark
> Reporter: liyunzhang_intel
> Assignee: liyunzhang_intel
> Fix For: spark-branch
>
> Attachments: diffOfPatches.png, jenkins.5132.2.fix.PNG,
> PIG-5132.1_fixes.patch, PIG-5132.1.patch, PIG-5132.2.fix.patch,
> PIG-5132.2.zip, PIG-5132.patch
>
>
> merge changes from trunk to branch.
> the latest commit in trunk is
> 92df45d - (origin/trunk, origin/HEAD, trunk) PIG-5085: Support FLATTEN of
> maps (szita via rohini)
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
