xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1627 Sped up FFMp load by removing un-needed DB calls.

Browse source 
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956

Former-commit-id: 51e0b648c2 [formerly 83fe9ca104] [formerly 8247da158f] [formerly a8f6635a6f [formerly 8247da158f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]]
Former-commit-id: a8f6635a6f
Former-commit-id: 43df1692452b561e0563a12fb2d7b4e6d7f53414 [formerly 4cd9b2e8b2]
Former-commit-id: 7f6381ec5c
This commit is contained in:
Dave Hladky 2013-02-14 14:43:19 -06:00
parent ba8eb2b557
commit 7dd7e3c60a
1 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
View file

@ -11,7 +11,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.NavigableMap;
import java.util.SortedMap;
@ -26,9 +25,9 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPAggregateRecord;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPBasin;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPBasinData;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPAggregateRecord;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPCacheRecord;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPGuidanceBasin;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPGuidanceInterpolation;
@ -59,7 +58,6 @@ import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery.QueryLanguage;
import com.raytheon.uf.viz.core.comm.Loader;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.monitor.IMonitor;
import com.raytheon.uf.viz.monitor.ResourceMonitor;
@ -93,6 +91,7 @@ import com.raytheon.uf.viz.monitor.listeners.IMonitorListener;
* 01/10/13 1475 D. Hladky Cleaned up some logging.
* 01/27/13 1478 D. Hladky revamped cache file format, removed duplicate times
* 02/01/13 1569 D. Hladky updated constants
* 02/01/13 1627 D. Hladky removed unused(useless) db load method
*
* </pre>
*
@ -373,27 +372,6 @@ public class FFMPMonitor extends ResourceMonitor {
return hucLoadedUris;
}
/**
* Static to make it fast, at least that's the idea.
*
* @param uri
* @return
* @throws VizException
*/
private static FFMPRecord loadRecordFromDatabase(String uri)
throws VizException {
FFMPRecord ffmpRec = null;
if (uri != null) {
Map<String, Object> vals = new HashMap<String, Object>();
vals.put("pluginName", "ffmp");
vals.put("dataURI", uri);
ffmpRec = (FFMPRecord) Loader.loadData(vals);
}
return ffmpRec;
}
/**
* populate a new FFMPRecord
*
@ -432,7 +410,7 @@ public class FFMPMonitor extends ResourceMonitor {
.containsKey(uri)) {
try {
populateFFMPRecord(isProductLoad, siteKey,
loadRecordFromDatabase(uri),
new FFMPRecord(uri),
source, phuc);
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM,
@ -462,7 +440,7 @@ public class FFMPMonitor extends ResourceMonitor {
try {
populateFFMPRecord(isProductLoad, siteKey,
loadRecordFromDatabase(uri), source, phuc);
new FFMPRecord(uri), source, phuc);
} catch (VizException e) {
statusHandler.handle(Priority.INFO,
"FFMP Can't retrieve FFMP URI, " + uri, e);
@ -1840,10 +1818,8 @@ public class FFMPMonitor extends ResourceMonitor {
SourceXML source = getSourceConfig().getSource(sourceName);
if (uri != null) {
FFMPRecord record = new FFMPRecord(uri);
try {
record = populateFFMPRecord(isProductLoad, uri, siteKey,
FFMPRecord record = populateFFMPRecord(isProductLoad, uri, siteKey,
sourceName, phuc);
if ((record != null) && (source != null)) {
record.setExpiration(source.getExpirationMinutes(siteKey));