exceeddata-sdk-vdata 2.10.3__tar.gz → 2.10.4__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.10.3
3
+ Version: 2.10.4
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.10.3"
35
+ __version__ = "2.10.4"
36
36
  __author__ = 'Nick Xie'
37
37
  __credits__ = 'Smart Software for Car Technologies Inc'
@@ -159,7 +159,7 @@ class VDataMeta:
159
159
  >>> meta = VDataReader.getMeta(file)
160
160
  >>> info = meta.extendedInfo()
161
161
  '''
162
- def __init__(self, formatVersion=0, compressMethod=0, encryptMethod=0, blocksCount=0, storageStartTime=0, storageEndTime=0, queryStartTime=0, queryEndTime=0, extendedInfo=None, pageSizeCode=0, keyTypeCode=0):
162
+ def __init__(self, formatVersion=0, compressMethod=0, encryptMethod=0, blocksCount=0, storageStartTime=0, storageEndTime=0, queryStartTime=0, queryEndTime=0, extendedInfo=None, pageSizeCode=0, keyTypeCode=0, reserved=0):
163
163
  '''
164
164
  The constructor for the meta info. For valid values see VData format specification.
165
165
 
@@ -185,7 +185,8 @@ class VDataMeta:
185
185
  self._extendedInfo = extendedInfo
186
186
  self._pageSizeCode = pageSizeCode
187
187
  self._keyTypeCode = keyTypeCode
188
-
188
+ self._reserved = reserved
189
+
189
190
 
190
191
  def __repr__(self):
191
192
  '''
@@ -307,7 +308,7 @@ class VDataMeta:
307
308
  return 6
308
309
 
309
310
  def getSeriesTimestampLength (self):
310
- if (self._keyTypeCode & 0x0f == 1) and ((self._keyTypeCode >> 4) & 0x0F == 0):
311
+ if (self._keyTypeCode & 0x0f == 1) and ((self._keyTypeCode >> 4) & 0x0F == 0) and (self._reserved == 0):
311
312
  return 43
312
313
  else:
313
314
  return 41
@@ -5118,7 +5119,8 @@ class VDataReader:
5118
5119
  qetime = 0 # query end time
5119
5120
  extlength = 0
5120
5121
  pageSizeCode = 0
5121
- keyTypeCode = 0
5122
+ keyTypeCode = 0
5123
+ reserved = 0
5122
5124
 
5123
5125
  if (formatVersion > 0):
5124
5126
  if (formatVersion < 26):
@@ -5129,12 +5131,12 @@ class VDataReader:
5129
5131
  if (formatVersion > 26):
5130
5132
  pageSizeCode = _reader.read(1)[0]
5131
5133
  keyTypeCode = _reader.read(1)[0]
5132
- _reader.read(4) # reserved
5134
+ reserved = _struct.unpack('<i', _reader.read(4)) # reserved
5133
5135
  else:
5134
5136
  _reader.read(6) # reserved
5135
5137
 
5136
5138
  extbytes = _reader.read(extlength) if (extlength > 0) else []
5137
- return VDataMeta(formatVersion=formatVersion, compressMethod=compressMethod, encryptMethod=encryptMethod, blocksCount=blocksCount, storageStartTime=sstime, storageEndTime=setime, queryStartTime=qstime, queryEndTime=qetime, extendedInfo=extbytes, pageSizeCode = pageSizeCode , keyTypeCode= keyTypeCode)
5139
+ return VDataMeta(formatVersion=formatVersion, compressMethod=compressMethod, encryptMethod=encryptMethod, blocksCount=blocksCount, storageStartTime=sstime, storageEndTime=setime, queryStartTime=qstime, queryEndTime=qetime, extendedInfo=extbytes, pageSizeCode = pageSizeCode , keyTypeCode= keyTypeCode, reserved = reserved)
5138
5140
 
5139
5141
 
5140
5142
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.10.3
3
+ Version: 2.10.4
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -33,13 +33,13 @@
33
33
  from setuptools import setup
34
34
 
35
35
  setup(name='exceeddata_sdk_vdata',
36
- version='2.10.3',
36
+ version='2.10.4',
37
37
  description='ExceedData vData SDK for Python',
38
38
  url='http://www.smartsct.com',
39
39
  author='Nick Xie',
40
40
  author_email='nickxie@smartsct.com',
41
41
  license='MIT',
42
- license_files = ('LICENSE'),
42
+ license_files = ('LICENSE',),
43
43
  install_requires=['python-snappy', 'zstd'],
44
44
  zip_safe=False,
45
45
  classifiers=[