[
https://issues.apache.org/jira/browse/PIG-5132?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15878265#comment-15878265
]
Adam Szita commented on PIG-5132:
---------------------------------
[~kellyzly] I see you have committed your patch (PIG-5132.2.patch). I think
we'll be better off reverting this commit as the patch contains a lot of errors.
Some examples:
1. XPathTest#testExecTupleWithDontIgnoreNamespace is present 3 times
2. XPathTest#testFunctionInXPath is present 2 times
3. Random whitespaces came into NonFSLoadFunc:21 and :22
..etc
It seems like tests can not even be built (*ant clean jar test*) because
shims/test/hadoop2 folder doesn't exist.
This is because some missing SVN add/mv/rm commands have to be run as well.
I think the following steps should be taken after reverting the last commit:
{code}
#my patch was generated using git diff HEAD~ --full-index --binary so it has
every piece, no need to download anything else, just use git apply instead of
patch
git apply PIG-5132.1.patch
git apply PIG-5132.1_fixes.patch
#let's check if everything is okay:
ant clean jar pigunit-jar
ant clean jar -f contrib/piggybank/java/build.xml
#delete build files before committing to svn
ant clean
ant clean -f contrib/piggybank/java/build.xml
#svn rm files that were deleted
svn rm
contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java
svn rm
contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestHadoopJobHistoryLoader.java
svn rm
shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
svn rm
shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
svn rm
shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
svn rm shims/src/hadoop20/org/apache/pig/backend/hadoop20/PigJobControl.java
svn rm shims/src/hadoop23/org/apache/hadoop/mapred/DowngradeHelper.java
svn rm
shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapBase.java
svn rm
shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
svn rm
shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
svn rm shims/src/hadoop23/org/apache/pig/backend/hadoop23/PigJobControl.java
svn rm shims/test/hadoop20/org/apache/pig/test/MiniCluster.java
svn rm shims/test/hadoop20/org/apache/pig/test/SparkMiniCluster.java
svn rm shims/test/hadoop20/org/apache/pig/test/TezMiniCluster.java
svn rm shims/test/hadoop23/org/apache/pig/test/MiniCluster.java
svn rm shims/test/hadoop23/org/apache/pig/test/SparkMiniCluster.java
svn rm shims/test/hadoop23/org/apache/pig/test/TezMiniCluster.java
svn rm
src/META-INF/services/org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider
svn rm src/docs/jdiff/pig_0.15.0.xml
svn rm
src/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaConstantBooleanObjectInspector.java
svn rm
src/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaConstantDoubleObjectInspector.java
svn rm
src/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaConstantFloatObjectInspector.java
svn rm
src/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaConstantIntObjectInspector.java
svn rm
src/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaConstantLongObjectInspector.java
svn rm
src/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaConstantStringObjectInspector.java
svn rm test/e2e/pig/lib/hadoop-0.23.0-streaming.jar
svn rm test/excluded-tests-20
svn rm test/org/apache/pig/test/data/GoldenFiles/tez/TEZC-LoadStore-2-JDK7.gld
#recursively add every new file/folder (this is why we have to ant clean some
steps above)
svn add .
#finally commit
svn commit
{code}
> 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: PIG-5132.1_fixes.patch, PIG-5132.1.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)
