Skip to content

PARQUET-305: Update logging to SLF4J. #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rdblue wants to merge 2 commits into from
Closed

PARQUET-305: Update logging to SLF4J. #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f9b99a
PARQUET-305: Update logging to SLF4J.
rdblue Nov 25, 2015
89257e8
PARQUET-305: Remove deprecation annotations on Log.
rdblue Dec 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions parquet-avro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 6 additions & 0 deletions parquet-benchmarks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@
<version>${jmh.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 0 additions & 6 deletions parquet-cascading/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions parquet-column/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@
<version>1.3.149</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
21 changes: 17 additions & 4 deletions parquet-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,23 @@

<dependencies>
<dependency>
<groupId>org.semver</groupId>
<artifactId>api</artifactId>
<version>${semver.api.version}</version>
<scope>test</scope>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.semver</groupId>
<artifactId>api</artifactId>
<version>${semver.api.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
87 changes: 15 additions & 72 deletions parquet-common/src/main/java/org/apache/parquet/Log.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,9 @@
*/
package org.apache.parquet;

import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.MessageFormat;
import java.util.Date;
import java.util.logging.Formatter;
import java.util.logging.Handler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import java.util.logging.StreamHandler;

/**
* Simple wrapper around java.util.logging
Expand All @@ -53,61 +46,11 @@ public class Log {
public static final boolean WARN = (LEVEL.intValue() <= Level.WARNING.intValue());
public static final boolean ERROR = (LEVEL.intValue() <= Level.SEVERE.intValue());

static {
// add a default handler in case there is none
Logger logger = Logger.getLogger(Log.class.getPackage().getName());
Handler[] handlers = logger.getHandlers();
if (handlers == null || handlers.length == 0) {
logger.setUseParentHandlers(false);
StreamHandler handler = new StreamHandler(System.out, new Formatter() {
Date dat = new Date();
private final static String format = "{0,date} {0,time}";
private MessageFormat formatter = new MessageFormat(format);

private Object args[] = new Object[1];

/**
* Format the given LogRecord.
* @param record the log record to be formatted.
* @return a formatted log record
*/
public synchronized String format(LogRecord record) {
StringBuffer sb = new StringBuffer();
// Minimize memory allocations here.
dat.setTime(record.getMillis());
args[0] = dat;
formatter.format(args, sb, null);
sb.append(" ");
sb.append(record.getLevel().getLocalizedName());
sb.append(": ");
sb.append(record.getLoggerName());

sb.append(": ");
sb.append(formatMessage(record));
sb.append("\n");
if (record.getThrown() != null) {
try {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
record.getThrown().printStackTrace(pw);
pw.close();
sb.append(sw.toString());
} catch (Exception ex) {
}
}
return sb.toString();
}
});
handler.setLevel(LEVEL);
logger.addHandler(handler);
}
logger.setLevel(LEVEL);
}

/**
*
* @param c the current class
* @return the corresponding logger
* @deprecated will be removed in 2.0.0; use org.slf4j.LoggerFactory instead.
*/
public static Log getLog(Class<?> c) {
return new Log(c);
Expand All @@ -116,7 +59,7 @@ public static Log getLog(Class<?> c) {
private Logger logger;

public Log(Class<?> c) {
this.logger = Logger.getLogger(c.getName());
this.logger = LoggerFactory.getLogger(c);
}

/**
Expand All @@ -125,9 +68,9 @@ public Log(Class<?> c) {
*/
public void debug(Object m) {
if (m instanceof Throwable) {
logger.log(Level.FINE, "", (Throwable)m);
logger.debug("", (Throwable) m);
} else {
logger.fine(String.valueOf(m));
logger.debug(String.valueOf(m));
}
}

Expand All @@ -137,7 +80,7 @@ public void debug(Object m) {
* @param t
*/
public void debug(Object m, Throwable t) {
logger.log(Level.FINE, String.valueOf(m), t);
logger.debug(String.valueOf(m), t);
}

/**
Expand All @@ -146,7 +89,7 @@ public void debug(Object m, Throwable t) {
*/
public void info(Object m) {
if (m instanceof Throwable) {
logger.log(Level.INFO, "", (Throwable)m);
logger.info("", (Throwable) m);
} else {
logger.info(String.valueOf(m));
}
Expand All @@ -158,7 +101,7 @@ public void info(Object m) {
* @param t
*/
public void info(Object m, Throwable t) {
logger.log(Level.INFO, String.valueOf(m), t);
logger.info(String.valueOf(m), t);
}

/**
Expand All @@ -167,9 +110,9 @@ public void info(Object m, Throwable t) {
*/
public void warn(Object m) {
if (m instanceof Throwable) {
logger.log(Level.WARNING, "", (Throwable)m);
logger.warn("", (Throwable) m);
} else {
logger.warning(String.valueOf(m));
logger.warn(String.valueOf(m));
}
}

Expand All @@ -179,7 +122,7 @@ public void warn(Object m) {
* @param t
*/
public void warn(Object m, Throwable t) {
logger.log(Level.WARNING, String.valueOf(m), t);
logger.warn(String.valueOf(m), t);
}

/**
Expand All @@ -188,9 +131,9 @@ public void warn(Object m, Throwable t) {
*/
public void error(Object m) {
if (m instanceof Throwable) {
logger.log(Level.SEVERE, "", (Throwable)m);
logger.error("", (Throwable) m);
} else {
logger.warning(String.valueOf(m));
logger.error(String.valueOf(m));
}
}

Expand All @@ -200,7 +143,7 @@ public void error(Object m) {
* @param t
*/
public void error(Object m, Throwable t) {
logger.log(Level.SEVERE, String.valueOf(m), t);
logger.error(String.valueOf(m), t);
}

}
7 changes: 7 additions & 0 deletions parquet-encoding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@
<version>1.5</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
31 changes: 16 additions & 15 deletions parquet-hadoop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-jackson</artifactId>
Expand All @@ -73,29 +67,36 @@
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.1.6</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.4</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.4</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
12 changes: 6 additions & 6 deletions parquet-pig/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
Expand All @@ -110,6 +104,12 @@
<version>11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 6 additions & 0 deletions parquet-protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<developers>
Expand Down
6 changes: 6 additions & 0 deletions parquet-scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@
<version>2.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 0 additions & 6 deletions parquet-scrooge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
Expand Down
Loading