You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/05/26 09:43:04 UTC
svn commit: r1597524 - in /pig/branches/tez: bin/pig bin/pig.cmd bin/pig.py
build.xml src/org/apache/pig/tools/pigstats/tez/TezStats.java
src/org/apache/pig/tools/pigstats/tez/TezTaskStats.java
Author: daijy
Date: Mon May 26 07:43:03 2014
New Revision: 1597524
URL: http://svn.apache.org/r1597524
Log:
Merge latest trunk changes (make Pig compile after PIG-3913, plus 2 missing patches on trunk)
Modified:
pig/branches/tez/bin/pig
pig/branches/tez/bin/pig.cmd
pig/branches/tez/bin/pig.py
pig/branches/tez/build.xml
pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezStats.java
pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezTaskStats.java
Modified: pig/branches/tez/bin/pig
URL: http://svn.apache.org/viewvc/pig/branches/tez/bin/pig?rev=1597524&r1=1597523&r2=1597524&view=diff
==============================================================================
--- pig/branches/tez/bin/pig (original)
+++ pig/branches/tez/bin/pig Mon May 26 07:43:03 2014
@@ -156,10 +156,10 @@ if [ "$includeHCatalog" == "true" ]; the
# hcatalog jar name for 0.4 and earlier
hcatJarOld=hcatalog-*.jar
- # hcatalog jar name for 0.5
- hcatJar=hcatalog-core-*.jar
- hbaseHCatJar=hbase-storage-handler-*.jar
- pigHCatJar=hcatalog-pig-adapter-*.jar
+ # hcatalog jar name for 0.5 and newer
+ hcatJar=*hcatalog-core-*.jar
+ hbaseHCatJar=*hbase-storage-handler-*.jar
+ pigHCatJar=*hcatalog-pig-adapter-*.jar
if [ "$HCAT_HOME" == "" ]; then
if [ -d "/usr/lib/hcatalog" ]; then
HCAT_HOME=/usr/lib/hcatalog
Modified: pig/branches/tez/bin/pig.cmd
URL: http://svn.apache.org/viewvc/pig/branches/tez/bin/pig.cmd?rev=1597524&r1=1597523&r2=1597524&view=diff
==============================================================================
--- pig/branches/tez/bin/pig.cmd (original)
+++ pig/branches/tez/bin/pig.cmd Mon May 26 07:43:03 2014
@@ -118,7 +118,7 @@ set PIGARGS=
)
if defined HCAT_HOME (
- call :AddJar %HCAT_HOME%\share\hcatalog hcatalog-*.jar
+ call :AddJar %HCAT_HOME%\share\hcatalog *hcatalog-*.jar
) else (
echo "HCAT_HOME should be defined"
exit /b 1
Modified: pig/branches/tez/bin/pig.py
URL: http://svn.apache.org/viewvc/pig/branches/tez/bin/pig.py?rev=1597524&r1=1597523&r2=1597524&view=diff
==============================================================================
--- pig/branches/tez/bin/pig.py (original)
+++ pig/branches/tez/bin/pig.py Mon May 26 07:43:03 2014
@@ -180,7 +180,7 @@ if includeHCatalog == True:
else:
sys.exit("Please initialize HCAT_HOME to the hcatalog install directory")
- hcatJars = glob.glob(os.path.join(hcatHome, "share", "hcatalog", "hcatalog-*.jar"))
+ hcatJars = glob.glob(os.path.join(hcatHome, "share", "hcatalog", "*hcatalog-*.jar"))
found = False
for hcatJar in hcatJars:
if hcatJar.find("server") != -1:
Modified: pig/branches/tez/build.xml
URL: http://svn.apache.org/viewvc/pig/branches/tez/build.xml?rev=1597524&r1=1597523&r2=1597524&view=diff
==============================================================================
--- pig/branches/tez/build.xml (original)
+++ pig/branches/tez/build.xml Mon May 26 07:43:03 2014
@@ -1700,7 +1700,9 @@
<target name="published" depends="ivy-publish-local, maven-artifacts"/>
<target name="piggybank" depends="jar">
- <ant antfile="contrib/piggybank/java/build.xml" inheritAll="false"/>
+ <ant antfile="contrib/piggybank/java/build.xml" inheritAll="false">
+ <propertyset id="hadoop"> <propertyref name="hadoopversion"/> </propertyset>
+ </ant>
</target>
<target name="zebra" depends="jar">
Modified: pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezStats.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezStats.java?rev=1597524&r1=1597523&r2=1597524&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezStats.java (original)
+++ pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezStats.java Mon May 26 07:43:03 2014
@@ -146,7 +146,6 @@ public class TezStats extends PigStats {
sb.append("\n");
// Print diagnostic info in case of failure
- boolean isLocal = pigContext.getExecType().isLocal();
if (returnCode == ReturnCode.FAILURE
|| returnCode == ReturnCode.PARTIAL_FAILURE) {
if (errorMessage != null) {
@@ -168,12 +167,12 @@ public class TezStats extends PigStats {
sb.append("Input(s):\n");
for (InputStats is : getInputStats()) {
- sb.append(is.getDisplayString(isLocal).trim()).append("\n");
+ sb.append(is.getDisplayString().trim()).append("\n");
}
sb.append("\n");
sb.append("Output(s):\n");
for (OutputStats os : getOutputStats()) {
- sb.append(os.getDisplayString(isLocal).trim()).append("\n");
+ sb.append(os.getDisplayString().trim()).append("\n");
}
LOG.info("Script Statistics:\n" + sb.toString());
}
Modified: pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezTaskStats.java
URL: http://svn.apache.org/viewvc/pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezTaskStats.java?rev=1597524&r1=1597523&r2=1597524&view=diff
==============================================================================
--- pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezTaskStats.java (original)
+++ pig/branches/tez/src/org/apache/pig/tools/pigstats/tez/TezTaskStats.java Mon May 26 07:43:03 2014
@@ -54,7 +54,7 @@ public class TezTaskStats extends JobSta
}
@Override
- public String getDisplayString(boolean isLocal) {
+ public String getDisplayString() {
StringBuilder sb = new StringBuilder();
sb.append(String.format("%1$20s: %2$-100s%n", "VertexName", vertexName));
if (getAlias() != null && !getAlias().isEmpty()) {