Retire Interner added in commits f4355bf, bfbf5b4

Java 7 moved intern() out of permgen, so Interner is
deprecated. Its use in Ctags(Reader) was buggy, since a
new Interner instance was created per line, negating the
value of the Interner.

Also:
- revise all HistoryParser subclasses to addFile() with
  intern() paths

Author: idodeclare

src/org/opensolaris/opengrok/analysis/CtagsReader.java

@@ -28,7 +28,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.opensolaris.opengrok.logger.LoggerFactory;
-import org.opensolaris.opengrok.util.Interner;
 
 /**
  * Represents a reader of output from runs of ctags.
@@ -204,12 +203,10 @@ public void readLine(String tagLine) {
 
         // Bug #809: Keep track of which symbols have already been
         // seen to prevent duplicating them in memory.
-        final Interner<String> seenSymbols = new Interner<>();
 
         final String type = classInher == null ? kind : kind + " in " +
             classInher;
-        addTag(defs, seenSymbols, lnum, def, type, match, classInher,
-            signature);
+        addTag(defs, lnum, def, type, match, classInher, signature);
         if (signature != null) {
             // TODO if some languages use different character for separating
             // arguments, below needs to be adjusted
@@ -250,9 +247,8 @@ public void readLine(String tagLine) {
                 for (int ii = names.length - 1; ii >= 0; ii--) {
                     name = names[ii];
                     if (name.length() > 0) {
-                        addTag(defs, seenSymbols, lnum, name, "argument",
-                            def.trim() + signature.trim(), null,
-                            signature);
+                        addTag(defs, lnum, name, "argument", def.trim() +
+                            signature.trim(), null, signature);
                         break;
                     }
                 }
@@ -266,9 +262,8 @@ public void readLine(String tagLine) {
     /**
      * Adds a tag to a {@code Definitions} instance.
      */
-    private void addTag(Definitions defs, Interner<String> seenSymbols,
-        String lnum, String symbol, String type, String text, String namespace,
-        String signature) {
+    private void addTag(Definitions defs, String lnum, String symbol,
+        String type, String text, String namespace, String signature) {
         // The strings are frequently repeated (a symbol can be used in
         // multiple definitions, multiple definitions can have the same type,
         // one line can contain multiple definitions). Intern them to minimize
@@ -280,9 +275,8 @@ private void addTag(Definitions defs, Interner<String> seenSymbols,
             LOGGER.log(Level.WARNING, "CTags line number parsing problem(but" +
                 " I will continue with line # 0) for symbol {0}", symbol);
         }
-        defs.addTag(lineno, seenSymbols.intern(symbol.trim()),
-            seenSymbols.intern(type.trim()), seenSymbols.intern(text.trim()),
-            namespace == null ? null : seenSymbols.intern(namespace.trim()),
-            signature);
+        defs.addTag(lineno, symbol.trim().intern(), type.trim().intern(),
+            text.trim().intern(), namespace == null ? null :
+            namespace.trim().intern(), signature);
     }
 }

src/org/opensolaris/opengrok/history/BazaarHistoryParser.java

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.history;
 
@@ -168,7 +169,7 @@ public void processStream(InputStream input) throws IOException {
 
                         File f = new File(myDir, s);
                         String name = env.getPathRelativeToSourceRoot(f);
-                        entry.addFile(name);
+                        entry.addFile(name.intern());
                     }
                     break;
                 default:

src/org/opensolaris/opengrok/history/BitKeeperHistoryParser.java

@@ -17,6 +17,12 @@
  * CDDL HEADER END
  */
 
+/*
+ * Copyright (c) 2017, James Service <[email protected]>.
+ * Portions Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
+ */
+
 package org.opensolaris.opengrok.history;
 
 import java.io.BufferedReader;
@@ -107,7 +113,7 @@ public void processStream(InputStream input) throws IOException {
                     if (fields[0].equals("ChangeSet")) {
                         continue;
                     }
-                    newEntry.addFile(fields[0]);
+                    newEntry.addFile(fields[0].intern());
                     newEntry.setRevision(fields[1]);
                     newEntry.setDate(dateFormat.parse(fields[2]));
                     newEntry.setAuthor(fields[3]);

src/org/opensolaris/opengrok/history/GitHistoryParser.java

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.history;
 
@@ -128,7 +129,8 @@ private void process(BufferedReader in) throws IOException {
                 if (entry != null) {
                     try {
                         File f = new File(myDir, s);
-                        entry.addFile(env.getPathRelativeToSourceRoot(f));
+                        String path = env.getPathRelativeToSourceRoot(f);
+                        entry.addFile(path.intern());
                     } catch (FileNotFoundException e) { //NOPMD
                         // If the file is not located under the source root,
                         // ignore it (bug #11664).

src/org/opensolaris/opengrok/history/MercurialHistoryParser.java

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.history;
 
@@ -140,7 +141,8 @@ public void processStream(InputStream input) throws IOException {
                     if (strings[ii].length() > 0) {
                         File f = new File(mydir, strings[ii]);
                         try {
-                            entry.addFile(env.getPathRelativeToSourceRoot(f));
+                            String path = env.getPathRelativeToSourceRoot(f);
+                            entry.addFile(path.intern());
                         } catch (FileNotFoundException e) { // NOPMD
                             // If the file is not located under the source root,
                             // ignore it (bug #11664).

src/org/opensolaris/opengrok/history/MonotoneHistoryParser.java

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.history;
 
@@ -164,7 +165,9 @@ public void processStream(InputStream input) throws IOException {
                         for (String f : files) {
                             File file = new File(mydir, f);
                             try {
-                                entry.addFile(env.getPathRelativeToSourceRoot(file));
+                                String path = env.getPathRelativeToSourceRoot(
+                                    file);
+                                entry.addFile(path.intern());
                             } catch (FileNotFoundException e) { // NOPMD
                                 // If the file is not located under the source root, ignore it
                             }

src/org/opensolaris/opengrok/history/SubversionHistoryParser.java

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.history;
 
@@ -38,7 +39,6 @@
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
 import org.opensolaris.opengrok.logger.LoggerFactory;
 import org.opensolaris.opengrok.util.Executor;
-import org.opensolaris.opengrok.util.Interner;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.DefaultHandler2;
@@ -64,7 +64,6 @@ private static class Handler extends DefaultHandler2 {
         final DateFormat format;
         HistoryEntry entry;
         StringBuilder sb;
-        private final Interner<String> stringInterner = new Interner<String>();
 
         Handler(String home, String prefix, int length, DateFormat df) {
             this.home = home;
@@ -105,11 +104,7 @@ public void endElement(String uri, String localName, String qname) throws SAXExc
                     String path = file.getAbsolutePath().substring(length);
                     // The same file names may be repeated in many commits,
                     // so intern them to reduce the memory footprint.
-                    // Bug #15956: Don't use String.intern(), since that may
-                    // exhaust the permgen space. Instead, use our own
-                    // interner that allocates space on the heap.
-                    path = stringInterner.intern(path);
-                    entry.addFile(path);
+                    entry.addFile(path.intern());
                 } else {
                     LOGGER.log(Level.FINER, "Skipping file outside repository: " + s);
                 }