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

Merge "Issue #1293 - remove hdffileid and create delta script to update existing databases" into omaha_13.4.1

Browse source 
Former-commit-id: befaab5f3f [formerly 9cdbdbfd33] [formerly 0abecda3d1] [formerly 0abecda3d1 [formerly aba25dc7c4]] [formerly befaab5f3f [formerly 9cdbdbfd33] [formerly 0abecda3d1] [formerly 0abecda3d1 [formerly aba25dc7c4]] [formerly e95911f615 [formerly 0abecda3d1 [formerly aba25dc7c4] [formerly e95911f615 [formerly ecf4556f6bf0b1ca13013a0f5143a0f840218a13]]]]]
Former-commit-id: e95911f615
Former-commit-id: 74e36160fd [formerly 62a78ea4f2] [formerly c9afa907cd] [formerly c819be56f64193d7a2880b9a1cd5a1c5efd5914f [formerly f6aa539f4fd427c0baeaf1aa88fa654fe1a37b84] [formerly c9afa907cd [formerly afef66b87e]]]
Former-commit-id: 659e34e93b7b99dd5f4b5a2fbd3a25b41d9d98f1 [formerly 095c33421d535f5865818556b5c005c1cdad2717] [formerly bde2fdcbf8 [formerly 0c2f84de7f]]
Former-commit-id: bde2fdcbf8
Former-commit-id: 7225ebfc16
This commit is contained in:
Richard Peter 2013-04-08 14:20:09 -05:00 • committed by Gerrit Code Review
commit 60d0095f95
30 changed files with 86 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableDataRecord.java
View file

@ -35,6 +35,7 @@ import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 30, 2012 mschenke Initial creation
* Apr 8, 2013 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -55,8 +56,6 @@ public class VIIRSRequestableDataRecord extends VIIRSDataRecord {
boolean channelsSame = true;
Double lastWavelength = null;
boolean wavelengthsSame = true;
Integer lastHdf5FileId = null;
boolean hdf5FileIdsSame = true;
String lastChannelType = null;
boolean channelTypeSame = true;
// We will build ourself from our base records, anything that isn't
@ -73,7 +72,6 @@ public class VIIRSRequestableDataRecord extends VIIRSDataRecord {
lastChannelType = record.getChannelType();
lastChannel = record.getChannel();
lastWavelength = record.getWavelength();
lastHdf5FileId = record.getHdfFileId();
} else {
if (channelTypeSame
&& equals(lastChannelType, record.getChannelType()) == false) {
@ -87,10 +85,6 @@ public class VIIRSRequestableDataRecord extends VIIRSDataRecord {
&& equals(lastWavelength, record.getWavelength()) == false) {
wavelengthsSame = false;
}
if (hdf5FileIdsSame
&& equals(lastHdf5FileId, record.getHdfFileId()) == false) {
hdf5FileIdsSame = false;
}
if (record.getLevels() < getLevels()) {
// We want minimum levels of all base records
setLevels(record.getLevels());
@ -108,9 +102,6 @@ public class VIIRSRequestableDataRecord extends VIIRSDataRecord {
if (wavelengthsSame) {
setWavelength(lastWavelength);
}
if (hdf5FileIdsSame) {
setHdfFileId(lastHdf5FileId);
}
setParameter(requestableData.getParameter());
try {
constructDataURI();

4
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java
View file

@ -87,7 +87,8 @@ import com.raytheon.uf.viz.derivparam.library.IDerivParamField;
* Nov 21, 2009 #3576 rjpeter Refactored use of DerivParamDesc.
* - AWIPS2 Baseline Repository --------
* 08/03/2012 798 jkorman Explicitly set interpolationLevels
* from "source" record.
* from "source" record.
* 04/08/2013 #1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author jsanchez
@ -178,7 +179,6 @@ public class SatelliteDataCubeAdapter implements IDataCubeAdapter {
derivedRecord.setCoverage(record.getCoverage());
// This should not be necessary but file based tile set
// expects it.
derivedRecord.setHdfFileId(record.getHdfFileId());
try {
derivedRecord.setDataURI(null);
derivedRecord.constructDataURI();

35
deltaScripts/13.4.1/removeHdffileidColumn.sh Normal file
View file

@ -0,0 +1,35 @@
#!/bin/bash
#!/bin/bash
# DR #1846 - this update script will remove all hdffileid columns from the metadata database
PSQL="/awips2/psql/bin/psql"
SQL="SELECT table_name FROM information_schema.columns WHERE column_name = 'hdffileid';"
_table_list_txt=tablelist.txt
echo "INFO: update started."
# retrieve the tables
${PSQL} -U awips -d metadata -c "${SQL}" -t -o ${_table_list_txt}
if [ $? -ne 0 ]; then
echo "ERROR: Failed to retrieve the list of tables."
echo "FATAL: The update has failed."
exit 1
fi
for table in `cat ${_table_list_txt}`;
do
${PSQL} -U awips -d metadata -c "ALTER TABLE ${table} DROP COLUMN hdffileid CASCADE;"
if [ $? -ne 0 ]; then
echo "ERROR: Failed to drop column hdffileid in table ${table}."
echo "FATAL: The update has failed."
exit 1
fi
done
rm -f ${_table_list_txt}
echo "INFO: the update has completed successfully!"
exit 0

2
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
View file

@ -82,6 +82,7 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
* 11/05/12 #1310 dgilling Remove code from updateCatches()
* that sent notification to D2DParmIdCache.
* 01/14/13 #1469 bkowal Removed the hdf5 data directory
* 04/08/13 #1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -415,7 +416,6 @@ public class GribDao extends PluginDao {
throws PluginException {
List<StorageException> exceptions = new ArrayList<StorageException>();
IPersistable persistable = pdo;
persistable.setHdfFileId(EDEXUtil.getServerId());
// get the directory
String directory = pdo.getPluginName() + File.separator

5
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
View file

@ -36,7 +36,7 @@ import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.raytheon.uf.common.time.DataTime;
@ -56,6 +56,7 @@ import com.raytheon.uf.common.time.DataTime;
* ------------ ---------- ----------- --------------------------
* 20080512 1131 jkorman Initial implementation.
* 20080529 1131 jkorman getPersistenceTime now returns system time.
* 20130408 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author jkorman
@ -66,7 +67,7 @@ import com.raytheon.uf.common.time.DataTime;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class RedbookRecord extends ServerSpecificPersistablePluginDataObject
public class RedbookRecord extends PersistablePluginDataObject
implements IPersistable, Cloneable {
private static final long serialVersionUID = 1L;

5
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
View file

@ -35,7 +35,7 @@ import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.binlightning.impl.LightningStrikePoint;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.StorageException;
import com.raytheon.uf.common.datastorage.records.ByteDataRecord;
@ -69,6 +69,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* 20080708 1174 jkorman Added persistenceTime handling.
* 20090206 1990 bphillip Removed populateDataStore method
* 20130227 DCS 152 jgerth/elau Support for WWLLN and multiple sources
* 20130408 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author jkorman
@ -80,7 +81,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
@DynamicSerialize
@XmlAccessorType(XmlAccessType.NONE)
public class BinLightningRecord extends
ServerSpecificPersistablePluginDataObject implements IPersistable {
PersistablePluginDataObject implements IPersistable {
/** Serializable id * */
private static final long serialVersionUID = 1L;

5
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
View file

@ -42,7 +42,7 @@ import org.opengis.referencing.crs.ProjectedCRS;
import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.radar.RadarStation;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.Request;
@ -69,6 +69,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 06/03/09 2037 D. Hladky Initial release
* 04/08/13 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -80,7 +81,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class CWATRecord extends ServerSpecificPersistablePluginDataObject
public class CWATRecord extends PersistablePluginDataObject
implements IPersistable, ISpatialEnabled {
private static final long serialVersionUID = 76774564365671L;

5
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
View file

@ -41,7 +41,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.StorageException;
@ -69,6 +69,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* 06/03/09 2521 D. Hladky Initial release
* 01/27/13 1478 D. Hladky OUN memory help
* Feb 28, 2013 1729 dhladky Supressed un-necessary debug loggers
* Apr 8, 2013 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -80,7 +81,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class FFMPRecord extends ServerSpecificPersistablePluginDataObject
public class FFMPRecord extends PersistablePluginDataObject
implements IPersistable {
private static final long serialVersionUID = 76774564365671L;

5
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
View file

@ -40,7 +40,7 @@ import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.fog.analysis.FogRange;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
@ -58,6 +58,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 12/12/09 D. Hladky Initial release
* 04/08/13 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -69,7 +70,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class FogRecord extends ServerSpecificPersistablePluginDataObject
public class FogRecord extends PersistablePluginDataObject
implements IPersistable {
private static final long serialVersionUID = 76774564365671L;

2
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
View file

@ -60,6 +60,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 4/7/09 1994 bphillip Initial Creation
* 04/08/13 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -210,7 +211,6 @@ public class GribRecord extends PersistablePluginDataObject implements
this.dataTime = recordToCopy.dataTime.clone();
}
this.dataURI = recordToCopy.dataURI;
this.setHdfFileId(recordToCopy.getHdfFileId());
this.id = recordToCopy.id;
this.identifier = recordToCopy.identifier;
if (recordToCopy.insertTime != null) {

5
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
View file

@ -42,7 +42,7 @@ import org.opengis.referencing.crs.ProjectedCRS;
import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.radar.RadarStation;
import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants.DHRValues;
import com.raytheon.uf.common.datastorage.IDataStore;
@ -71,6 +71,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 01/25/10 3796 D. Hladky Initial release
* 04/08/13 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -82,7 +83,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class PrecipRateRecord extends ServerSpecificPersistablePluginDataObject
public class PrecipRateRecord extends PersistablePluginDataObject
implements IMonitorProcessing {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(PrecipRateRecord.class);

5
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
View file

@ -38,7 +38,7 @@ import org.opengis.referencing.crs.ProjectedCRS;
import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.radar.RadarStation;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
@ -62,6 +62,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* 2/24/09 2027 D. Hladky Initial release
* 4/27/12 #562 dgilling Rename getters/setters to
* match Java conventions.
* 04/08/13 #1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -73,7 +74,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class QPFRecord extends ServerSpecificPersistablePluginDataObject
public class QPFRecord extends PersistablePluginDataObject
implements ISpatialEnabled, IMonitorProcessing {
private static final long serialVersionUID = 767763365671L;

2
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
View file

@ -121,6 +121,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* 03/04/2013 DCS51 zwang Handle MIGFA product
* Mar 18, 2013 1804 bsteffen Remove AlphanumericValues from radar
* HDF5.
* Apr 08, 2013 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author bphillip
@ -366,7 +367,6 @@ public class RadarRecord extends PersistablePluginDataObject implements
this.dataTime = that.dataTime;
this.insertTime = that.insertTime;
this.messageData = that.messageData;
this.setHdfFileId(that.getHdfFileId());
this.productCode = that.productCode;
this.gateResolution = that.gateResolution;
this.icao = that.icao;

5
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java
View file

@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.geospatial.ISpatialEnabled;
@ -60,6 +60,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* 07/30/2012 798 jkorman Support for common satellite data.
* 03/25/2013 1823 dgilling Replace underscores with spaces in URI
* constructor.
* 04/08/2013 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author bphillip
@ -70,7 +71,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class SatelliteRecord extends ServerSpecificPersistablePluginDataObject
public class SatelliteRecord extends PersistablePluginDataObject
implements ISpatialEnabled {
private static final long serialVersionUID = 1L;

5
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
View file

@ -37,7 +37,7 @@ import org.geotools.coverage.grid.GridGeometry2D;
import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.scan.data.ModelData;
import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData;
import com.raytheon.uf.common.dataplugin.scan.data.SoundingData;
@ -66,6 +66,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* 03/17/10 2521 D. Hladky Initial release
* 02/01/13 1649 D. Hladky better logging,
* Feb 28, 2013 1731 bsteffen Optimize construction of scan resource.
* Apr 8, 2013 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -78,7 +79,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class ScanRecord extends ServerSpecificPersistablePluginDataObject {
public class ScanRecord extends PersistablePluginDataObject {
/**
*

5
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
View file

@ -38,7 +38,7 @@ import org.opengis.referencing.crs.ProjectedCRS;
import com.raytheon.uf.common.dataplugin.IDecoderGettable;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.ServerSpecificPersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.dataplugin.radar.RadarStation;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
@ -59,6 +59,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 1/14/09 2027 D. Hladky Initial release
* 04/08/13 #1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -70,7 +71,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class VILRecord extends ServerSpecificPersistablePluginDataObject
public class VILRecord extends PersistablePluginDataObject
implements ISpatialEnabled {
private static final long serialVersionUID = 767763365671L;

17
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
View file

@ -55,6 +55,7 @@ import com.raytheon.uf.common.time.util.TimeUtil;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 1/08/09 1674 bphillip Initial creation
* 04/08/13 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author bphillip
@ -231,7 +232,6 @@ public class DefaultPathProvider implements IHDFFilePathProvider {
*/
@Override
public String getHDFFileName(String pluginName, IPersistable persistable) {
Integer partition = persistable.getHdfFileId();
if (pluginName == null) {
throw new IllegalArgumentException(
"Expected argument pluginName not set on object "
@ -260,21 +260,10 @@ public class DefaultPathProvider implements IHDFFilePathProvider {
Date refTime = ((PluginDataObject) persistable).getDataTime()
.getRefTime();
sb.append(fileNameFormat.get().format(refTime));
if (partition != null) {
sb.append("-");
sb.append(partition);
}
sb.append(".h5");
return sb.toString();
}
if (partition == null) {
return pluginName + ".h5";
}
return pluginName + "-" + partition + ".h5";
return pluginName + ".h5";
}
}
}

14
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/IPersistable.java
View file

@ -41,6 +41,7 @@ import java.util.Date;
* Removed createHDF5Record method in favor
* of the more general populateDataStore method.
* 02/06/09 1990 bphillip Moved populateDataStore method to plugin specific dao implementations
* 04/08/13 1293 bkowal Removed references to hdffileid.
* </pre>
*
*/
@ -61,19 +62,6 @@ public interface IPersistable {
*/
public void setPersistenceTime(Date persistTime);
/**
* Return the hdf5 file id
*
* @return the hdf5 file id
*/
public Integer getHdfFileId();
/**
* @param hdfFileId
* the hdfFileId to set
*/
public void setHdfFileId(Integer hdfFileId);
/**
* Gets the HDF5 file path provider used by this object
*

19
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
View file

@ -42,6 +42,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 16, 2008 chammack Initial creation
* Apr 8, 2013 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -71,24 +72,6 @@ public abstract class PersistablePluginDataObject extends PluginDataObject
super();
}
/*
* (non-Javadoc)
*
* @see com.raytheon.edex.plugin.IPersistable#getHdfFileId()
*/
@Override
public Integer getHdfFileId() {
return null;
}
/**
* @param hdfFileId
* the hdfFileId to set
*/
@Override
public void setHdfFileId(Integer hdfFileId) {
}
/**
* Set the time to be used for the persistence time for this object.
*

95
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
View file

@ -1,95 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.common.dataplugin.persist;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/**
* Provides an abstract implementation of plugindataobject with clustered file
* support.
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 16, 2008 chammack Initial creation
* - AWIPS2 Baseline Repository --------
* 08/22/2012 798 jkorman Corrected hdfFileId persistence.
* </pre>
*
* @author chammack
* @version 1.0
*/
@Entity(name = "SS")
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public abstract class ServerSpecificPersistablePluginDataObject extends
PersistablePluginDataObject implements IPersistable {
private static final long serialVersionUID = 1L;
@XmlAttribute
@DynamicSerializeElement
@Column
private Integer hdfFileId;
/**
* Constructor
*/
public ServerSpecificPersistablePluginDataObject(String uri) {
super(uri);
}
/**
* Constructor
*/
public ServerSpecificPersistablePluginDataObject() {
super();
}
// TODO Setting hdf file id on ingest has been disabled in preparation
// of removing it altogether since it is OBE. After deployed sites have
// had this version for long enough that all data with hdfFileId has null
// hdfFileIds, then the getters/setters should be removed everywhere
// and this class can be deleted from the inheritance hierarchy. An
// update script will be needed at that time to drop the hdfFileId column.
@Override
public Integer getHdfFileId() {
return hdfFileId;
}
@Override
public void setHdfFileId(Integer hdfFileId) {
this.hdfFileId = hdfFileId;
}
}

10
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
View file

@ -63,6 +63,7 @@ import com.vividsolutions.jts.geom.Geometry;
* 9/20/2011 286 qzhou Change reportType to String
* 04/05/2012 420 dgilling Prevent NullPointerExceptions in
* buildMessageData().
* 04/08/13 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author jkorman
@ -850,15 +851,6 @@ public class NcAirepRecord extends PluginDataObject implements ISpatialEnabled,
public void setPersistenceTime(Date persistTime) {
}
@Override
public Integer getHdfFileId() {
return null;
}
@Override
public void setHdfFileId(Integer hdfFileId) {
}
/*
* (non-Javadoc)
*

2
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
View file

@ -62,6 +62,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* 4/7/09 1994 bphillip Initial Creation
* 10/13/10 276 llin Modified for NC GRIB.
* 03/07/12 606 ghull Added eventName to URI for NcInventory updating.
* 04/08/13 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -365,7 +366,6 @@ public class NcgribRecord extends PersistablePluginDataObject implements
this.dataTime = recordToCopy.dataTime.clone();
}
this.dataURI = recordToCopy.dataURI;
this.setHdfFileId(recordToCopy.getHdfFileId());
this.id = recordToCopy.id;
this.identifier = recordToCopy.identifier;
if (recordToCopy.insertTime != null) {

6
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
View file

@ -65,6 +65,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* object suitable for HDF5 persistence.
* 10 Oct 2011 126 G. Hull replace stnid,lat&lon with the SurfaceObsLocation.
* 03 Feb 2012 606 G. Hull added reportType to the URI for inventory updating
* 08 Apr 2013 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -374,11 +375,6 @@ public class NcPafmRecord extends PersistablePluginDataObject implements
this.pointDataView = pointDataView;
}
@Override
public Integer getHdfFileId() {
return null;
}
@Override
public Date getPersistenceTime() {
// return this.dataTime.getRefTime();

10
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
View file

@ -61,6 +61,7 @@ import com.vividsolutions.jts.geom.Geometry;
* 08/30/2011 286 qzhou Use IDecoderConstantsN.INTEGER_MISSING instead -9999 in visibility.
* 08/31/2011 286 qzhou Created project and moved this from ~edex.plugin.pirep
* 09/19/2011 286 Q.Zhou Changed reportType to string,
* 04/08/2013 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author jkorman
@ -799,15 +800,6 @@ public class NcPirepRecord extends PluginDataObject implements ISpatialEnabled,
public void setPersistenceTime(Date persistTime) {
}
@Override
public Integer getHdfFileId() {
return null;
}
@Override
public void setHdfFileId(Integer hdfFileId) {
}
/*
* (non-Javadoc)
*

10
ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
View file

@ -17,6 +17,7 @@
* of suspectTimeFlag from Boolean to String
* since undefined in PointDataDescription.
* 09/2011 457 S. Gurung Renamed H5 to Nc and h5 to nc
* 04/2013 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author T.Lee
@ -488,15 +489,6 @@ public class NcScdRecord extends PluginDataObject implements ISpatialEnabled,
public void setPersistenceTime(Date persistTime) {
}
@Override
public Integer getHdfFileId() {
return null;
}
@Override
public void setHdfFileId(Integer hdfFileId) {
}
/*
* (non-Javadoc)
*

11
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
View file

@ -64,6 +64,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* 11/03/2011 sgurung Added probable weather and method to calculate ceiling.
* 11/04/2011 sgurung Sort sky_cover before calculating ceiling.
* Change startRefTime to nearest hour to get hourly refTimes
* 04/08/2013 1293 bkowal Removed references to hdffileid.
*
* </pre
*
@ -698,11 +699,6 @@ public class NcTafRecord extends PluginDataObject implements ISpatialEnabled,
this.pointDataView = pointDataView;
}
@Override
public Integer getHdfFileId() {
return null;
}
/**
* Get the time to use for persisting this data.
*
@ -716,11 +712,6 @@ public class NcTafRecord extends PluginDataObject implements ISpatialEnabled,
return getInsertTime().getTime();
}
@Override
public void setHdfFileId(Integer hdfFileId) {
// this.hdfFileId = hdfFileId;
}
/**
* Set the time to be used for the persistence time for this object.
*

6
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
View file

@ -12,6 +12,7 @@
* 09/2011 Chin Chen support batch decoding methods for better performance and
* remove xml serialization as well
* 10/2011 S. Gurung Replace slat/slon/selv with location of type SurfaceObsLocation
* 04/2013 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -507,11 +508,6 @@ public class NcUairRecord extends PersistablePluginDataObject implements
this.pointDataView = pointDataView;
}
@Override
public Integer getHdfFileId() {
return null;
}
@Override
public Date getPersistenceTime() {
// return this.dataTime.getRefTime();

13
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
View file

@ -10,6 +10,7 @@
* ------------ ----------- ----------- --------------------------
* Aug17 2011 Chin Chen Initial Coding (Following BufrsgwhRecord to refactor for
* saving data to HDF5)
* Apr 8, 2013 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author chin chen
@ -1693,18 +1694,6 @@ public class SgwhRecord extends PluginDataObject implements IDecoderGettable,
}
@Override
public Integer getHdfFileId() {
// TODO Auto-generated method stub
return null;
}
@Override
public void setHdfFileId(Integer hdfFileId) {
// TODO Auto-generated method stub
}
@Override
public PointDataView getPointDataView() {
return this.pointDataView;

13
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
View file

@ -10,6 +10,7 @@
* ------------ ----------- ----------- --------------------------
* Aug23 2011 Chin Chen Initial Coding (Following BufrsgwhvRecord to refactor for
* saving data to HDF5)
* Apr 8, 2013 1293 bkowal Removed references to hdffileid.
* </pre>
*
* @author chin chen
@ -506,18 +507,6 @@ public class SgwhvRecord extends PluginDataObject implements IDecoderGettable,
}
@Override
public Integer getHdfFileId() {
// TODO Auto-generated method stub
return null;
}
@Override
public void setHdfFileId(Integer hdfFileId) {
// TODO Auto-generated method stub
}
@Override
public PointDataView getPointDataView() {
return this.pointDataView;

6
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/dao/NcgribDao.java
View file

@ -28,7 +28,6 @@ import java.util.Date;
import java.util.List;
import gov.noaa.nws.ncep.common.dataplugin.ncgrib.NcgribModel;
import gov.noaa.nws.ncep.common.dataplugin.ncgrib.NcgribPathProvider;
import gov.noaa.nws.ncep.common.dataplugin.ncgrib.NcgribRecord;
import gov.noaa.nws.ncep.edex.common.dao.NcepDefaultPluginDao;
@ -38,7 +37,6 @@ import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataplugin.level.LevelFactory;
import com.raytheon.uf.common.dataplugin.level.MasterLevel;
import com.raytheon.uf.common.dataplugin.persist.IPersistable;
import com.raytheon.uf.common.dataquery.db.QueryResult;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.Request;
@ -53,8 +51,6 @@ import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.edex.core.EDEXUtil;
import com.raytheon.uf.edex.core.hdf5.HDF5PluginFilenameFilter;
import com.raytheon.uf.edex.database.DataAccessLayerException;
@ -70,6 +66,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
* 4/7/09 1994 bphillip Initial Creation
* 12/16/10 mli extend NcepDefaultPluginDao to enable purge
* 01/14/13 1469 bkowal Removed the hdf5 data directory.
* 04/08/13 1293 bkowal Removed references to hdffileid.
*
* </pre>
*
@ -403,7 +400,6 @@ public class NcgribDao extends NcepDefaultPluginDao {
throws PluginException {
List<StorageException> exceptions = new ArrayList<StorageException>();
IPersistable persistable = (IPersistable) pdo;
persistable.setHdfFileId(EDEXUtil.getServerId());
// get the directory
String directory = pdo.getPluginName() + File.separator