--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/01/14 17:13:55 2814 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/01/15 08:11:58 2817 @@ -310,15 +310,18 @@ searchGadeidentAdresser = new HashMap>>(); helperCache = new ConcurrentHashMap(); + // ////////////////////// + // Start stage1 + long start1 = System.currentTimeMillis(); System.out.println("Build -- stage 1"); alleAdresser = db.getAllAdresses(); - /* Mapper mellem db Row ID og adresse noden */ + /* Mapper mellem db Row ID og adresse noden - skal bruges i stage3*/ Map idAddressMap = new HashMap( alleAdresser.size() ); - DeduplicateHelper aliasHelper = new DeduplicateHelper(400000); // Indeholder pt 379664 entries + DeduplicateHelper shortHelper = new DeduplicateHelper(); DeduplicateHelper intHelper = new DeduplicateHelper(); @@ -347,11 +350,8 @@ gadeident = intHelper.getInstance( a.gadeid ); Set aliaser = aliasGenerator.findVejAliaser(a.vejnavn); - for(String alias : aliaser) { - String vasketAlias = AddressUtils.vaskVejnavn(alias); - vasketAlias = aliasHelper.getInstance(vasketAlias); - - postnrVeje.put(vasketAlias, gadeident); + for(String alias : aliaser) { + postnrVeje.put(alias, gadeident); } } @@ -372,8 +372,13 @@ litraList.put(a.husnrbogstav, a); } - aliasHelper = null; //frigiv hukommelse inden stage2 + + aliasGenerator.clear(); //frigiv hukommelse inden stage2 aliasGenerator = null; + shortHelper.clear(); + shortHelper = null; + intHelper.clear(); + intHelper = null; ////////////////////////////////////////////////////////////////////////////////////////