--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/13 15:45:24	2283
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/02/17 07:38:24	2316
@@ -14,6 +14,7 @@
 import dk.daoas.daoadresseservice.beans.Address;
 import dk.daoas.daoadresseservice.beans.ExtendedBean;
 import dk.daoas.daoadresseservice.beans.HundredePctBean;
+import dk.daoas.daoadresseservice.util.DeduplicateHelper;
 
 public class DatabaseLayer {
 	
@@ -21,26 +22,42 @@
 		
 		String sql = "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute "
 				+ "FROM fulddaekning.adressetabel "
-				//+ "WHERE postnr >=2000" //DEBUG only
+				+ "WHERE gadeid IS NOT NULL "
+				//+ "AND postnr = 8700" //DEBUG only
 				;
 		
 		Connection conn = DBConnection.getConnection();		
 		Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+		stmt.setFetchSize(Integer.MIN_VALUE);
 		ResultSet res = stmt.executeQuery(sql);
 		
-		List<Address> list = new ArrayList<Address>();
+		List<Address> list = new ArrayList<Address>(2600000);//initial capacity 2.6 mio
+		
+		DeduplicateHelper<String> vejnavne = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> distributorer = new DeduplicateHelper<String>();
+
 		
 		while (res.next()) {
+			
+			// Cache String instanserne for vejnavne for at mindske hukommelses forbruget
+			String dbVejnavn = res.getString(2);			
+			String vejnavn = vejnavne.getInstance(dbVejnavn);
+
+			// Cache String instanserne for distributor for at mindske hukommelses forbruget
+			// (De-dubblicate)
+			String dbDistributor = res.getString(2);			
+			String distributor = distributorer.getInstance(dbDistributor);
+			
 			Address a = new Address();
 			a.id = res.getInt(1);
-			a.vejnavn = res.getString(2);
+			a.vejnavn = vejnavn;
 			a.husnr = res.getInt(3);
 			a.husnrbogstav = res.getString(4);
 			a.kommunekode = res.getInt(5);
 			a.vejkode = res.getInt(6);
 			a.postnr = res.getInt(7);
 			a.gadeid = res.getLong(8);
-			a.distributor = res.getString(9);
+			a.distributor = distributor;
 			a.dbkBane = res.getInt(10);
 			a.koreliste = res.getString(11);
 			a.rute = res.getString(12);
@@ -65,6 +82,7 @@
 	}
 	
 	public static List<ExtendedBean> getExtendedAdresslist() throws SQLException {
+		
 		String sql = "select orgid, a.id as targetid, afstand, LOWER(type) as type from fulddaekning.afstand_anden_rute a " +
 					"join odbc.transporttype t " + 
 					"on t.Art = 'Transpost' " +
@@ -80,9 +98,11 @@
 		
 		Connection conn = DBConnection.getConnection();		
 		Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+		stmt.setFetchSize(Integer.MIN_VALUE);
+		
 		ResultSet res = stmt.executeQuery(sql);
 		
-		List<ExtendedBean> list = new ArrayList<ExtendedBean>();
+		List<ExtendedBean> list = new ArrayList<ExtendedBean>( 350000); //Initial capacity 350K
 		while (res.next()) {
 			ExtendedBean eb = new ExtendedBean();
 			eb.orgId = res.getInt(1);
@@ -128,7 +148,7 @@
 		stmt.close();
 		conn.close();
 		
-		System.out.println("Loaded " + map.size() + " extendedbeans");
+		System.out.println("Loaded " + map.size() + " 100pct beans");
 		
 		return map;