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

Omaha #3644 Remove dataURI from ccfp plugin

Browse source 
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27

Former-commit-id: 94364ab115 [formerly c20d19a2d3] [formerly cf1bff0d02] [formerly 6bb4f5dbdf [formerly cf1bff0d02 [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]]
Former-commit-id: 6bb4f5dbdf
Former-commit-id: bab42edcd9b274b3abc3f6b16f3cfd76ddf324dc [formerly 5b5fac85b8]
Former-commit-id: 95a34bd053
This commit is contained in:
Mark Peters 2014-10-09 15:30:23 -05:00
parent a3a6b0a554
commit ed61a1a3a8
2 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
deltaScripts/14.4.1/DR3644/dropCcfpDataURI.sh Normal file
View file

@ -0,0 +1,41 @@
#!/bin/bash
# DR #3644 - this update script will drop the dataURI column from ccfp
PSQL="/awips2/psql/bin/psql"
# takes one arg: a table name
# drops the datauri constraint and column if they exist
function dropDatauri {
echo "INFO: Dropping DataURI column from $1"
${PSQL} -U awips -d metadata -c "ALTER TABLE $1 DROP CONSTRAINT IF EXISTS ${1}_datauri_key;"
${PSQL} -U awips -d metadata -c "ALTER TABLE $1 DROP COLUMN IF EXISTS datauri;"
if [ $? -ne 0 ]; then
echo "ERROR: Failed to drop dataURI column for $table"
echo "FATAL: The update has failed."
exit 1
fi
}
# takes three args: table, constraint name, unique columns
# will first drop the constraint if it exists and then adds it back, this is
# fairly inefficient if it does exist but operationally it won't exist and for
# testing this allows the script to be run easily as a noop.
function dropDatauriAndAddConstraint {
dropDatauri $1
${PSQL} -U awips -d metadata -c "ALTER TABLE $1 DROP CONSTRAINT IF EXISTS $2;"
${PSQL} -U awips -d metadata -c "ALTER TABLE $1 ADD CONSTRAINT $2 UNIQUE $3;"
if [ $? -ne 0 ]; then
echo "ERROR: Failed to add new unique constraint for $table"
echo "FATAL: The update has failed."
exit 1
fi
}
echo "INFO: Dropping ccfp dataURI columns."
dropDatauriAndAddConstraint ccfp ccfp_reftime_producttype_boxlat_boxlong_key "(reftime, producttype, boxlat, boxlong)"
${PSQL} -U awips -d metadata -c "DROP INDEX ccfp_reftimeindex;"
${PSQL} -U awips -d metadata -c "CREATE INDEX ccfp_reftimeindex ON ccfp USING btree (reftime);"
${PSQL} -U awips -d metadata -c "VACUUM FULL ANALYZE ccfp"
echo "INFO: ccfp dataURI columns dropped successfully"

20
edexOsgi/com.raytheon.uf.common.dataplugin.ccfp/src/com/raytheon/uf/common/dataplugin/ccfp/CcfpRecord.java
View file

@ -20,8 +20,6 @@
package com.raytheon.uf.common.dataplugin.ccfp;
import javax.persistence.Access;
import javax.persistence.AccessType;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
@ -58,6 +56,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Nov 01, 2013 2361 njensen Remove XML annotations
* Apr 15, 2014 3001 bgonzale Refactored to common package,
* com.raytheon.uf.common.dataplugin.ccfp.
* Oct 03, 2014 3644 mapeters Removed dataURI column.
*
*
* </pre>
@ -67,13 +66,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/
@Entity
@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ccfpseq")
@Table(name = "ccfp", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
/*
* Both refTime and forecastTime are included in the refTimeIndex since
* forecastTime is unlikely to be used.
*/
@Table(name = "ccfp", uniqueConstraints = { @UniqueConstraint(columnNames = {
"refTime", "producttype", "boxLat", "boxLong" }) })
@org.hibernate.annotations.Table(appliesTo = "ccfp", indexes = { @Index(name = "ccfp_refTimeIndex", columnNames = {
"refTime", "forecastTime" }) })
"refTime" }) })
@DynamicSerialize
public class CcfpRecord extends PluginDataObject implements ISpatialEnabled {
@ -272,13 +269,6 @@ public class CcfpRecord extends PluginDataObject implements ISpatialEnabled {
this.location = location;
}
@Override
@Column
@Access(AccessType.PROPERTY)
public String getDataURI() {
return super.getDataURI();
}
@Override
public String getPluginName() {
return "ccfp";