Author: knoguchi
Date: Wed Sep 25 20:08:56 2024
New Revision: 1920931
URL: http://svn.apache.org/viewvc?rev=1920931&view=rev
Log:
PIG-5456: Upgrade Spark to 3.4.3 (knoguchi)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/bin/pig
pig/trunk/build.xml
pig/trunk/ivy.xml
pig/trunk/ivy/libraries.properties
pig/trunk/test/org/apache/pig/builtin/TestOrcStoragePushdown.java
pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java
pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java
pig/trunk/test/org/apache/pig/test/TestPredeployedJar.java
pig/trunk/test/org/apache/pig/test/TestPruneColumn.java
pig/trunk/test/org/apache/pig/test/TestSkewedJoin.java
pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java
pig/trunk/test/org/apache/pig/test/Util.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Sep 25 20:08:56 2024
@@ -28,6 +28,8 @@ PIG-5438: Update SparkCounter.Accumulato
PIG-5439: Support Spark 3 and drop SparkShim (knoguchi)
PIG-5455: Upgrade Hadoop to 3.3.6 and Tez to 0.10.3 (knoguchi)
+
+PIG-5456: Upgrade Spark to 3.4.3 (knoguchi)
OPTIMIZATIONS
Modified: pig/trunk/bin/pig
URL:
http://svn.apache.org/viewvc/pig/trunk/bin/pig?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/bin/pig (original)
+++ pig/trunk/bin/pig Wed Sep 25 20:08:56 2024
@@ -147,6 +147,20 @@ if [ "$PIG_HEAPSIZE" != "" ]; then
JAVA_HEAP_MAX="-Xmx""$PIG_HEAPSIZE""m"
fi
+EXPANDJAR="*.jar"
+# check spark version
+if [ "$isSparkMode" == "true" ]; then
+ # log4j2 jars only appears in spark3, spark2 does not include this jar,
+ # Using this jar to judge current spark version
+ LOG4J2JAR=`find $SPARK_HOME -name 'log4j-core-2*.jar'|wc -l`
+ if [ "$LOG4J2JAR" -eq 0 ];then
+ sparkversion="2"
+ else
+ sparkversion="3"
+ EXPANDJAR="!(reload4j*).*.jar"
+ fi
+fi
+
# CLASSPATH initially contains $PIG_CONF_DIR
CLASSPATH="${PIG_CONF_DIR}"
CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
@@ -239,7 +253,7 @@ IFS=
shopt -s extglob
shopt -s nullglob
-for f in $PIG_HOME/lib/*.jar; do
+for f in $PIG_HOME/lib/$EXPANDJAR; do
CLASSPATH=${CLASSPATH}:$f;
done
@@ -261,7 +275,7 @@ if [ -z "$JRUBY_JAR" ]; then
fi
fi
-for f in $PIG_HOME/share/pig/lib/*.jar; do
+for f in $PIG_HOME/share/pig/lib/$EXPANDJAR; do
CLASSPATH=${CLASSPATH}:$f;
done
@@ -380,7 +394,7 @@ fi
# For spark_local mode:
if [ "$isSparkLocalMode" == "true" ]; then
#SPARK_MASTER is forced to be "local" in spark_local mode
- SPARK_MASTER="local"
+ SPARK_MASTER="local"
for f in $PIG_HOME/lib/spark/*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
@@ -394,36 +408,13 @@ if [ "$isSparkMode" == "true" ]; then
echo "Error: SPARK_HOME is not set!"
exit 1
fi
- # spark-tags*.jar appears in spark2, spark1 does not include this jar, we
use this jar to judge current spark is spark1 or spark2.
- SPARK_TAG_JAR=`find $SPARK_HOME -name 'spark-tags*.jar'|wc -l`
- if [ "$SPARK_TAG_JAR" -eq 0 ];then
- sparkversion="1"
- fi
- if [ "$sparkversion" == "1" ]; then
- # Please specify SPARK_JAR which is the hdfs path of
spark-assembly*.jar to allow YARN to cache spark-assembly*.jar on nodes so that
it doesn't need to be distributed each time an application runs.
- if [ -z "$SPARK_JAR" ]; then
- echo "Error: SPARK_JAR is not set, SPARK_JAR stands for the hdfs
location of spark-assembly*.jar. This
- allows YARN to cache spark-assembly*.jar on nodes so that it doesn't
need to be distributed each time an application runs."
- exit 1
- fi
-
- if [ -n "$SPARK_HOME" ]; then
- echo "Using Spark Home: " ${SPARK_HOME}
- SPARK_ASSEMBLY_JAR=`ls ${SPARK_HOME}/lib/spark-assembly*`
- CLASSPATH=${CLASSPATH}:$SPARK_ASSEMBLY_JAR
- fi
- fi
-
- if [ "$sparkversion" == "2" ]; then
- if [ -n "$SPARK_HOME" ]; then
- echo "Using Spark Home: " ${SPARK_HOME}
- for f in $SPARK_HOME/jars/*.jar; do
- CLASSPATH=${CLASSPATH}:$f
- done
- fi
- fi
+ echo "Using Spark Home: " ${SPARK_HOME}
+ for f in $SPARK_HOME/jars/*.jar; do
+ CLASSPATH=${CLASSPATH}:$f
+ done
fi
+
#spark-assembly.jar contains jcl-over-slf4j which would create a LogFactory
implementation that is incompatible
if [ "$isSparkMode" == "true" ]; then
PIG_OPTS="$PIG_OPTS
-Dorg.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl"
@@ -457,7 +448,7 @@ if [ -n "$HADOOP_BIN" ]; then
exit 1
fi
- for f in $PIG_HOME/lib/h${HADOOP_VERSION}/*.jar; do
+ for f in $PIG_HOME/lib/h${HADOOP_VERSION}/$EXPANDJAR; do
CLASSPATH=${CLASSPATH}:$f;
done
@@ -489,12 +480,12 @@ else
exit 1
fi
- for f in $PIG_HOME/lib/h${HADOOP_VERSION}/*.jar; do
+ for f in $PIG_HOME/lib/h${HADOOP_VERSION}/$EXPANDJAR; do
CLASSPATH=${CLASSPATH}:$f;
done
# Add bundled hadoop jars
- for f in $PIG_HOME/lib/hadoop${HADOOP_VERSION}-runtime/*.jar; do
+ for f in $PIG_HOME/lib/hadoop${HADOOP_VERSION}-runtime/$EXPANDJAR; do
CLASSPATH=${CLASSPATH}:$f;
done
Modified: pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Wed Sep 25 20:08:56 2024
@@ -314,6 +314,20 @@
<property name="build.dir.eclipse-test-classes"
value="${test.build.classes}"/>
<!--property name="build.dir.eclipse-test-generated-classes"
value="${build.dir.eclipse}/classes-test-generated"/-->
+ <condition property="isSpark">
+ <equals arg1="${test.exec.type}" arg2="spark"/>
+ </condition>
+
+ <condition property="isSpark3">
+ <and>
+ <equals arg1="${test.exec.type}" arg2="spark"/>
+ <resourcecount when="greater"
count="0">
+ <fileset dir="${ivy.lib.dir.spark}" includes="spark*-3*.jar"/>
+ </resourcecount>
+ </and>
+ </condition>
+
+
<condition property="ant-eclipse.jar.exists">
<available file="${build.dir}/lib/ant-eclipse-1.0-jvm1.2.jar"/>
</condition>
@@ -373,24 +387,43 @@
<!-- Stuff needed by all targets -->
<!-- ====================================================== -->
<!-- setup the classpath -->
- <path id="classpath">
+ <path id="compileclasspath">
<fileset file="${ivy.lib.dir}/${zookeeper.jarfile}"/>
<fileset dir="${ivy.lib.dir}" includes="*.jar"/>
<fileset dir="${ivy.lib.dir.spark}" includes="*.jar"/>
</path>
+ <path id="runtimeclasspath">
+ <fileset file="${ivy.lib.dir}/${zookeeper.jarfile}"/>
+ <fileset dir="${ivy.lib.dir}">
+ <include name="*.jar"/>
+ <exclude name="reload4j*.jar" if="isSpark3"/>
+ </fileset>
+ <fileset dir="${ivy.lib.dir.spark}">
+ <include name="*.jar" if="isSpark"/>
+ </fileset>
+ </path>
<!-- javadoc-classpath -->
<path id="javadoc-classpath">
<path refid="javadoc.classpath"/>
</path>
- <path id="test.classpath">
+ <path id="test.compileclasspath">
+ <!-- need to put this first, otherwise junit-3 testcases can break -->
+ <pathelement location="${ivy.lib.dir}/junit-3.8.1.jar"/>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${test.src.dir}"/>
+ <pathelement location="${piggybank.jarfile}"/>
+ <path refid="compileclasspath"/>
+ </path>
+
+ <path id="test.runtimeclasspath">
<!-- need to put this first, otherwise junit-3 testcases can break -->
<pathelement location="${ivy.lib.dir}/junit-3.8.1.jar"/>
<pathelement location="${build.classes}"/>
<pathelement location="${test.src.dir}"/>
<pathelement location="${piggybank.jarfile}"/>
- <path refid="classpath"/>
+ <path refid="runtimeclasspath"/>
</path>
<fileset dir="${ivy.lib.dir}" id="core.dependencies.jar">
@@ -530,7 +563,7 @@
unless="lexerGrammarProcessed"
description="generates lexer class from an ANTLR grammar">
<java classname="org.antlr.Tool"
- classpathref="classpath" fork="true" failonerror="true">
+ classpathref="compileclasspath" fork="true" failonerror="true">
<arg line="-o ${src.gen.dir}/${grammar.package.dir}
${src.dir}/${grammar.package.dir}/${grammar.name}Lexer.g"/>
</java>
</target>
@@ -539,7 +572,7 @@
unless="parserGrammarProcessed"
description="generates token parser class from an ANTLR grammar">
<java classname="org.antlr.Tool"
- classpathref="classpath" fork="true" failonerror="true">
+ classpathref="compileclasspath" fork="true" failonerror="true">
<arg line="-o ${src.gen.dir}/${grammar.package.dir}
${src.dir}/${grammar.package.dir}/${grammar.name}Parser.g"/>
</java>
</target>
@@ -548,7 +581,7 @@
unless="treeGrammarProcessed"
description="generates tree parser class from an ANTLR grammar">
<java classname="org.antlr.Tool"
- classpathref="classpath" fork="true" failonerror="true">
+ classpathref="compileclasspath" fork="true" failonerror="true">
<arg line="-o ${src.gen.dir}/${grammar.package.dir}
${src.dir}/${grammar.package.dir}/AstPrinter.g
${src.dir}/${grammar.package.dir}/AliasMasker.g
${src.dir}/${grammar.package.dir}/AstValidator.g
${src.dir}/${grammar.package.dir}/LogicalPlanGenerator.g"/>
</java>
</target>
@@ -576,7 +609,7 @@
<echo>*** Else, you will only be warned about deprecations ***</echo>
<echo>*** Hadoop version used: ${hadoopversion} ; HBase version used:
${hbaseversion} ; Spark version used: ${sparkversion} ; Hive version used:
${hiveversion} ***</echo>
<compileSources
sources="${src.dir};${src.gen.dir};${src.lib.dir}/bzip2;${src.shims.dir};${src.hive.shims.dir}"
- excludes="${src.exclude.dir}" dist="${build.classes}"
cp="classpath" warnings="${javac.args.warnings}" />
+ excludes="${src.exclude.dir}" dist="${build.classes}"
cp="compileclasspath" warnings="${javac.args.warnings}" />
<copy todir="${build.classes}/META-INF">
<fileset dir="${src.dir}/META-INF" includes="**"/>
</copy>
@@ -588,7 +621,7 @@
<echo>*** Else, you will only be warned about deprecations ***</echo>
<compileSources sources="${test.src.dir};${src.shims.test.dir}"
excludes="**/PigTestLoader.java **/resources/** perf/**
${src.exclude.dir}"
- dist="${test.build.classes}" cp="test.classpath"
warnings="${javac.args.warnings}" />
+ dist="${test.build.classes}" cp="test.compileclasspath"
warnings="${javac.args.warnings}" />
<copy file="${basedir}/test/hbase-site.xml"
tofile="${test.build.classes}/hbase-site.xml"/>
<ivy:cachepath pathid="mr-apps-test-ivy.classpath" conf="test" />
<path id="mr-apps-test.classpath">
@@ -994,7 +1027,7 @@
<pathelement location="${test.build.classes}" />
<pathelement location="." />
<pathelement path="${clover.jar}"/>
- <path refid="test.classpath"/>
+ <path refid="test.runtimeclasspath"/>
</classpath>
<formatter type="${test.junit.output.format}" />
Modified: pig/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Wed Sep 25 20:08:56 2024
@@ -672,7 +672,16 @@
<exclude org="io.netty" module="netty"/>
<exclude org="io.netty" name="netty-all"/>
<exclude org="com.google.protobuf" name="protobuf-java" />
+ <exclude org="org.apache.logging.log4j" name="log4j-core" />
+ <exclude org="org.apache.logging.log4j" name="log4j-slf4j2-impl" />
+ <exclude org="org.apache.logging.log4j" name="log4j-api" />
+ <exclude org="org.apache.logging.log4j" name="log4j-1.2-api" />
</dependency>
+ <dependency org="org.apache.logging.log4j" name="log4j-core"
rev="2.23.1" conf="spark3->default"/>
+ <dependency org="org.apache.logging.log4j" name="log4j-slf4j2-impl"
rev="2.23.1" conf="spark3->default"/>
+ <dependency org="org.apache.logging.log4j" name="log4j-api"
rev="2.23.1" conf="spark3->default"/>
+ <dependency org="org.apache.logging.log4j" name="log4j-1.2-api"
rev="2.23.1" conf="spark3->default"/>
+
<dependency org="org.apache.spark"
name="spark-yarn_${spark3-scala.version}" rev="${spark3.version}"
conf="spark3->default">
<exclude org="org.apache.hadoop" />
<exclude org="com.google.protobuf" name="protobuf-java" />
Modified: pig/trunk/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Wed Sep 25 20:08:56 2024
@@ -68,7 +68,7 @@ reload4j.version=1.2.24
spark2.version=2.4.8
spark2-scala.version=2.11
jackson-module-scala_spark2.version=2.9.10
-spark3.version=3.2.4
+spark3.version=3.4.3
spark3-scala.version=2.12
jackson-module-scala_spark3.version=2.12.7
xerces.version=2.10.0
Modified: pig/trunk/test/org/apache/pig/builtin/TestOrcStoragePushdown.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/builtin/TestOrcStoragePushdown.java?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/builtin/TestOrcStoragePushdown.java (original)
+++ pig/trunk/test/org/apache/pig/builtin/TestOrcStoragePushdown.java Wed Sep
25 20:08:56 2024
@@ -34,7 +34,7 @@ import org.apache.hadoop.hive.ql.io.sarg
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.PatternLayout;
import org.apache.pig.Expression;
import org.apache.pig.Expression.OpType;
import org.apache.pig.PigServer;
@@ -112,7 +112,7 @@ public class TestOrcStoragePushdown {
Logger logger = Logger.getLogger(ColumnPruneVisitor.class);
logger.removeAllAppenders();
logger.setLevel(Level.INFO);
- SimpleLayout layout = new SimpleLayout();
+ PatternLayout layout = new PatternLayout();
logFile = File.createTempFile("log", "");
FileAppender appender = new FileAppender(layout, logFile.toString(),
false, false, 0);
logger.addAppender(appender);
Modified: pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestAutoLocalMode.java Wed Sep 25
20:08:56 2024
@@ -32,7 +32,7 @@ import java.util.Random;
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.PatternLayout;
import org.apache.pig.ExecType;
import org.apache.pig.PigConfiguration;
import org.apache.pig.PigServer;
@@ -103,7 +103,7 @@ public class TestAutoLocalMode {
Logger logger = Logger.getLogger(JobControlCompiler.class);
logger.removeAllAppenders();
logger.setLevel(Level.INFO);
- SimpleLayout layout = new SimpleLayout();
+ PatternLayout layout = new PatternLayout();
logFile = File.createTempFile("log", "");
FileAppender appender = new FileAppender(layout, logFile.toString(),
false, false, 0);
logger.addAppender(appender);
Modified: pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java Wed Sep 25
20:08:56 2024
@@ -40,7 +40,7 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.log4j.Appender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.PatternLayout;
import org.apache.log4j.WriterAppender;
import org.apache.pig.ComparisonFunc;
import org.apache.pig.EvalFunc;
@@ -1274,7 +1274,7 @@ public class TestEvalPipelineLocal {
Logger logger = Logger.getRootLogger();
logger.setLevel(Level.INFO);
- SimpleLayout layout = new SimpleLayout();
+ PatternLayout layout = new PatternLayout();
Appender appender = new WriterAppender(layout, new PrintStream(bos));
logger.addAppender(appender);
Modified: pig/trunk/test/org/apache/pig/test/TestPredeployedJar.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPredeployedJar.java?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPredeployedJar.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPredeployedJar.java Wed Sep 25
20:08:56 2024
@@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.PatternLayout;
import org.apache.pig.ExecType;
import org.apache.pig.PigConfiguration;
import org.apache.pig.PigServer;
@@ -48,7 +48,7 @@ public class TestPredeployedJar {
Logger logger = Logger.getLogger(JobControlCompiler.class);
logger.removeAllAppenders();
logger.setLevel(Level.INFO);
- SimpleLayout layout = new SimpleLayout();
+ PatternLayout layout = new PatternLayout();
File logFile = File.createTempFile("log", "");
FileAppender appender = new FileAppender(layout, logFile.toString(),
false, false, 0);
logger.addAppender(appender);
Modified: pig/trunk/test/org/apache/pig/test/TestPruneColumn.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPruneColumn.java?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPruneColumn.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPruneColumn.java Wed Sep 25 20:08:56
2024
@@ -45,7 +45,7 @@ import org.apache.hadoop.mapreduce.lib.i
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.PatternLayout;
import org.apache.pig.FilterFunc;
import org.apache.pig.LoadFunc;
import org.apache.pig.LoadPushDown;
@@ -105,7 +105,7 @@ public class TestPruneColumn {
Logger logger = Logger.getLogger(ColumnPruneVisitor.class);
logger.removeAllAppenders();
logger.setLevel(Level.INFO);
- SimpleLayout layout = new SimpleLayout();
+ PatternLayout layout = new PatternLayout();
logFile = File.createTempFile("log", "");
FileAppender appender = new FileAppender(layout, logFile.toString(),
false, false, 0);
logger.addAppender(appender);
Modified: pig/trunk/test/org/apache/pig/test/TestSkewedJoin.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestSkewedJoin.java?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestSkewedJoin.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestSkewedJoin.java Wed Sep 25 20:08:56
2024
@@ -42,7 +42,7 @@ import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.PatternLayout;
import org.apache.pig.PigServer;
import org.apache.pig.data.BagFactory;
import org.apache.pig.data.DataBag;
@@ -573,7 +573,7 @@ public class TestSkewedJoin {
String logFile = Util.createTempFileDelOnExit("tmp",
".log").getAbsolutePath();
Logger logger = Logger.getLogger("org.apache.pig");
logger.setLevel(Level.INFO);
- SimpleLayout layout = new SimpleLayout();
+ PatternLayout layout = new PatternLayout();
FileAppender appender = new FileAppender(layout, logFile.toString(),
false, false, 0);
logger.addAppender(appender);
Modified: pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestTmpFileCompression.java Wed Sep 25
20:08:56 2024
@@ -36,7 +36,7 @@ import org.apache.hadoop.mapreduce.lib.i
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.PatternLayout;
import org.apache.pig.PigConfiguration;
import org.apache.pig.PigRunner;
import org.apache.pig.PigServer;
@@ -71,7 +71,7 @@ public class TestTmpFileCompression {
Logger logger = Logger.getLogger(clazz);
logger.removeAllAppenders();
logger.setLevel(Level.DEBUG);
- SimpleLayout layout = new SimpleLayout();
+ PatternLayout layout = new PatternLayout();
logFile = File.createTempFile("log", "");
FileAppender appender = new FileAppender(layout, logFile.toString(),
false, false, 0);
Modified: pig/trunk/test/org/apache/pig/test/Util.java
URL:
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/Util.java?rev=1920931&r1=1920930&r2=1920931&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/Util.java (original)
+++ pig/trunk/test/org/apache/pig/test/Util.java Wed Sep 25 20:08:56 2024
@@ -59,7 +59,6 @@ import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
-import org.apache.log4j.SimpleLayout;
import org.apache.log4j.WriterAppender;
import org.apache.pig.ExecType;
import org.apache.pig.ExecTypeProvider;
@@ -1111,7 +1110,7 @@ public class Util {
Logger logger = Logger.getLogger(clazz);
logger.removeAllAppenders();
logger.setLevel(Level.DEBUG);
- SimpleLayout layout = new SimpleLayout();
+ PatternLayout layout = new PatternLayout();
File newLogFile = File.createTempFile("log", "");
FileAppender appender = new FileAppender(layout, newLogFile.toString(),
false, false, 0);
