--- 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 09:17:40 2323
@@ -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,29 +22,39 @@
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
list = new ArrayList();
+ List list = new ArrayList(2600000);//initial capacity 2.6 mio
+
+ DeduplicateHelper vejnavnCache = new DeduplicateHelper();
+ DeduplicateHelper husnrbogstavCache = new DeduplicateHelper();
+ DeduplicateHelper distributorCache = new DeduplicateHelper();
+ DeduplicateHelper korelisteCache = new DeduplicateHelper();
+ DeduplicateHelper ruteCache = new DeduplicateHelper();
+
while (res.next()) {
+
Address a = new Address();
a.id = res.getInt(1);
- a.vejnavn = res.getString(2);
+ a.vejnavn = vejnavnCache.getInstance( res.getString(2) );
a.husnr = res.getInt(3);
- a.husnrbogstav = res.getString(4);
+ a.husnrbogstav = husnrbogstavCache.getInstance( 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 = distributorCache.getInstance(res.getString(9));
a.dbkBane = res.getInt(10);
- a.koreliste = res.getString(11);
- a.rute = res.getString(12);
+ a.koreliste = korelisteCache.getInstance( res.getString(11) );
+ a.rute = ruteCache.getInstance( res.getString(12) );
//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
@@ -65,6 +76,7 @@
}
public static List 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,15 +92,20 @@
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 list = new ArrayList();
- while (res.next()) {
+ DeduplicateHelper transportCache = new DeduplicateHelper();
+
+ List list = new ArrayList( 350000); //Initial capacity 350K
+ while (res.next()) {
+
ExtendedBean eb = new ExtendedBean();
eb.orgId = res.getInt(1);
eb.targetId = res.getInt(2);
eb.afstand = res.getDouble(3);
- eb.transport = res.getString(4);
+ eb.transport = transportCache.getInstance(res.getString(4));
list.add(eb);
}
@@ -112,11 +129,14 @@
Map map = new HashMap();
+ DeduplicateHelper distributorCache = new DeduplicateHelper();
+
while (res.next()) {
+
HundredePctBean bean = new HundredePctBean();
bean.postnr = res.getInt(1);
- bean.distributor = res.getString(2);
+ bean.distributor = distributorCache.getInstance(res.getString(2));
bean.rute = res.getString(3);
bean.koreliste = res.getString(4);
bean.dbkBane = res.getInt(5);
@@ -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;