PARQUET-401: Deprecate Log and move to SLF4J Logger

parquet-avro/src/test/java/org/apache/parquet/avro/TestInputOutputFormat.java

@@ -36,14 +36,16 @@
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
 import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
 import org.junit.Test;
-import org.apache.parquet.Log;
 
 import static java.lang.Thread.sleep;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class TestInputOutputFormat {
-  private static final Log LOG = Log.getLog(TestInputOutputFormat.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(TestInputOutputFormat.class);
 
   private static Schema avroSchema;
   static {
@@ -132,10 +134,10 @@ public void testReadWrite() throws Exception {
   private void waitForJob(Job job) throws Exception {
     job.submit();
     while (!job.isComplete()) {
-      LOG.debug("waiting for job " + job.getJobName());
+      LOGGER.debug("waiting for job {}", job.getJobName());
       sleep(100);
     }
-    LOG.info("status for job " + job.getJobName() + ": " + (job.isSuccessful() ? "SUCCESS" : "FAILURE"));
+    LOGGER.info("status for job {}: {}", job.getJobName(), job.isSuccessful() ? "SUCCESS" : "FAILURE");
     if (!job.isSuccessful()) {
       throw new RuntimeException("job failed " + job.getJobName());
     }

parquet-avro/src/test/java/org/apache/parquet/avro/TestReflectInputOutputFormat.java

@@ -37,7 +37,6 @@
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
-import org.apache.parquet.Log;
 import org.apache.parquet.column.ColumnReader;
 import org.apache.parquet.filter.ColumnPredicates;
 import org.apache.parquet.filter.ColumnRecordFilter;
@@ -54,9 +53,11 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class TestReflectInputOutputFormat {
-  private static final Log LOG = Log.getLog(TestReflectInputOutputFormat.class);
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+public class TestReflectInputOutputFormat {
+  private static final Logger LOGGER = LoggerFactory.getLogger(TestReflectInputOutputFormat.class);
 
   public static class Service {
     private long date;
@@ -477,10 +478,10 @@ public void testReadWriteChangedCar() throws Exception {
   private void waitForJob(Job job) throws Exception {
     job.submit();
     while (!job.isComplete()) {
-      LOG.debug("waiting for job " + job.getJobName());
+      LOGGER.debug("waiting for job {}", job.getJobName());
       sleep(100);
     }
-    LOG.info("status for job " + job.getJobName() + ": " + (job.isSuccessful() ? "SUCCESS" : "FAILURE"));
+    LOGGER.info("status for job {}: {}", job.getJobName(), job.isSuccessful() ? "SUCCESS" : "FAILURE");
     if (!job.isSuccessful()) {
       throw new RuntimeException("job failed " + job.getJobName());
     }

parquet-avro/src/test/java/org/apache/parquet/avro/TestSpecificInputOutputFormat.java

@@ -39,15 +39,17 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.parquet.Log;
 import org.apache.parquet.column.ColumnReader;
 import org.apache.parquet.filter.ColumnPredicates;
 import org.apache.parquet.filter.ColumnRecordFilter;
 import org.apache.parquet.filter.RecordFilter;
 import org.apache.parquet.filter.UnboundRecordFilter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class TestSpecificInputOutputFormat {
-  private static final Log LOG = Log.getLog(TestSpecificInputOutputFormat.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(TestSpecificInputOutputFormat.class);
 
   public static Car nextRecord(int i) {
     String vin = "1VXBR12EXCP000000";
@@ -268,10 +270,10 @@ public void testReadWriteChangedCar() throws Exception {
   private void waitForJob(Job job) throws Exception {
     job.submit();
     while (!job.isComplete()) {
-      LOG.debug("waiting for job " + job.getJobName());
+      LOGGER.debug("waiting for job {}", job.getJobName());
       sleep(100);
     }
-    LOG.info("status for job " + job.getJobName() + ": " + (job.isSuccessful() ? "SUCCESS" : "FAILURE"));
+    LOGGER.info("status for job {}: {}", job.getJobName(), job.isSuccessful() ? "SUCCESS" : "FAILURE");
     if (!job.isSuccessful()) {
       throw new RuntimeException("job failed " + job.getJobName());
     }

parquet-column/src/main/java/org/apache/parquet/CorruptDeltaByteArrays.java

@@ -21,8 +21,11 @@
 import org.apache.parquet.VersionParser.ParsedVersion;
 import org.apache.parquet.column.Encoding;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class CorruptDeltaByteArrays {
-  private static final Log LOG = Log.getLog(CorruptStatistics.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(CorruptStatistics.class);
 
   private static final SemanticVersion PARQUET_246_FIXED_VERSION =
       new SemanticVersion(1, 8, 0);
@@ -42,8 +45,8 @@ public static boolean requiresSequentialReads(ParsedVersion version, Encoding en
     }
 
     if (!version.hasSemanticVersion()) {
-      LOG.warn("Requiring sequential reads because created_by did not " +
-          "contain a valid version (see PARQUET-246): " + version.version);
+      LOGGER.warn("Requiring sequential reads because created_by did not " +
+          "contain a valid version (see PARQUET-246): {}", version.version);
       return true;
     }
 
@@ -60,8 +63,8 @@ public static boolean requiresSequentialReads(SemanticVersion semver, Encoding e
     }
 
     if (semver.compareTo(PARQUET_246_FIXED_VERSION) < 0) {
-      LOG.info("Requiring sequential reads because this file was created " +
-          "prior to " + PARQUET_246_FIXED_VERSION + ". See PARQUET-246" );
+      LOGGER.info("Requiring sequential reads because this file was created " +
+          "prior to {}. See PARQUET-246", PARQUET_246_FIXED_VERSION);
       return true;
     }
 
@@ -75,7 +78,7 @@ public static boolean requiresSequentialReads(String createdBy, Encoding encodin
     }
 
     if (Strings.isNullOrEmpty(createdBy)) {
-      LOG.info("Requiring sequential reads because file version is empty. " +
+      LOGGER.info("Requiring sequential reads because file version is empty. " +
           "See PARQUET-246");
       return true;
     }
@@ -93,7 +96,7 @@ public static boolean requiresSequentialReads(String createdBy, Encoding encodin
   }
 
   private static void warnParseError(String createdBy, Throwable e) {
-    LOG.warn("Requiring sequential reads because created_by could not be " +
-        "parsed (see PARQUET-246): " + createdBy, e);
+    LOGGER.warn("Requiring sequential reads because created_by could not be " +
+        "parsed (see PARQUET-246): {}", createdBy, e);
   }
 }

parquet-column/src/main/java/org/apache/parquet/CorruptStatistics.java

@@ -25,6 +25,9 @@
 import org.apache.parquet.VersionParser.VersionParseException;
 import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * There was a bug (PARQUET-251) that caused the statistics metadata
  * for binary columns to be corrupted in the write path.
@@ -35,7 +38,7 @@
 public class CorruptStatistics {
   private static final AtomicBoolean alreadyLogged = new AtomicBoolean(false);
 
-  private static final Log LOG = Log.getLog(CorruptStatistics.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(CorruptStatistics.class);
 
   // the version in which the bug described by jira: PARQUET-251 was fixed
   // the bug involved writing invalid binary statistics, so stats written prior to this
@@ -108,13 +111,13 @@ public static boolean shouldIgnoreStatistics(String createdBy, PrimitiveTypeName
 
   private static void warnParseErrorOnce(String createdBy, Throwable e) {
     if(!alreadyLogged.getAndSet(true)) {
-      LOG.warn("Ignoring statistics because created_by could not be parsed (see PARQUET-251): " + createdBy, e);
+      LOGGER.warn("Ignoring statistics because created_by could not be parsed (see PARQUET-251): {}", createdBy, e);
     }
   }
 
   private static void warnOnce(String message) {
     if(!alreadyLogged.getAndSet(true)) {
-      LOG.warn(message);
+      LOGGER.warn(message);
     }
   }
 }

parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnReaderImpl.java

@@ -19,7 +19,6 @@
 package org.apache.parquet.column.impl;
 
 import static java.lang.String.format;
-import static org.apache.parquet.Log.DEBUG;
 import static org.apache.parquet.Preconditions.checkNotNull;
 import static org.apache.parquet.column.ValuesType.DEFINITION_LEVEL;
 import static org.apache.parquet.column.ValuesType.REPETITION_LEVEL;
@@ -30,7 +29,6 @@
 import java.nio.ByteBuffer;
 
 import org.apache.parquet.CorruptDeltaByteArrays;
-import org.apache.parquet.Log;
 import org.apache.parquet.VersionParser.ParsedVersion;
 import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.bytes.BytesUtils;
@@ -52,14 +50,17 @@
 import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
 import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeNameConverter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * ColumnReader implementation
  *
  * @author Julien Le Dem
  *
  */
 public class ColumnReaderImpl implements ColumnReader {
-  private static final Log LOG = Log.getLog(ColumnReaderImpl.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(ColumnReaderImpl.class);
 
   /**
    * binds the lower level page decoder to the record converter materializing the records
@@ -523,7 +524,7 @@ private void readRepetitionAndDefinitionLevels() {
   private void checkRead() {
     if (isPageFullyConsumed()) {
       if (isFullyConsumed()) {
-        if (DEBUG) LOG.debug("end reached");
+        LOGGER.debug("end reached");
         repetitionLevel = 0; // the next repetition level
         return;
       }
@@ -533,7 +534,7 @@ private void checkRead() {
   }
 
   private void readPage() {
-    if (DEBUG) LOG.debug("loading page");
+    LOGGER.debug("loading page");
     DataPage page = pageReader.readPage();
     page.accept(new DataPage.Visitor<Void>() {
       @Override
@@ -590,14 +591,14 @@ private void readPageV1(DataPageV1 page) {
     this.definitionLevelColumn = new ValuesReaderIntIterator(dlReader);
     try {
       ByteBuffer bytes = page.getBytes().toByteBuffer();
-      if (DEBUG) LOG.debug("page size " + bytes.remaining() + " bytes and " + pageValueCount + " records");
-      if (DEBUG) LOG.debug("reading repetition levels at 0");
+      LOGGER.debug("page size {} bytes and {} records", bytes.remaining(), pageValueCount);
+      LOGGER.debug("reading repetition levels at 0");
       rlReader.initFromPage(pageValueCount, bytes, 0);
       int next = rlReader.getNextOffset();
-      if (DEBUG) LOG.debug("reading definition levels at " + next);
+      LOGGER.debug("reading definition levels at {}", next);
       dlReader.initFromPage(pageValueCount, bytes, next);
       next = dlReader.getNextOffset();
-      if (DEBUG) LOG.debug("reading data at " + next);
+      LOGGER.debug("reading data at {}", next);
       initDataReader(page.getValueEncoding(), bytes, next, page.getValueCount());
     } catch (IOException e) {
       throw new ParquetDecodingException("could not read page " + page + " in col " + path, e);
@@ -608,7 +609,7 @@ private void readPageV2(DataPageV2 page) {
     this.repetitionLevelColumn = newRLEIterator(path.getMaxRepetitionLevel(), page.getRepetitionLevels());
     this.definitionLevelColumn = newRLEIterator(path.getMaxDefinitionLevel(), page.getDefinitionLevels());
     try {
-      if (DEBUG) LOG.debug("page data size " + page.getData().size() + " bytes and " + pageValueCount + " records");
+      LOGGER.debug("page data size {} bytes and {} records", page.getData().size(), pageValueCount);
       initDataReader(page.getDataEncoding(), page.getData().toByteBuffer(), 0, page.getValueCount());
     } catch (IOException e) {
       throw new ParquetDecodingException("could not read page " + page + " in col " + path, e);