/[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 2424 - (hide annotations) (download)
Tue Mar 3 08:52:39 2015 UTC (9 years, 3 months ago) by torben
File size: 15274 byte(s)
Spar lidt cpu når der hentes det lille sæt af dækkede adresser
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 2225
148 torben 2424 public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox, Adresse adresseListe[] ) {
149 torben 2263 long start = System.currentTimeMillis();
150     ArrayList<Adresse> list = new ArrayList<Adresse>();
151 torben 2424 for (Adresse a : adresseListe) {
152 torben 2263 if ( a.latitude > bbox.latitudeMin && a.latitude< bbox.latitudeMax && a.longitude> bbox.longitudeMin && a.longitude < bbox.longitudeMax) {
153     list.add(a);
154     }
155     }
156     long stop = System.currentTimeMillis();
157     logger.info("Elapsed cache: " + (stop - start));
158     return list.toArray( new Adresse[ list.size() ] );
159     }
160 torben 2424
161 torben 2225
162 torben 2424 public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox) {
163     return hentDaekkedeAdresserCache(bbox, alleAdresser);
164     }
165 torben 2263
166 torben 2424
167    
168    
169 torben 2225 public Adresse[] hentAlleDaekkedeAdresser() throws SQLException {
170 torben 2263 if ( alleAdresser == null ) {
171     String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
172     "FROM fulddaekning.adressetabel a " +
173     "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
174     "WHERE rute IS NOT NULL " +
175     "AND latitude IS NOT NULL " +
176     "AND longitude IS NOT NULL " +
177     "AND a.distributor = ? ";
178    
179     // Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
180     // Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html
181     PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
182     stmt.setFetchSize(Integer.MIN_VALUE);
183    
184     stmt.setString(1, LookupMain.distributor);
185    
186     List<Adresse> list = hentAdresseListe( stmt );
187     alleAdresser = list.toArray( new Adresse[ list.size() ] );
188     }
189     return alleAdresser;
190 torben 2145 }
191 torben 2225
192    
193 torben 2145
194     public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException {
195     /*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`) "+
196     "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
197 torben 2151
198 torben 2145 PreparedStatement saveStmt = conn.prepareStatement(sql);*/
199 torben 2151
200 torben 2145 saveStmt.setInt(1, orgAdresse.id);
201     saveStmt.setInt(2, orgAdresse.postnr);
202     saveStmt.setString(3, orgAdresse.adresse);
203     saveStmt.setInt(4, orgAdresse.gadeid);
204     saveStmt.setInt(5, orgAdresse.husnr);
205     saveStmt.setString(6, orgAdresse.husnrbogstav);
206     saveStmt.setDouble(7, orgAdresse.latitude);
207     saveStmt.setDouble(8, orgAdresse.longitude);
208     saveStmt.setString(9, orgAdresse.rute);
209 torben 2151
210    
211 torben 2145 saveStmt.setInt(10, bedsteAdresse.id);
212     saveStmt.setInt(11, bedsteAdresse.postnr);
213     saveStmt.setString(12, bedsteAdresse.adresse);
214     saveStmt.setInt(13, bedsteAdresse.gadeid);
215     saveStmt.setInt(14, bedsteAdresse.husnr);
216     saveStmt.setString(15, bedsteAdresse.husnrbogstav);
217     saveStmt.setDouble(16, bedsteAdresse.latitude);
218     saveStmt.setDouble(17, bedsteAdresse.longitude);
219     saveStmt.setString(18, bedsteAdresse.rute);
220 torben 2151
221 torben 2145 saveStmt.setDouble(19, bedsteAfstand);
222 torben 2151
223 torben 2219 saveStmt.addBatch();
224     batchCount++;
225 torben 2423 if (batchCount >= 1000) {
226 torben 2219 saveStmt.executeBatch();
227     batchCount = 0;
228     }
229     //saveStmt.executeUpdate();
230     //saveStmt.clearParameters();
231 torben 2151
232 torben 2145 //saveStmt.close();
233     }
234 torben 2219
235     public synchronized void saveBatch() throws SQLException{
236     saveStmt.executeBatch();
237     batchCount = 0;
238     }
239 torben 2151
240    
241    
242 torben 2145 protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{
243 torben 2210 ArrayList<Adresse> list = new ArrayList<Adresse>( 1000000 );
244 torben 2151
245 torben 2145 //logger.info("Starting query");
246     ResultSet res = stmt.executeQuery();
247     //logger.info("Starting exec query done");
248 torben 2151
249 torben 2145 while (res.next()) {
250     Adresse adr = new Adresse();
251 torben 2261
252     /*
253 torben 2145 adr.id = res.getInt("id");
254     adr.postnr = res.getInt("postnr");
255     adr.adresse = res.getString("adresse");
256     adr.gadeid = res.getInt("gadeid");
257     adr.husnr = res.getInt("husnr");
258     adr.husnrbogstav = res.getString("husnrbogstav");
259     adr.latitude = res.getDouble("latitude");
260     adr.longitude = res.getDouble("longitude");
261     adr.rute = res.getString("rute");
262 torben 2231 adr.ho = res.getInt("ho");
263 torben 2261 */
264    
265     adr.id = res.getInt(1);
266     adr.postnr = res.getInt(2);
267     adr.adresse = res.getString(3);
268     adr.gadeid = res.getInt(4);
269     adr.husnr = res.getInt(5);
270 torben 2327 adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) );
271 torben 2261 adr.latitude = res.getDouble(7);
272     adr.longitude = res.getDouble(8);
273 torben 2327 adr.rute = ruteCache.getInstance( res.getString(9) );
274 torben 2261 adr.ho = res.getInt(10);
275 torben 2151
276 torben 2145 list.add(adr);
277 torben 2151
278 torben 2145 //logger.info( "Adress:" + adr);
279     }
280 torben 2151
281 torben 2145 res.close();
282     stmt.close();
283 torben 2151
284 torben 2145 return list;
285     }
286    
287 torben 2157 public Connection getConnection(SafeProperties conf) throws SQLException, IOException {
288 torben 2152
289 torben 2157 String db_host = conf.getSafeProperty("DB_HOST");
290     String db_user = conf.getSafeProperty("DB_USER");
291     String db_pass = conf.getSafeProperty("DB_PASS");
292 torben 2145
293 torben 2152
294    
295 torben 2151
296 torben 2152 Connection conn = null;
297     Properties connectionProps = new Properties();
298     connectionProps.put("user", db_user);
299     connectionProps.put("password", db_pass);
300    
301 torben 2220 //For debug output, tilføj denne til JDBC url'en: &profileSQL=true
302 torben 2152 conn = DriverManager.getConnection(
303     "jdbc:mysql://" +
304     db_host +
305 torben 2218 ":3306/?rewriteBatchedStatements=true",
306 torben 2152 connectionProps);
307     logger.info("Connected to database");
308     return conn;
309     }
310    
311 torben 2328
312     // //////////////////////////////////////////////////////////////////
313 torben 2330 /*
314 torben 2328 @Deprecated
315     private BoundingBox getBoundingboxFromDb_old(String postnr) throws SQLException {
316     String minPostnr = postnr.replace('x', '0');
317     String maxPostnr = postnr.replace('x', '9');
318    
319     String sql =
320     "SELECT max(latitude) latmax, min(latitude) latmin, max(longitude) lngmax,min(longitude) lngmin " +
321     "FROM fulddaekning.adressetabel WHERE postnr BETWEEN ? and ? and rute is null;";
322    
323     PreparedStatement stmt = conn.prepareStatement(sql);
324     stmt.setString(1, minPostnr);
325     stmt.setString(2, maxPostnr);
326    
327     ResultSet res = stmt.executeQuery();
328     res.next(); //query returnerer altid 1 række
329    
330     BoundingBox bbox = new BoundingBox();
331     bbox.latitudeMax = res.getDouble("latmax");
332     bbox.latitudeMin = res.getDouble("latmin");
333     bbox.longitudeMax = res.getDouble("lngmax");
334     bbox.longitudeMin = res.getDouble("lngmin");
335    
336     res.close();
337     stmt.close();
338    
339     return bbox;
340     }
341    
342     @Deprecated
343     public Adresse[] hentDaekkedeAdresser_old( BoundingBox bbox) throws SQLException {
344     long start = System.currentTimeMillis();
345     String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
346     "FROM fulddaekning.adressetabel a " +
347     "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
348     "WHERE rute IS NOT NULL " +
349     "AND latitude BETWEEN ? AND ? " +
350     "AND longitude BETWEEN ? AND ? " +
351     "AND a.distributor = ? ";
352    
353     // Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
354     // Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html
355     //PreparedStatement stmt = conn.prepareStatement(sql);
356     PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
357     stmt.setFetchSize(Integer.MIN_VALUE);
358    
359     stmt.setDouble(1, bbox.latitudeMin);
360     stmt.setDouble(2, bbox.latitudeMax);
361     stmt.setDouble(3, bbox.longitudeMin);
362     stmt.setDouble(4, bbox.longitudeMax);
363     stmt.setString(5, LookupMain.distributor);
364    
365     List<Adresse> list = hentAdresseListe( stmt );
366     long stop = System.currentTimeMillis();
367     logger.info("Elapsed DB: " + (stop - start));
368     return list.toArray( new Adresse[ list.size() ] );
369     }
370    
371     @Deprecated
372     public Queue<Adresse> hentIkkedaekkedeAdresser_old(String postnr) throws SQLException {
373    
374     String minPostnr = postnr.replace('x', '0');
375     String maxPostnr = postnr.replace('x', '9');
376    
377     ConcurrentLinkedQueue<Adresse> queue = new ConcurrentLinkedQueue<Adresse>();
378    
379     String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " +
380     "FROM fulddaekning.adressetabel a " +
381     "LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
382     "WHERE rute IS NULL " + //Ingen dækning
383     "AND a.postnr BETWEEN ? AND ? " +
384     "AND latitude IS NOT NULL " +
385     "AND longitude IS NOT NULL " +
386     "AND gadeid IS NOT NULL " +
387     "AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";
388     PreparedStatement stmt = conn.prepareStatement(sql);
389     stmt.setString(1, minPostnr);
390     stmt.setString(2, maxPostnr);
391    
392     queue.addAll( hentAdresseListe( stmt ) );
393     return queue;
394     }
395    
396     @Deprecated
397     public List<String> hentPostnumre_old() throws SQLException {
398     ArrayList<String> list = new ArrayList<String>();
399    
400     Constants consts = Constants.getInstance();
401    
402     /*
403     String sql = "SELECT postnr " +
404     "FROM fulddaekning.adressetabel " +
405     "WHERE postnr BETWEEN ? AND ? " +
406     "AND rute is null " + // Træk kun liste på postnumre hvor der er ikke-dækkede adresser
407     "GROUP BY postnr " +
408     "ORDER by postnr";
409 torben 2330 * /
410 torben 2328
411    
412     String sql = "SELECT rpad(left(postnr,?),'4', 'x') as postnr2 " +
413     "FROM fulddaekning.adressetabel " +
414     "WHERE postnr BETWEEN ? AND ? " +
415     "AND rute is null " + // Trae kun liste paa postnumre hvor der er ikke-daekede adresser
416     "AND (postnr NOT BETWEEN 3900 and 3999) " + //Skip alle groenlandske postnumre
417     "GROUP BY postnr2 " +
418     "ORDER by postnr2 ";
419    
420    
421    
422     PreparedStatement stmt = conn.prepareStatement(sql);
423     //stmt.setString(1, Lookup.distributor );
424    
425     stmt.setInt(1, consts.getPostnrGroup() );
426    
427     stmt.setInt(2, consts.getMinPostnr());
428     stmt.setInt(3, consts.getMaxPostnr());
429     ResultSet res = stmt.executeQuery();
430    
431     while (res.next()) {
432     String postnr = res.getString("postnr2");
433     list.add(postnr);
434     }
435     res.close();
436     stmt.close();
437    
438     //list.add(8700);
439    
440     return list;
441 torben 2330 }*/
442 torben 2328
443    
444 torben 2145 }

  ViewVC Help
Powered by ViewVC 1.1.20