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

Omaha #4982 Verify datatypes match when replacing data (take 2).

Browse source 
Change-Id: I2f6aebf6d10e69e5016d34ad2a85d2858a669043

Former-commit-id: a520e578b1b918876ceb5113e5159f94189de7d8
This commit is contained in:
Nathan Bowler 2015-10-20 16:13:01 -04:00
parent 33ce953bf5
commit e153b945f0
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
View file

@ -45,6 +45,7 @@
# Aug 20, 2015 DR 17726 mgamazaychikov Remove __doMakeReadable method
# Sep 14, 2015 4868 rjpeter Updated writePartialHDFData to create the dataset if
# it doesn't exist.
# Oct 20, 2015 4982 nabowle Verify datatypes match when replacing data.
#
import h5py, os, numpy, pypies, re, logging, shutil, time, types, traceback
@ -190,6 +191,8 @@ class H5pyDataStore(IDataStore.IDataStore):
indices.append(long(0))
ss['index'] = indices
elif storeOp == 'REPLACE' or storeOp == 'OVERWRITE':
if ds.dtype.type != data.dtype.type:
raise StorageException("Cannot " + storeOp + " data of type " + ds.dtype.name + " with data of type " + data.dtype.name + " in " + f.filename + " " + group.name + ".")
if ds.shape != data.shape:
ds.resize(data.shape)
ds[()] = data
@ -289,6 +292,8 @@ class H5pyDataStore(IDataStore.IDataStore):
if dataset in group:
ds=group[dataset]
ss['op'] = 'REPLACE'
if ds.dtype.type != data.dtype.type:
raise StorageException("Cannot REPLACE data of type " + ds.dtype.name + " with data of type " + data.dtype.name + " in " + f.filename + " " + group.name + ".")
else:
if maxSizes is None:
raise StorageException('Dataset ' + dataset + ' does not exist for partial write. MaxSizes not specified to create initial dataset')