Merge pull request #102 from jlitola/optimize-rendering-performance

Adds Template.renderUnguarded for faster rendering.
bkiers · Sep 12, 2018 · c60964c · c60964c
2 parents 2205794 + 6766f82
commit c60964c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 12 deletions.
diff --git a/src/main/java/liqp/ProtectionSettings.java b/src/main/java/liqp/ProtectionSettings.java
@@ -66,4 +66,8 @@ public void incrementIterations() {
             throw new ExceededMaxIterationsException(this.maxIterations);
         }
     }
+
+    public Boolean isRenderTimeLimited() {
+        return this.maxRenderTimeMillis != Long.MAX_VALUE;
+    }
 }
diff --git a/src/main/java/liqp/Template.java b/src/main/java/liqp/Template.java
@@ -282,7 +282,15 @@ public String render(boolean convertValueToMap, String key, Object value, Object
      * @return a string denoting the rendered template.
      */
     public String render(final Map<String, Object> variables) {
-        return render(variables, Executors.newSingleThreadExecutor(), true);
+
+        if (this.protectionSettings.isRenderTimeLimited()) {
+            return render(variables, Executors.newSingleThreadExecutor(), true);
+        } else {
+            if (this.templateSize > this.protectionSettings.maxTemplateSizeBytes) {
+                throw new RuntimeException("template exceeds " + this.protectionSettings.maxTemplateSizeBytes + " bytes");
+            }
+            return renderUnguarded(variables);
+        }
     }
 
     public String render(final Map<String, Object> variables, ExecutorService executorService, boolean shutdown) {
@@ -291,18 +299,9 @@ public String render(final Map<String, Object> variables, ExecutorService execut
             throw new RuntimeException("template exceeds " + this.protectionSettings.maxTemplateSizeBytes + " bytes");
         }
 
-        final NodeVisitor visitor = new NodeVisitor(this.tags, this.filters, this.parseSettings);
-
         Callable<String> task = new Callable<String>() {
-            public String call() throws Exception {
-                try {
-                    LNode node = visitor.visit(root);
-                    Object rendered = node.render(new TemplateContext(protectionSettings, renderSettings, parseSettings.flavor, variables));
-                    return rendered == null ? "" : String.valueOf(rendered);
-                }
-                catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
+            public String call() {
+                return renderUnguarded(variables);
             }
         };
 
@@ -324,6 +323,29 @@ public String call() throws Exception {
         }
     }
 
+    /**
+     * Renders the template without guards provided by protection settings. This method has about 300x times
+     * better performance than plain render.
+     *
+     * @param variables
+     *         a Map denoting the (possibly nested)
+     *         variables that can be used in this
+     *         Template.
+     *
+     * @return a string denoting the rendered template.
+     */
+    public String renderUnguarded(final Map<String, Object> variables) {
+        final NodeVisitor visitor = new NodeVisitor(this.tags, this.filters, this.parseSettings);
+        try {
+            LNode node = visitor.visit(root);
+            Object rendered = node.render(new TemplateContext(protectionSettings, renderSettings, parseSettings.flavor, variables));
+            return rendered == null ? "" : String.valueOf(rendered);
+        }
+        catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     // Use toStringTree()
     @Deprecated
     public String toStringAST() {