Changeset 3129 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

13.03.2010 15:34:25 (2 years ago)

Author:

jttt

Message:

Memory optimizations

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.data.osm.Storage;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
@@ -119 +120 @@
         private long currentExternalId;
         private String generator;
+        private Storage<String> internedStrings = new Storage<String>();
+
+        // Memory optimization - see #2312
+        private String intern(String s) {
+            String result = internedStrings.get(s);
+            if (result == null) {
+                internedStrings.put(s);
+                return s;
+            } else
+                return result;
+        }
 
         @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+
             if (qName.equals("osm")) {
                 if (atts == null) {
@@ -258 +271 @@
                 String key = atts.getValue("k");
                 String value = atts.getValue("v");
-                currentPrimitive.put(key, value);
+                currentPrimitive.put(intern(key), intern(value));
+
             } else {
                 System.out.println(tr("Undefined element ''{0}'' found in input stream. Skipping.", qName));