/[projects]/dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java
ViewVC logotype

Annotation of /dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2330 - (hide annotations) (download)
Fri Feb 20 08:52:52 2015 UTC (9 years, 3 months ago) by torben
File size: 15170 byte(s)
Refactoring regarding who is responsible for calculate BBox margins
1 torben 2145 package dk.daoas.fulddaekning;
2    
3 torben 2152 import java.io.IOException;
4 torben 2145 import java.sql.Connection;
5 torben 2152 import java.sql.DriverManager;
6 torben 2145 import java.sql.PreparedStatement;
7     import java.sql.ResultSet;
8     import java.sql.SQLException;
9     import java.util.ArrayList;
10 torben 2247 import java.util.HashMap;
11 torben 2145 import java.util.List;
12 torben 2328 import java.util.Map;
13 torben 2152 import java.util.Properties;
14 torben 2145 import java.util.Queue;
15 torben 2328 import java.util.Set;
16     import java.util.TreeSet;
17 torben 2145 import java.util.concurrent.ConcurrentLinkedQueue;
18     import java.util.logging.Logger;
19    
20    
21 torben 2219
22 torben 2145 public class Database {
23     Logger logger = Logger.getLogger(Database.class.getName());
24 torben 2151
25 torben 2219 int batchCount = 0;
26 torben 2151
27 torben 2145 Connection conn;
28     PreparedStatement saveStmt;
29 torben 2247
30 torben 2263 Adresse alleAdresser[];
31 torben 2328 Adresse alleIkkeDaekkede[];
32 torben 2263
33 torben 2328
34 torben 2327 DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
35     DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>();
36    
37 torben 2328 Set<Integer> postnumre = new TreeSet<Integer>();
38    
39     Map<Integer, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Integer, List<Adresse>>();
40    
41    
42     private HashMap<Integer,BoundingBox> bbCache = new HashMap<Integer,BoundingBox>();
43 torben 2145
44 torben 2157 public Database(SafeProperties conf) throws SQLException,IOException {
45 torben 2152 this.conn = getConnection( conf );
46 torben 2151
47 torben 2192 String sql = "INSERT INTO fulddaekning.afstand_anden_rute_ny (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
48 torben 2151 "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
49 torben 2145
50 torben 2150 saveStmt = conn.prepareStatement(sql);
51 torben 2151
52 torben 2145 }
53 torben 2151
54     public void resetResultTable() throws SQLException {
55 torben 2192 logger.info("Dropping old result table (if exists)");
56     String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_ny";
57 torben 2151 conn.createStatement().executeUpdate(sql);
58 torben 2192
59     logger.info("Create new result table");
60     sql = "CREATE TABLE fulddaekning.afstand_anden_rute_ny LIKE fulddaekning.afstand_anden_rute";
61     conn.createStatement().executeUpdate(sql);
62 torben 2151 }
63 torben 2192
64     public void renameResultTables() throws SQLException {
65 torben 2223 Constants consts = Constants.getInstance();
66     String ext = consts.getTableExtension();
67    
68 torben 2192 logger.info("Dropping old backup table (if exists)");
69 torben 2223 String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_old" + ext;
70 torben 2192 conn.createStatement().executeUpdate(sql);
71    
72     logger.info("Rename tables");
73 torben 2224 sql = "RENAME TABLE fulddaekning.afstand_anden_rute" + ext + " TO fulddaekning.afstand_anden_rute_old" + ext + ", fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute" + ext;
74 torben 2230
75     logger.info("Executing: " + sql);
76 torben 2192 conn.createStatement().executeUpdate(sql);
77 torben 2247 }
78    
79 torben 2328 public BoundingBox getBoundingbox(int postnr) {
80 torben 2247 BoundingBox bb = bbCache.get(postnr);
81     return bb.clone();//never return the original / cached object
82     }
83    
84    
85 torben 2328 public Set<Integer> hentPostnumreCache() {
86     return postnumre;
87     }
88 torben 2151
89 torben 2328
90     public void hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr) throws SQLException {
91 torben 2238
92 torben 2328 logger.info("Henter alle IKKE-daekkede adresser");
93 torben 2151
94 torben 2231 String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
95     "FROM fulddaekning.adressetabel a " +
96     "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
97 torben 2145 "WHERE rute IS NULL " + //Ingen dækning
98 torben 2238 "AND a.postnr BETWEEN ? AND ? " +
99 torben 2145 "AND latitude IS NOT NULL " +
100     "AND longitude IS NOT NULL " +
101 torben 2235 "AND gadeid IS NOT NULL " +
102     "AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";
103 torben 2145 PreparedStatement stmt = conn.prepareStatement(sql);
104 torben 2328 stmt.setInt(1, minPostnr);
105     stmt.setInt(2, maxPostnr);
106 torben 2151
107 torben 2328 List<Adresse> list = hentAdresseListe( stmt );
108     alleIkkeDaekkede = list.toArray( new Adresse[ list.size() ] );
109 torben 2203
110 torben 2328 logger.info("Analyserer ikke-daekkede adresser");
111 torben 2238
112 torben 2328 for (Adresse a : alleIkkeDaekkede) {
113    
114     List<Adresse> postListe;
115    
116     BoundingBox bbox;
117    
118     if (! postnumre.contains(a.postnr )) {
119     postnumre.add( a.postnr );
120    
121     bbox = new BoundingBox();
122     postListe = new ArrayList<Adresse>();
123    
124     bbCache.put( a.postnr, bbox);
125     ikkeDaekkedePrPost.put(a.postnr, postListe);
126    
127     } else {
128     bbox = bbCache.get( a.postnr);
129     postListe = ikkeDaekkedePrPost.get(a.postnr);
130     }
131    
132     bbox.latitudeMax = Math.max(bbox.latitudeMax, a.latitude);
133     bbox.latitudeMin = Math.min(bbox.latitudeMin, a.latitude);
134     bbox.longitudeMax = Math.max(bbox.longitudeMax, a.longitude);
135     bbox.longitudeMin = Math.min(bbox.longitudeMin, a.longitude);
136    
137     postListe.add(a);
138    
139 torben 2145 }
140     }
141 torben 2328
142     public Queue<Adresse> hentIkkedaekkedeAdresserCache(int postnr) {
143     List<Adresse> postListe = ikkeDaekkedePrPost.get(postnr);
144    
145     return new ConcurrentLinkedQueue<Adresse>(postListe);
146     }
147 torben 2151
148 torben 2225
149 torben 2263 public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox) {
150     long start = System.currentTimeMillis();
151     ArrayList<Adresse> list = new ArrayList<Adresse>();
152     for (Adresse a : alleAdresser) {
153     if ( a.latitude > bbox.latitudeMin && a.latitude< bbox.latitudeMax && a.longitude> bbox.longitudeMin && a.longitude < bbox.longitudeMax) {
154     list.add(a);
155     }
156     }
157     long stop = System.currentTimeMillis();
158     logger.info("Elapsed cache: " + (stop - start));
159     return list.toArray( new Adresse[ list.size() ] );
160     }
161 torben 2225
162 torben 2263
163 torben 2225 public Adresse[] hentAlleDaekkedeAdresser() throws SQLException {
164 torben 2263 if ( alleAdresser == null ) {
165     String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
166     "FROM fulddaekning.adressetabel a " +
167     "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
168     "WHERE rute IS NOT NULL " +
169     "AND latitude IS NOT NULL " +
170     "AND longitude IS NOT NULL " +
171     "AND a.distributor = ? ";
172    
173     // Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
174     // Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html
175     //PreparedStatement stmt = conn.prepareStatement(sql);
176     PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
177     stmt.setFetchSize(Integer.MIN_VALUE);
178    
179     stmt.setString(1, LookupMain.distributor);
180    
181     List<Adresse> list = hentAdresseListe( stmt );
182     alleAdresser = list.toArray( new Adresse[ list.size() ] );
183     }
184     return alleAdresser;
185 torben 2145 }
186 torben 2225
187    
188 torben 2145
189     public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException {
190     /*String sql = "INSERT INTO fulddaekning.afstand_anden_rute_thn (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
191     "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
192 torben 2151
193 torben 2145 PreparedStatement saveStmt = conn.prepareStatement(sql);*/
194 torben 2151
195 torben 2145 saveStmt.setInt(1, orgAdresse.id);
196     saveStmt.setInt(2, orgAdresse.postnr);
197     saveStmt.setString(3, orgAdresse.adresse);
198     saveStmt.setInt(4, orgAdresse.gadeid);
199     saveStmt.setInt(5, orgAdresse.husnr);
200     saveStmt.setString(6, orgAdresse.husnrbogstav);
201     saveStmt.setDouble(7, orgAdresse.latitude);
202     saveStmt.setDouble(8, orgAdresse.longitude);
203     saveStmt.setString(9, orgAdresse.rute);
204 torben 2151
205    
206 torben 2145 saveStmt.setInt(10, bedsteAdresse.id);
207     saveStmt.setInt(11, bedsteAdresse.postnr);
208     saveStmt.setString(12, bedsteAdresse.adresse);
209     saveStmt.setInt(13, bedsteAdresse.gadeid);
210     saveStmt.setInt(14, bedsteAdresse.husnr);
211     saveStmt.setString(15, bedsteAdresse.husnrbogstav);
212     saveStmt.setDouble(16, bedsteAdresse.latitude);
213     saveStmt.setDouble(17, bedsteAdresse.longitude);
214     saveStmt.setString(18, bedsteAdresse.rute);
215 torben 2151
216 torben 2145 saveStmt.setDouble(19, bedsteAfstand);
217 torben 2151
218 torben 2219 saveStmt.addBatch();
219     batchCount++;
220     if (batchCount >= 100) {
221     saveStmt.executeBatch();
222     batchCount = 0;
223     }
224     //saveStmt.executeUpdate();
225     //saveStmt.clearParameters();
226 torben 2151
227 torben 2145 //saveStmt.close();
228     }
229 torben 2219
230     public synchronized void saveBatch() throws SQLException{
231     saveStmt.executeBatch();
232     batchCount = 0;
233     }
234 torben 2151
235    
236    
237 torben 2145 protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{
238 torben 2210 ArrayList<Adresse> list = new ArrayList<Adresse>( 1000000 );
239 torben 2151
240 torben 2145 //logger.info("Starting query");
241     ResultSet res = stmt.executeQuery();
242     //logger.info("Starting exec query done");
243 torben 2151
244 torben 2145 while (res.next()) {
245     Adresse adr = new Adresse();
246 torben 2261
247     /*
248 torben 2145 adr.id = res.getInt("id");
249     adr.postnr = res.getInt("postnr");
250     adr.adresse = res.getString("adresse");
251     adr.gadeid = res.getInt("gadeid");
252     adr.husnr = res.getInt("husnr");
253     adr.husnrbogstav = res.getString("husnrbogstav");
254     adr.latitude = res.getDouble("latitude");
255     adr.longitude = res.getDouble("longitude");
256     adr.rute = res.getString("rute");
257 torben 2231 adr.ho = res.getInt("ho");
258 torben 2261 */
259    
260     adr.id = res.getInt(1);
261     adr.postnr = res.getInt(2);
262     adr.adresse = res.getString(3);
263     adr.gadeid = res.getInt(4);
264     adr.husnr = res.getInt(5);
265 torben 2327 adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) );
266 torben 2261 adr.latitude = res.getDouble(7);
267     adr.longitude = res.getDouble(8);
268 torben 2327 adr.rute = ruteCache.getInstance( res.getString(9) );
269 torben 2261 adr.ho = res.getInt(10);
270 torben 2151
271 torben 2145 list.add(adr);
272 torben 2151
273 torben 2145 //logger.info( "Adress:" + adr);
274     }
275 torben 2151
276 torben 2145 res.close();
277     stmt.close();
278 torben 2151
279 torben 2145 return list;
280     }
281    
282 torben 2157 public Connection getConnection(SafeProperties conf) throws SQLException, IOException {
283 torben 2152
284 torben 2157 String db_host = conf.getSafeProperty("DB_HOST");
285     String db_user = conf.getSafeProperty("DB_USER");
286     String db_pass = conf.getSafeProperty("DB_PASS");
287 torben 2145
288 torben 2152
289    
290 torben 2151
291 torben 2152 Connection conn = null;
292     Properties connectionProps = new Properties();
293     connectionProps.put("user", db_user);
294     connectionProps.put("password", db_pass);
295    
296 torben 2220 //For debug output, tilføj denne til JDBC url'en: &profileSQL=true
297 torben 2152 conn = DriverManager.getConnection(
298     "jdbc:mysql://" +
299     db_host +
300 torben 2218 ":3306/?rewriteBatchedStatements=true",
301 torben 2152 connectionProps);
302     logger.info("Connected to database");
303     return conn;
304     }
305    
306 torben 2328
307     // //////////////////////////////////////////////////////////////////
308 torben 2330 /*
309 torben 2328 @Deprecated
310     private BoundingBox getBoundingboxFromDb_old(String postnr) throws SQLException {
311     String minPostnr = postnr.replace('x', '0');
312     String maxPostnr = postnr.replace('x', '9');
313    
314     String sql =
315     "SELECT max(latitude) latmax, min(latitude) latmin, max(longitude) lngmax,min(longitude) lngmin " +
316     "FROM fulddaekning.adressetabel WHERE postnr BETWEEN ? and ? and rute is null;";
317    
318     PreparedStatement stmt = conn.prepareStatement(sql);
319     stmt.setString(1, minPostnr);
320     stmt.setString(2, maxPostnr);
321    
322     ResultSet res = stmt.executeQuery();
323     res.next(); //query returnerer altid 1 række
324    
325     BoundingBox bbox = new BoundingBox();
326     bbox.latitudeMax = res.getDouble("latmax");
327     bbox.latitudeMin = res.getDouble("latmin");
328     bbox.longitudeMax = res.getDouble("lngmax");
329     bbox.longitudeMin = res.getDouble("lngmin");
330    
331     res.close();
332     stmt.close();
333    
334     return bbox;
335     }
336    
337     @Deprecated
338     public Adresse[] hentDaekkedeAdresser_old( BoundingBox bbox) throws SQLException {
339     long start = System.currentTimeMillis();
340     String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
341     "FROM fulddaekning.adressetabel a " +
342     "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
343     "WHERE rute IS NOT NULL " +
344     "AND latitude BETWEEN ? AND ? " +
345     "AND longitude BETWEEN ? AND ? " +
346     "AND a.distributor = ? ";
347    
348     // Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
349     // Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html
350     //PreparedStatement stmt = conn.prepareStatement(sql);
351     PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
352     stmt.setFetchSize(Integer.MIN_VALUE);
353    
354     stmt.setDouble(1, bbox.latitudeMin);
355     stmt.setDouble(2, bbox.latitudeMax);
356     stmt.setDouble(3, bbox.longitudeMin);
357     stmt.setDouble(4, bbox.longitudeMax);
358     stmt.setString(5, LookupMain.distributor);
359    
360     List<Adresse> list = hentAdresseListe( stmt );
361     long stop = System.currentTimeMillis();
362     logger.info("Elapsed DB: " + (stop - start));
363     return list.toArray( new Adresse[ list.size() ] );
364     }
365    
366     @Deprecated
367     public Queue<Adresse> hentIkkedaekkedeAdresser_old(String postnr) throws SQLException {
368    
369     String minPostnr = postnr.replace('x', '0');
370     String maxPostnr = postnr.replace('x', '9');
371    
372     ConcurrentLinkedQueue<Adresse> queue = new ConcurrentLinkedQueue<Adresse>();
373    
374     String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
375     "FROM fulddaekning.adressetabel a " +
376     "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
377     "WHERE rute IS NULL " + //Ingen dækning
378     "AND a.postnr BETWEEN ? AND ? " +
379     "AND latitude IS NOT NULL " +
380     "AND longitude IS NOT NULL " +
381     "AND gadeid IS NOT NULL " +
382     "AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";
383     PreparedStatement stmt = conn.prepareStatement(sql);
384     stmt.setString(1, minPostnr);
385     stmt.setString(2, maxPostnr);
386    
387     queue.addAll( hentAdresseListe( stmt ) );
388     return queue;
389     }
390    
391     @Deprecated
392     public List<String> hentPostnumre_old() throws SQLException {
393     ArrayList<String> list = new ArrayList<String>();
394    
395     Constants consts = Constants.getInstance();
396    
397     /*
398     String sql = "SELECT postnr " +
399     "FROM fulddaekning.adressetabel " +
400     "WHERE postnr BETWEEN ? AND ? " +
401     "AND rute is null " + // Træk kun liste på postnumre hvor der er ikke-dækkede adresser
402     "GROUP BY postnr " +
403     "ORDER by postnr";
404 torben 2330 * /
405 torben 2328
406    
407     String sql = "SELECT rpad(left(postnr,?),'4', 'x') as postnr2 " +
408     "FROM fulddaekning.adressetabel " +
409     "WHERE postnr BETWEEN ? AND ? " +
410     "AND rute is null " + // Trae kun liste paa postnumre hvor der er ikke-daekede adresser
411     "AND (postnr NOT BETWEEN 3900 and 3999) " + //Skip alle groenlandske postnumre
412     "GROUP BY postnr2 " +
413     "ORDER by postnr2 ";
414    
415    
416    
417     PreparedStatement stmt = conn.prepareStatement(sql);
418     //stmt.setString(1, Lookup.distributor );
419    
420     stmt.setInt(1, consts.getPostnrGroup() );
421    
422     stmt.setInt(2, consts.getMinPostnr());
423     stmt.setInt(3, consts.getMaxPostnr());
424     ResultSet res = stmt.executeQuery();
425    
426     while (res.next()) {
427     String postnr = res.getString("postnr2");
428     list.add(postnr);
429     }
430     res.close();
431     stmt.close();
432    
433     //list.add(8700);
434    
435     return list;
436 torben 2330 }*/
437 torben 2328
438    
439 torben 2145 }

  ViewVC Help
Powered by ViewVC 1.1.20