Merge pull request google#39 from mikelalcon/optimiztion

Restore Pattern.reset() method
mikelalcon · Nov 17, 2017 · 7597ac7 · 7597ac7
2 parents f6ab6e0 + 577c171
commit 7597ac7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/java/com/google/re2j/Pattern.java b/java/com/google/re2j/Pattern.java
@@ -57,6 +57,15 @@ public final class Pattern implements Serializable {
     this.re2 = re2;
   }
 
+  /**
+   * Releases current thread memory used by internal caches associated with this pattern. Does
+   * not change the observable behaviour. Useful for tests that detect memory
+   * leaks via allocation tracking.
+   */
+  public void reset() {
+    re2.reset();
+  }
+
   /**
    * Returns the flags used in the constructor.
    */

diff --git a/java/com/google/re2j/RE2.java b/java/com/google/re2j/RE2.java
@@ -204,6 +204,11 @@ static RE2 compileImpl(String expr, int mode, boolean longest)
     return re2;
   }
 
+  // Clears the memory associated with this machine for the current thread.
+  void reset() {
+    machineThreadLocal.remove();
+  }
+
   /**
    * Returns the number of parenthesized subexpressions in this regular
    * expression.