groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sun...@apache.org
Subject groovy git commit: Refine `GString.toString` for better performance
Date Fri, 05 Jan 2018 02:09:08 GMT
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X bc3477998 -> d289798c2


Refine `GString.toString` for better performance

(cherry picked from commit 86624b6)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d289798c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d289798c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d289798c

Branch: refs/heads/GROOVY_2_5_X
Commit: d289798c277c3c6d90961ea93ffdf90e816d58fc
Parents: bc34779
Author: sunlan <sunlan@apache.org>
Authored: Fri Jan 5 09:33:26 2018 +0800
Committer: sunlan <sunlan@apache.org>
Committed: Fri Jan 5 10:09:01 2018 +0800

----------------------------------------------------------------------
 src/main/groovy/groovy/lang/GString.java        |  17 +-
 .../apache/groovy/io/StringBuilderWriter.java   | 168 +++++++++++++++++++
 2 files changed, 183 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/d289798c/src/main/groovy/groovy/lang/GString.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/GString.java b/src/main/groovy/groovy/lang/GString.java
index b9c26d0..dcef709 100644
--- a/src/main/groovy/groovy/lang/GString.java
+++ b/src/main/groovy/groovy/lang/GString.java
@@ -18,13 +18,13 @@
  */
 package groovy.lang;
 
+import org.apache.groovy.io.StringBuilderWriter;
 import org.codehaus.groovy.runtime.GStringImpl;
 import org.codehaus.groovy.runtime.InvokerHelper;
 import org.codehaus.groovy.runtime.StringGroovyMethods;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.util.regex.Pattern;
@@ -142,7 +142,7 @@ public abstract class GString extends GroovyObjectSupport implements Comparable,
 
     @Override
     public String toString() {
-        StringWriter buffer = new StringWriter();
+        StringBuilderWriter buffer = new StringBuilderWriter(calcInitialCapacity());
         try {
             writeTo(buffer);
         }
@@ -152,6 +152,19 @@ public abstract class GString extends GroovyObjectSupport implements
Comparable,
         return buffer.toString();
     }
 
+    private int calcInitialCapacity() {
+        String[] strings = getStrings();
+
+        int initialCapacity = 0;
+        for (String string : strings) {
+            initialCapacity += string.length();
+        }
+
+        initialCapacity += values.length * Math.max(Math.ceil(initialCapacity / strings.length),
1);
+
+        return Math.max((int) (initialCapacity  * 1.2), 16);
+    }
+
     @Override
     public Writer writeTo(Writer out) throws IOException {
         String[] s = getStrings();

http://git-wip-us.apache.org/repos/asf/groovy/blob/d289798c/src/main/java/org/apache/groovy/io/StringBuilderWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/groovy/io/StringBuilderWriter.java b/src/main/java/org/apache/groovy/io/StringBuilderWriter.java
new file mode 100644
index 0000000..8cbd3ce
--- /dev/null
+++ b/src/main/java/org/apache/groovy/io/StringBuilderWriter.java
@@ -0,0 +1,168 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.groovy.io;
+
+import java.io.Serializable;
+import java.io.Writer;
+
+/**
+ * Copied from https://github.com/apache/commons-io/blob/master/src/main/java/org/apache/commons/io/output/StringBuilderWriter.java
+ *
+ * {@link Writer} implementation that outputs to a {@link StringBuilder}.
+ * <p>
+ * <strong>NOTE:</strong> This implementation, as an alternative to
+ * <code>java.io.StringWriter</code>, provides an <i>un-synchronized</i>
+ * (i.e. for use in a single thread) implementation for better performance.
+ * For safe usage with multiple {@link Thread}s then
+ * <code>java.io.StringWriter</code> should be used.
+ *
+ * @since 2.0
+ */
+public class StringBuilderWriter extends Writer implements Serializable {
+
+    private static final long serialVersionUID = -146927496096066153L;
+    private final StringBuilder builder;
+
+    /**
+     * Constructs a new {@link StringBuilder} instance with default capacity.
+     */
+    public StringBuilderWriter() {
+        this.builder = new StringBuilder();
+    }
+
+    /**
+     * Constructs a new {@link StringBuilder} instance with the specified capacity.
+     *
+     * @param capacity The initial capacity of the underlying {@link StringBuilder}
+     */
+    public StringBuilderWriter(final int capacity) {
+        this.builder = new StringBuilder(capacity);
+    }
+
+    /**
+     * Constructs a new instance with the specified {@link StringBuilder}.
+     *
+     * <p>If {@code builder} is null a new instance with default capacity will be created.</p>
+     *
+     * @param builder The String builder. May be null.
+     */
+    public StringBuilderWriter(final StringBuilder builder) {
+        this.builder = builder != null ? builder : new StringBuilder();
+    }
+
+    /**
+     * Appends a single character to this Writer.
+     *
+     * @param value The character to append
+     * @return This writer instance
+     */
+    @Override
+    public Writer append(final char value) {
+        builder.append(value);
+        return this;
+    }
+
+    /**
+     * Appends a character sequence to this Writer.
+     *
+     * @param value The character to append
+     * @return This writer instance
+     */
+    @Override
+    public Writer append(final CharSequence value) {
+        builder.append(value);
+        return this;
+    }
+
+    /**
+     * Appends a portion of a character sequence to the {@link StringBuilder}.
+     *
+     * @param value The character to append
+     * @param start The index of the first character
+     * @param end The index of the last character + 1
+     * @return This writer instance
+     */
+    @Override
+    public Writer append(final CharSequence value, final int start, final int end) {
+        builder.append(value, start, end);
+        return this;
+    }
+
+    /**
+     * Closing this writer has no effect.
+     */
+    @Override
+    public void close() {
+        // no-op
+    }
+
+    /**
+     * Flushing this writer has no effect.
+     */
+    @Override
+    public void flush() {
+        // no-op
+    }
+
+
+    /**
+     * Writes a String to the {@link StringBuilder}.
+     *
+     * @param value The value to write
+     */
+    @Override
+    public void write(final String value) {
+        if (value != null) {
+            builder.append(value);
+        }
+    }
+
+    /**
+     * Writes a portion of a character array to the {@link StringBuilder}.
+     *
+     * @param value The value to write
+     * @param offset The index of the first character
+     * @param length The number of characters to write
+     */
+    @Override
+    public void write(final char[] value, final int offset, final int length) {
+        if (value != null) {
+            builder.append(value, offset, length);
+        }
+    }
+
+    /**
+     * Returns the underlying builder.
+     *
+     * @return The underlying builder
+     */
+    public StringBuilder getBuilder() {
+        return builder;
+    }
+
+    /**
+     * Returns {@link StringBuilder#toString()}.
+     *
+     * @return The contents of the String builder.
+     */
+    @Override
+    public String toString() {
+        return builder.toString();
+    }
+}


Mime
View raw message