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

Issue #647: Ensure insert time is updated when processing backdated

Browse source 
redbook data, address peer review comment.

Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e

Former-commit-id: ff34c58b1b [formerly 09dcd35e4a] [formerly db75f1860b [formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]]
Former-commit-id: db75f1860b
Former-commit-id: 6efe780ad6
This commit is contained in:
David Gillingham 2012-05-23 17:33:49 -05:00
parent 031558955d
commit f1343b9a6e
2 changed files with 72 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

124
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/RedbookDecoder.java
View file

@ -19,19 +19,18 @@
**/
package com.raytheon.edex.plugin.redbook;
import java.util.ArrayList;
import java.util.Date;
import com.raytheon.edex.esb.Headers;
import com.raytheon.edex.exception.DecoderException;
import com.raytheon.edex.plugin.AbstractDecoder;
import com.raytheon.uf.edex.database.plugin.PluginFactory;
import com.raytheon.edex.plugin.redbook.common.RedbookRecord;
import com.raytheon.edex.plugin.redbook.dao.RedbookDao;
import com.raytheon.edex.plugin.redbook.decoder.RedbookParser;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.edex.database.plugin.PluginFactory;
import com.raytheon.uf.edex.wmo.message.WMOHeader;
/**
@ -48,6 +47,8 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* 20080529 1131 jkorman Added new Separator constructor.
* 11/11/08 1684 chammack Refactored to camel
* 20090327 2019 jkorman Added code to check for non-redbook data.
* 20120524 #647 dgilling Update persistence time in
* createdBackDatedVersionIfNeeded.
* </pre>
*
* @author jkorman
@ -157,60 +158,71 @@ public class RedbookDecoder extends AbstractDecoder {
return reports;
}
private PluginDataObject[] createMergedRecordList(RedbookRecord report) throws PluginException {
ArrayList<PluginDataObject> listResult = new ArrayList<PluginDataObject>();
RedbookRecord newRecord = report;
while (newRecord != null) {
// Note that this newRecord may be modified by createdBackDatedVersionIfNeeded.
listResult.add(newRecord);
newRecord = createdBackDatedVersionIfNeeded(newRecord);
}
return listResult.toArray(new PluginDataObject[listResult.size()]);
}
private RedbookRecord createdBackDatedVersionIfNeeded(RedbookRecord record) {
RedbookDao dao;
RedbookRecord existingRecord;
try {
dao = (RedbookDao) PluginFactory.getInstance().getPluginDao(PLUGIN_NAME);
existingRecord = (RedbookRecord) dao.getMetadata(record.getDataURI());
} catch (PluginException e) {
logger.error(traceId + "Could not create back-dated copy of " +
record.getDataURI(), e);
return null;
}
if (existingRecord != null) {
try {
existingRecord = dao.getFullRecord((RedbookRecord) existingRecord);
} catch (Exception e) {
logger.error(traceId + "Could not retrieve existing " +
record.getDataURI(), e);
return null;
}
RedbookRecord backDatedRecord;
try {
backDatedRecord = existingRecord.createBackdatedVersion();
backDatedRecord.setPluginName(PLUGIN_NAME);
backDatedRecord.constructDataURI();
} catch (PluginException e) {
logger.error(traceId + "Could not create back-dated copy of " +
record.getDataURI(), e);
return null;
}
record.setOverwriteAllowed(true);
dao.delete(existingRecord); // replace op does not update metadata ?!
logger.info("Storing new version of " + record.getDataURI());
return backDatedRecord;
} else {
return null;
}
}
private PluginDataObject[] createMergedRecordList(RedbookRecord report)
throws PluginException {
ArrayList<PluginDataObject> listResult = new ArrayList<PluginDataObject>();
RedbookRecord newRecord = report;
while (newRecord != null) {
// Note that this newRecord may be modified by
// createdBackDatedVersionIfNeeded.
listResult.add(newRecord);
newRecord = createdBackDatedVersionIfNeeded(newRecord);
}
return listResult.toArray(new PluginDataObject[listResult.size()]);
}
private RedbookRecord createdBackDatedVersionIfNeeded(RedbookRecord record) {
RedbookDao dao;
RedbookRecord existingRecord;
try {
dao = (RedbookDao) PluginFactory.getInstance().getPluginDao(
PLUGIN_NAME);
existingRecord = (RedbookRecord) dao.getMetadata(record
.getDataURI());
} catch (PluginException e) {
logger.error(traceId + "Could not create back-dated copy of "
+ record.getDataURI(), e);
return null;
}
if (existingRecord != null) {
try {
existingRecord = dao.getFullRecord(existingRecord);
} catch (Exception e) {
logger.error(
traceId + "Could not retrieve existing "
+ record.getDataURI(), e);
return null;
}
RedbookRecord backDatedRecord;
try {
backDatedRecord = existingRecord.createBackdatedVersion();
// this must be updated so that the insert time is updated
// and the Wes2Bridge archiver properly finds these backdated
// records
backDatedRecord.setPersistenceTime(new Date());
backDatedRecord.setPluginName(PLUGIN_NAME);
backDatedRecord.constructDataURI();
} catch (PluginException e) {
logger.error(traceId + "Could not create back-dated copy of "
+ record.getDataURI(), e);
return null;
}
record.setOverwriteAllowed(true);
dao.delete(existingRecord); // replace op does not update metadata
// ?!
logger.info("Storing new version of " + record.getDataURI());
return backDatedRecord;
} else {
return null;
}
}
/**
* Check here to see if we have non-redbook data. It's hard to determine
* that we actually have valid redbook, so we check for the signatures of

5
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/DatabaseArchiver.java
View file

@ -323,7 +323,10 @@ public class DatabaseArchiver implements IPluginArchiver {
+ " records from disk");
// merge records by data URI
Map<Object, PersistableDataObject> dataMap = new LinkedHashMap<Object, PersistableDataObject>();
int mapInitialSize = (int) (1.3f * (prev.size() + pdosToSerialize
.size()));
Map<Object, PersistableDataObject> dataMap = new LinkedHashMap<Object, PersistableDataObject>(
mapInitialSize);
for (PersistableDataObject pdo : prev) {
dataMap.put(pdo.getIdentifier(), pdo);
}