Issue #1630 updated chunk size for single dimension chunks.

Amend: check if dataType is vlen_str_type.

Change-Id: Idbd39e8bcd6c2703299277b073e14b106c897ccb

Former-commit-id: a53fce8bcc [formerly a64625383f] [formerly f8b4dcc541] [formerly f8b4dcc541 [formerly 4c706901f8]] [formerly a53fce8bcc [formerly a64625383f] [formerly f8b4dcc541] [formerly f8b4dcc541 [formerly 4c706901f8]] [formerly 691b9d7ca2 [formerly f8b4dcc541 [formerly 4c706901f8] [formerly 691b9d7ca2 [formerly 25bd6d76b85b3c857958f1fc5189f9512420daea]]]]]
Former-commit-id: 691b9d7ca2
Former-commit-id: 962063cbf8 [formerly 0e60e11fbb] [formerly 1ce25acbc5] [formerly 679936022c915b528a54018aeb88f9f6a967d27b [formerly e271a0ffc64b57ea2a58cefa0886aac6140d7847] [formerly 1ce25acbc5 [formerly b9b660535c]]]
Former-commit-id: 1865cfa851dfc5f087079e4049121a2b85eb695a [formerly 924c9a574fa423aa775d7cc7b2ce2a4a0861be6b] [formerly 79b1560c07 [formerly b8147737fe]]
Former-commit-id: 79b1560c07
Former-commit-id: 91fb8318b4
This commit is contained in:
Brad Gonzales 2013-02-18 08:19:02 -06:00
parent 3161c2b611
commit 7e67b436a6

View file

@ -214,7 +214,12 @@ class H5pyDataStore(IDataStore.IDataStore):
def __calculateChunk(self, nDims, dataType, storeOp, maxDims):
if nDims == 1:
chunk = [DEFAULT_CHUNK_SIZE]
if dataType != vlen_str_type:
sizeOfEntry = numpy.dtype(dataType).itemsize
chunkSize = int(FILESYSTEM_BLOCK_SIZE / sizeOfEntry)
chunk = [chunkSize]
else:
chunk = [DEFAULT_CHUNK_SIZE]
elif nDims == 2:
if storeOp != 'APPEND':
chunk = [DEFAULT_CHUNK_SIZE] * 2