Selective interning

Author: skjolber

onebusaway-csv-entities/src/main/java/org/onebusaway/csv_entities/CsvEntityReader.java

@@ -21,8 +21,11 @@
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
 import java.util.zip.ZipFile;
 import org.onebusaway.csv_entities.exceptions.CsvEntityIOException;
 import org.onebusaway.csv_entities.exceptions.MissingRequiredEntityException;
@@ -50,6 +53,8 @@ public class CsvEntityReader {
 
   private boolean _internStrings = false;
 
+  private Predicate<Class> _internStringsDisabled;
+
   private Map<String, String> _stringTable = new HashMap<String, String>();
 
   /**
@@ -96,6 +101,15 @@ public void setInternStrings(boolean internStrings) {
     _internStrings = internStrings;
   }
 
+  public void disableInternStringsForEntities(Class<?> ... entityClasses) {
+    Set<Class> set = new HashSet<>();
+    for (Class<?> entityClass : entityClasses) {
+      set.add(entityClass);
+    }
+
+    this._internStringsDisabled = (c) -> set.contains(c);
+  }
+
   public void readEntities(Class<?> entityClass) throws IOException {
     readEntities(entityClass, _source);
   }
@@ -132,13 +146,16 @@ public void readEntities(Class<?> entityClass, Reader reader)
     String line = null;
     int lineNumber = 1;
 
+    boolean internStrings =
+        _internStrings && (_internStringsDisabled == null || !_internStringsDisabled.test(entityClass));
+
     try {
       while ((line = lineReader.readLine()) != null) {
         if (line.isEmpty()) continue;
         // TODO: This is a hack of sorts to deal with a malformed data file...
         if (line.length() == 1 && line.charAt(0) == 26) continue;
         List<String> values = _tokenizerStrategy.parse(line);
-        if (_internStrings) internStrings(values);
+        if (internStrings) internStrings(values);
         entityLoader.handleLine(values);
         lineNumber++;
       }

onebusaway-jmh/src/main/java/org/onebusaway/jmh/gtfs/memory/AbstractParsePrintMemory.java

@@ -44,7 +44,8 @@ public static GtfsRelationalDaoImpl run(boolean internStrings) throws Exception
               "abcd",
               internStrings,
               entityStore,
-              null);
+              null,
+              false);
 
       System.out.println("Read done.");
 

onebusaway-jmh/src/main/java/org/onebusaway/jmh/gtfs/shape/ShapeSingleShotBenchmark.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
+
 import org.onebusaway.csv_entities.CsvInputSource;
 import org.onebusaway.gtfs.impl.GtfsDaoImpl;
 import org.onebusaway.gtfs.model.ShapePoint;
@@ -47,45 +48,65 @@ public ThreadState() {
   @Benchmark
   public Object testParse(ThreadState state) throws Exception {
     return processWithGtfsReader(
-        new File(directory), "abcd", false, state.reader, ShapePoint.class);
+        new File(directory), "abcd", false, state.reader, ShapePoint.class, false);
   }
 
   @Benchmark
   public Object testParseStringInterning(ThreadState state) throws Exception {
-    return processWithGtfsReader(new File(directory), "abcd", true, state.reader, ShapePoint.class);
+    return processWithGtfsReader(
+        new File(directory), "abcd", true, state.reader, ShapePoint.class, false);
   }
 
   @Benchmark
   public Object testParseLegacy(ThreadState state) throws Exception {
     return processWithGtfsReader(
-        new File(directory), "abcd", false, state.reader, LegacyShapePoint.class);
+        new File(directory), "abcd", false, state.reader, LegacyShapePoint.class, false);
   }
 
   @Benchmark
   public Object testParseLegacyStringInterning(ThreadState state) throws Exception {
     return processWithGtfsReader(
-        new File(directory), "abcd", true, state.reader, LegacyShapePoint.class);
+        new File(directory), "abcd", true, state.reader, LegacyShapePoint.class, false);
+  }
+
+  @Benchmark
+  public Object testParseStringSelectiveInterning(ThreadState state) throws Exception {
+    return processWithGtfsReader(
+        new File(directory),
+        "abcd",
+        true,
+        state.reader,
+        ShapePoint.class,
+        true);
   }
 
   public static GtfsReader processWithEntityStore(
       File resourcePath,
       String agencyId,
       boolean internStrings,
       GenericMutableDao entityStore,
-      Class<?> cls)
+      Class<?> cls,
+      boolean disableInternStrings)
       throws Exception {
     GtfsReader reader = new GtfsReader();
     reader.setEntityStore(entityStore);
-    return processWithGtfsReader(resourcePath, agencyId, internStrings, reader, cls);
+    return processWithGtfsReader(resourcePath, agencyId, internStrings, reader, cls, disableInternStrings);
   }
 
   public static GtfsReader processWithGtfsReader(
-      File resourcePath, String agencyId, boolean internStrings, GtfsReader reader, Class<?> cls)
+      File resourcePath,
+      String agencyId,
+      boolean internStrings,
+      GtfsReader reader,
+      Class<?> cls,
+      boolean selectivelyDisableInternStrings)
       throws Exception {
 
     reader.setDefaultAgencyId(agencyId);
     reader.setInternStrings(internStrings);
-
+    if(selectivelyDisableInternStrings) {
+      reader.disableInternStringsForEntities(cls);
+    }
     reader.setInputLocation(resourcePath);
 
     CsvInputSource inputSource = reader.getInputSource();

onebusaway-jmh/src/main/java/org/onebusaway/jmh/gtfs/shape/memory/AbstractParseShapePrintMemory.java

@@ -40,7 +40,8 @@ public static GtfsRelationalDaoImpl run(boolean internStrings, Class<?> cls) thr
               "abcd",
               internStrings,
               entityStore,
-              cls);
+              cls,
+                  false);
 
       System.out.println("Read file.");
       System.out.println("Memory after parsing:");