exceeddata-sdk-vdata 2.9.6__tar.gz → 2.9.7__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.9.6
3
+ Version: 2.9.7
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -32,6 +32,6 @@
32
32
 
33
33
  name = 'vdata'
34
34
 
35
- __version__ = "2.9.6"
35
+ __version__ = "2.9.7"
36
36
  __author__ = 'Nick Xie'
37
37
  __credits__ = 'Smart Software for Car Technologies Inc'
@@ -31,7 +31,7 @@
31
31
  # of the copyright holder.
32
32
  #
33
33
  # Author: Nick Xie
34
- # Version: 2.9.6
34
+ # Version: 2.9.7
35
35
  #
36
36
  # Note: for specification flag compatibility, it is rare that vsw uses snappy.
37
37
  # Uncomment the following if used and python-snappy is installed.
@@ -282,19 +282,29 @@ class VDataMeta:
282
282
  '''
283
283
  get the page size. default is 64k
284
284
  '''
285
-
286
- if self._pageSizeCode == 0: #default 64k
285
+ pageSizeCode = self._pageSizeCode & 0x0f
286
+ if pageSizeCode == 0: #default 64k
287
287
  return 0x10000
288
- if self._pageSizeCode == 1: #32k
288
+ if pageSizeCode == 1: #32k
289
289
  return 0x8000
290
- if self._pageSizeCode == 2: #16k
290
+ if pageSizeCode == 2: #16k
291
291
  return 0x4000
292
- if self._pageSizeCode == 3: #8k
292
+ if pageSizeCode == 3: #8k
293
293
  return 0x2000
294
- if self._pageSizeCode == 4: #128k
294
+ if pageSizeCode == 4: #128k
295
295
  return 0x20000
296
296
 
297
297
  return 0x10000
298
+
299
+ def getStorageIdLength(self):
300
+ pageSizeCode = self._pageSizeCode & 0x0f
301
+ if (pageSizeCode != 1):
302
+ return 8
303
+ if self._pageSizeCode & 0xf0 == 0:
304
+ return 5
305
+ else:
306
+ return 6
307
+
298
308
 
299
309
  class VDataBucket(object):
300
310
  def __init__(self):
@@ -877,7 +887,7 @@ class VDataFormulaFactory:
877
887
  raise Exception('FORMAT_VDATA_KEY_DESC_INVALID: ' + fname + "|" + formula)
878
888
 
879
889
  class VDataSeriesMeta:
880
- def __init__(self, formula, storageid, seriesid, pageSize=0x10000):
890
+ def __init__(self, formula, storageid, seriesid, pageSize=0x10000, storageIdLength=5):
881
891
  self._name = formula._name
882
892
  self._formula = formula
883
893
  self._seriesid = seriesid
@@ -886,11 +896,16 @@ class VDataSeriesMeta:
886
896
  self._pageOffset = (storageid >> 32) & 65535 # 32-48 bit
887
897
  self._dataLength = ((storageid >> 16) & 32767) + 32768 if ((storageid >> 31) & 1) != 0 else ((storageid >> 16) & 32767)
888
898
  self._itemCount = (storageid & 32767) + 32768 if ((storageid >> 15) & 0x01) != 0 else storageid & 32767
889
- else:
899
+ elif (storageIdLength == 5):
890
900
  self._pageIndex = (storageid >> 35 ) & 0x1F # 35-40 5bits
891
901
  self._pageOffset = (storageid >> 20 ) & 0x7FFF # 20-34 15bits
892
902
  self._dataLength = ((storageid >> 9) & 0x07FF) #9-19 , 11 bits
893
903
  self._itemCount = (storageid & 0x1ff) #0 - 8, 9 bits
904
+ else:
905
+ self._pageIndex = (storageid >> 40 ) & 0xFF # 40-48 5bits
906
+ self._pageOffset = (storageid >> 25 ) & 0x7FFF # 25-39 15bits
907
+ self._dataLength = ((storageid >> 10) & 0x07FFF) #10-19 , 24 bits
908
+ self._itemCount = (storageid & 0x3ff) #0 - 9, 10 bits
894
909
 
895
910
 
896
911
  def getSeriesId(self):
@@ -3697,7 +3712,6 @@ class VDataDecoder:
3697
3712
  self._keys = {}
3698
3713
  self._columnExpandMode = VDataUtils.getColumnExpandMode(self._columnExpandMode)
3699
3714
  self._qualifiedExpandName = VDataUtils.isQualifiedExpandName(self._columnExpandMode)
3700
-
3701
3715
  if self._queryStartTime ==0 and self._meta.queryStartTime() ==0 :
3702
3716
  self._queryStartTime = self._meta.storageStartTime()
3703
3717
  if self._queryEndTime ==0 and self._meta.queryEndTime() ==0 :
@@ -3707,6 +3721,7 @@ class VDataDecoder:
3707
3721
  compressMethod = self._meta.compressMethod()
3708
3722
  # encryptMethod = self._meta.encryptMethod()
3709
3723
  blocksCount = self._meta.blocksCount()
3724
+ storageIdLength = self._meta.getStorageIdLength()
3710
3725
 
3711
3726
  logger.debug("file format verion: " + str(formatVersion))
3712
3727
  logger.debug("file bucket count: " + str(blocksCount))
@@ -3834,9 +3849,12 @@ class VDataDecoder:
3834
3849
  for i in range(seriesCount):
3835
3850
  storageId = _struct.unpack('<i', databytes[index:index+4])[0]
3836
3851
  storageId = storageId& 0xffffffff
3837
- storageId = ((databytes[index+4] &0xff) << 32 ) + storageId
3852
+ if (storageIdLength ==5):
3853
+ storageId = ((databytes[index+4] &0xff) << 32 ) + storageId
3854
+ else:
3855
+ storageId = ((databytes[index+5] &0xff) << 40 ) + ((databytes[index+4] &0xff) << 32 ) + storageId
3838
3856
  storageIds.append(storageId)
3839
- index += 5
3857
+ index += storageIdLength
3840
3858
 
3841
3859
  blobSeriesIds =[]
3842
3860
  blobOffsetVec =[]
@@ -3858,7 +3876,7 @@ class VDataDecoder:
3858
3876
  raise Exception('FORMAT_VDATA_SERIES_NOT_FOUND' + str(seriesIds[i]))
3859
3877
  if (hasSignalFilter and not VDataSeriesUtils.serieMatchSignalFilter(self._signals, self._prefixes, formulas[seriesIds[i]], self._columnExpandMode, self._qualifiedExpandName)):
3860
3878
  continue
3861
- mt = VDataSeriesMeta(formulas[seriesIds[i]], storageIds[i], i , self._meta.getPageSize())
3879
+ mt = VDataSeriesMeta(formulas[seriesIds[i]], storageIds[i], i , self._meta.getPageSize(), storageIdLength)
3862
3880
  if (mt._dataLength == 0 or mt._itemCount == 0):
3863
3881
  raise Exception('FORMAT_VDATA_SERIES_DATA_EMPTY')
3864
3882
 
@@ -3948,13 +3966,13 @@ class VDataDecoder:
3948
3966
  databytes = self._reader.read(length)
3949
3967
  noneFormula = VDataFormulaNone('keys')
3950
3968
  decode = VDataInt32DeltaDecode(databytes, noneFormula, BitTracker())
3951
- decode.first()
3969
+
3952
3970
  self._keyIds = {}
3953
3971
  for i in range (keysCount):
3972
+ decode.next()
3954
3973
  self._keyIds[i] = decode.get()
3955
3974
  sname ="0x%08X"%self._keyIds[i]
3956
3975
  self._keys[sname] = VDataSeriesSpec(sname, self._keyIds[i] , VDataFormulaNone(sname), '')
3957
- decode.next ()
3958
3976
 
3959
3977
 
3960
3978
  def getUniqueName(self, keys, key):
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.9.6
3
+ Version: 2.9.7
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -33,7 +33,7 @@
33
33
  from setuptools import setup
34
34
 
35
35
  setup(name='exceeddata-sdk-vdata',
36
- version='2.9.6',
36
+ version='2.9.7',
37
37
  description='ExceedData vData SDK for Python',
38
38
  url='http://www.smartsct.com',
39
39
  author='Nick Xie',