--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java 2015/02/17 08:37:30 2319
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java 2015/02/17 09:17:40 2323
@@ -34,6 +34,7 @@
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();
@@ -41,18 +42,16 @@
while (res.next()) {
-
-
Address a = new Address();
a.id = res.getInt(1);
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 = distributorCache.getInstance(res.getString(9));;
+ a.distributor = distributorCache.getInstance(res.getString(9));
a.dbkBane = res.getInt(10);
a.koreliste = korelisteCache.getInstance( res.getString(11) );
a.rute = ruteCache.getInstance( res.getString(12) );
@@ -97,19 +96,16 @@
ResultSet res = stmt.executeQuery(sql);
- DeduplicateHelper transportTyper = new DeduplicateHelper();
+ DeduplicateHelper transportCache = new DeduplicateHelper();
List list = new ArrayList( 350000); //Initial capacity 350K
- while (res.next()) {
-
- String dbTransport = res.getString(4);
- String transport = transportTyper.getInstance(dbTransport);
+ while (res.next()) {
ExtendedBean eb = new ExtendedBean();
eb.orgId = res.getInt(1);
eb.targetId = res.getInt(2);
eb.afstand = res.getDouble(3);
- eb.transport = transport;
+ eb.transport = transportCache.getInstance(res.getString(4));
list.add(eb);
}
@@ -133,16 +129,14 @@
Map map = new HashMap();
- DeduplicateHelper distributorer = new DeduplicateHelper();
+ DeduplicateHelper distributorCache = new DeduplicateHelper();
while (res.next()) {
- String dbDistributor = res.getString(2);
- String distributor = distributorer.getInstance(dbDistributor);
HundredePctBean bean = new HundredePctBean();
bean.postnr = res.getInt(1);
- bean.distributor = distributor;
+ bean.distributor = distributorCache.getInstance(res.getString(2));
bean.rute = res.getString(3);
bean.koreliste = res.getString(4);
bean.dbkBane = res.getInt(5);