Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7899] Various memory usage improvements 5 (#1270) 

Multiple optimizations :
- renderLevel() method use static constants instead of rebuilding the strings on each call
- replace + operator usage with more PrintStream.print() calls to reduce temporary strings creation
- reduce usage of MessageBuilder.a() method usage with more PrintStream.print() calls to reduce temporary strings creation
- replace the builder() method with a static import
- replace String.format with a simple string concat to reduce memory allocation (garbage)
- change static constants to class member in MavenSimpleLogger
- add a setLength(int) method in MessageBuilder to enable reuse
This commit is contained in:
sebastien-doyon 2023-10-20 16:30:44 +02:00 committed by GitHub
parent 68bbc8f393
commit d362690a82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 69 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilder.java
View File

@ -206,4 +206,11 @@ public interface MessageBuilder {
*/
@Nonnull
String build();
/**
* Set the buffer length.
*
* @param length the new length
*/
void setLength(int length);
}

5
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java
View File

@ -154,4 +154,9 @@ public class DefaultMessageBuilder implements MessageBuilder {
public String toString() {
return build();
}
@Override
public void setLength(int length) {
buffer.setLength(length);
}
}

26
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -497,19 +497,6 @@ public class MavenCli {
cliRequest.quiet = !cliRequest.verbose && commandLine.hasOption(CLIManager.QUIET);
cliRequest.showErrors = cliRequest.verbose || commandLine.hasOption(CLIManager.ERRORS);
slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
Slf4jConfiguration slf4jConfiguration = Slf4jConfigurationFactory.getConfiguration(slf4jLoggerFactory);
if (cliRequest.verbose) {
cliRequest.request.setLoggingLevel(MavenExecutionRequest.LOGGING_LEVEL_DEBUG);
slf4jConfiguration.setRootLoggerLevel(Slf4jConfiguration.Level.DEBUG);
} else if (cliRequest.quiet) {
cliRequest.request.setLoggingLevel(MavenExecutionRequest.LOGGING_LEVEL_ERROR);
slf4jConfiguration.setRootLoggerLevel(Slf4jConfiguration.Level.ERROR);
}
// else fall back to default log level specified in conf
// see https://issues.apache.org/jira/browse/MNG-2570
// LOG COLOR
String styleColor = cliRequest.getUserProperties().getProperty(STYLE_COLOR_PROPERTY, "auto");
styleColor = commandLine.getOptionValue(COLOR, styleColor);
@ -528,6 +515,19 @@ public class MavenCli {
}
}
slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
Slf4jConfiguration slf4jConfiguration = Slf4jConfigurationFactory.getConfiguration(slf4jLoggerFactory);
if (cliRequest.verbose) {
cliRequest.request.setLoggingLevel(MavenExecutionRequest.LOGGING_LEVEL_DEBUG);
slf4jConfiguration.setRootLoggerLevel(Slf4jConfiguration.Level.DEBUG);
} else if (cliRequest.quiet) {
cliRequest.request.setLoggingLevel(MavenExecutionRequest.LOGGING_LEVEL_ERROR);
slf4jConfiguration.setRootLoggerLevel(Slf4jConfiguration.Level.ERROR);
}
// else fall back to default log level specified in conf
// see https://issues.apache.org/jira/browse/MNG-2570
// LOG STREAMS
if (commandLine.hasOption(CLIManager.LOG_FILE)) {
File logFile = new File(commandLine.getOptionValue(CLIManager.LOG_FILE));

9
maven-embedder/src/main/java/org/apache/maven/cli/jansi/JansiMessageBuilder.java
View File

@ -26,12 +26,16 @@ import org.fusesource.jansi.Ansi;
@Experimental
public class JansiMessageBuilder implements MessageBuilder {
private final Ansi ansi;
private StringBuilder sb;
@SuppressWarnings("magicnumber")
public JansiMessageBuilder() {
this.sb = new StringBuilder(80);
this.ansi = Ansi.ansi();
}
public JansiMessageBuilder(StringBuilder sb) {
this.sb = sb;
this.ansi = Ansi.ansi(sb);
}
@ -159,4 +163,9 @@ public class JansiMessageBuilder implements MessageBuilder {
public String toString() {
return build();
}
@Override
public void setLength(int length) {
sb.setLength(length);
}
}

60
maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
View File

@ -21,7 +21,8 @@ package org.slf4j.impl;
import java.io.PrintStream;
import org.apache.maven.api.services.MessageBuilder;
import org.apache.maven.cli.jansi.MessageUtils;
import static org.apache.maven.cli.jansi.MessageUtils.builder;
/**
* Logger for Maven, that support colorization of levels and stacktraces. This class implements 2 methods introduced in
@ -30,6 +31,13 @@ import org.apache.maven.cli.jansi.MessageUtils;
* @since 3.5.0
*/
public class MavenSimpleLogger extends SimpleLogger {
private final String traceRenderedLevel = builder().trace("TRACE").build();
private final String debugRenderedLevel = builder().debug("DEBUG").build();
private final String infoRenderedLevel = builder().info("INFO").build();
private final String warnRenderedLevel = builder().warning("WARNING").build();
private final String errorRenderedLevel = builder().error("ERROR").build();
MavenSimpleLogger(String name) {
super(name);
}
@ -38,16 +46,16 @@ public class MavenSimpleLogger extends SimpleLogger {
protected String renderLevel(int level) {
switch (level) {
case LOG_LEVEL_TRACE:
return builder().trace("TRACE").build();
return traceRenderedLevel;
case LOG_LEVEL_DEBUG:
return builder().debug("DEBUG").build();
return debugRenderedLevel;
case LOG_LEVEL_INFO:
return builder().info("INFO").build();
return infoRenderedLevel;
case LOG_LEVEL_WARN:
return builder().warning("WARNING").build();
return warnRenderedLevel;
case LOG_LEVEL_ERROR:
default:
return builder().error("ERROR").build();
return errorRenderedLevel;
}
}
@ -56,24 +64,30 @@ public class MavenSimpleLogger extends SimpleLogger {
if (t == null) {
return;
}
stream.print(builder().failure(t.getClass().getName()));
MessageBuilder builder = builder().failure(t.getClass().getName());
if (t.getMessage() != null) {
stream.print(": ");
stream.print(builder().failure(t.getMessage()));
builder.a(": ").failure(t.getMessage());
}
stream.println();
stream.println(builder);
printStackTrace(t, stream, "");
}
private void printStackTrace(Throwable t, PrintStream stream, String prefix) {
MessageBuilder builder = builder();
for (StackTraceElement e : t.getStackTrace()) {
stream.print(prefix);
stream.print(" ");
stream.print(builder().strong("at"));
stream.print(" " + e.getClassName() + "." + e.getMethodName());
stream.print(builder().a(" (").strong(getLocation(e)).a(")"));
stream.println();
builder.a(prefix);
builder.a(" ");
builder.strong("at");
builder.a(" ");
builder.a(e.getClassName());
builder.a(".");
builder.a(e.getMethodName());
builder.a(" (");
builder.strong(getLocation(e));
builder.a(")");
stream.println(builder);
builder.setLength(0);
}
for (Throwable se : t.getSuppressed()) {
writeThrowable(se, stream, "Suppressed", prefix + " ");
@ -85,12 +99,12 @@ public class MavenSimpleLogger extends SimpleLogger {
}
private void writeThrowable(Throwable t, PrintStream stream, String caption, String prefix) {
stream.print(builder().a(prefix).strong(caption).a(": ").a(t.getClass().getName()));
MessageBuilder builder =
builder().a(prefix).strong(caption).a(": ").a(t.getClass().getName());
if (t.getMessage() != null) {
stream.print(": ");
stream.print(builder().failure(t.getMessage()));
builder.a(": ").failure(t.getMessage());
}
stream.println();
stream.println(builder);
printStackTrace(t, stream, prefix);
}
@ -103,13 +117,9 @@ public class MavenSimpleLogger extends SimpleLogger {
} else if (e.getFileName() == null) {
return "Unknown Source";
} else if (e.getLineNumber() >= 0) {
return String.format("%s:%s", e.getFileName(), e.getLineNumber());
return e.getFileName() + ":" + e.getLineNumber();
} else {
return e.getFileName();
}
}
private MessageBuilder builder() {
return MessageUtils.builder();
}
}