From 5105b728dafa821d6063af97cfad0f49f029726a Mon Sep 17 00:00:00 2001 From: Imran Rashid Date: Fri, 15 Sep 2017 14:41:06 -0500 Subject: [PATCH] revert unintended changes --- .../parquet/ParquetFileFormat.scala | 3 +-- sql/hive/src/test/resources/log4j.properties | 21 ++----------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala index 3340e0bb193b7..e1e740500205a 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala @@ -42,11 +42,10 @@ import org.apache.parquet.schema.MessageType import org.apache.spark.{SparkException, TaskContext} import org.apache.spark.internal.Logging import org.apache.spark.sql._ -import org.apache.spark.sql.catalyst.{InternalRow, TableIdentifier} +import org.apache.spark.sql.catalyst.InternalRow import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.codegen.GenerateUnsafeProjection import org.apache.spark.sql.catalyst.parser.LegacyTypeStringParser -import org.apache.spark.sql.catalyst.util.DateTimeUtils import org.apache.spark.sql.execution.datasources._ import org.apache.spark.sql.execution.vectorized.OnHeapColumnVector import org.apache.spark.sql.internal.SQLConf diff --git a/sql/hive/src/test/resources/log4j.properties b/sql/hive/src/test/resources/log4j.properties index c334d24a11b76..a48ae9fc5edd8 100644 --- a/sql/hive/src/test/resources/log4j.properties +++ b/sql/hive/src/test/resources/log4j.properties @@ -16,19 +16,13 @@ # # Set everything to be logged to the file core/target/unit-tests.log -log4j.rootLogger=WARN, CA, FA +log4j.rootLogger=DEBUG, CA, FA #Console Appender log4j.appender.CA=org.apache.log4j.ConsoleAppender log4j.appender.CA.layout=org.apache.log4j.PatternLayout log4j.appender.CA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %p %c: %m%n -#log4j.appender.CA.Threshold = WARN -#log4j.logger=WARN, CA -#log4j.logger.org=WARN, CA -#log4j.logger.com=WARN, CA -#log4j.logger.io=WARN, CA -#log4j.logger.sun=WARN, CA -#log4j.logger.akka=WARN, CA +log4j.appender.CA.Threshold = WARN #File Appender @@ -38,17 +32,6 @@ log4j.appender.FA.file=target/unit-tests.log log4j.appender.FA.layout=org.apache.log4j.PatternLayout log4j.appender.FA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %t %p %c{1}: %m%n - -# to get more logs, have to turn off Threshold line -# log4j.logger.org.apache.spark.sql.catalyst.expressions.codegen=DEBUG -# log4j.logger.org.apache.spark.sql.execution.WholeStageCodegenExec=DEBUG -# log4j.logger.org.apache.spark.sql.execution.ParquetTimeZoneCorrection=DEBUG -# analyzer -# log4j.logger.org.apache.spark.sql.hive.HiveSessionStateBuilder$$anon$1=TRACE -# optimizer -#log4j.logger.org.apache.spark.sql.internal.BaseSessionStateBuilder$$anon$2=TRACE - - # Set the logger level of File Appender to WARN log4j.appender.FA.Threshold = DEBUG