exceeddata-sdk-vdata 2.10.5__tar.gz → 2.10.5.1__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.
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/PKG-INFO +1 -1
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata/sdk/__init__.py +1 -1
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata/sdk/vdata.py +28 -46
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata_sdk_vdata.egg-info/PKG-INFO +1 -1
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/setup.py +1 -1
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/LICENSE +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/README.rst +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata/sdk/blf.py +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata/sdk/converter.py +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata_sdk_vdata.egg-info/SOURCES.txt +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata_sdk_vdata.egg-info/dependency_links.txt +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata_sdk_vdata.egg-info/not-zip-safe +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata_sdk_vdata.egg-info/requires.txt +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/exceeddata_sdk_vdata.egg-info/top_level.txt +0 -0
- {exceeddata_sdk_vdata-2.10.5 → exceeddata_sdk_vdata-2.10.5.1}/setup.cfg +0 -0
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
# of the copyright holder.
|
|
32
32
|
#
|
|
33
33
|
# Author: Nick Xie
|
|
34
|
-
# Version: 2.10.5
|
|
34
|
+
# Version: 2.10.5.1
|
|
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.
|
|
@@ -2860,7 +2860,7 @@ class VDataSeries:
|
|
|
2860
2860
|
while (begin > index):
|
|
2861
2861
|
self._buckets.pop(begin)
|
|
2862
2862
|
begin = begin - 1
|
|
2863
|
-
self._buckets[index] =
|
|
2863
|
+
self._buckets[index] = bucket
|
|
2864
2864
|
elif (bucket.getBucketCycle() == b.getBucketCycle()): #sort the pages by time in case it is unordered
|
|
2865
2865
|
index = i
|
|
2866
2866
|
while (index >= 0):
|
|
@@ -4082,6 +4082,28 @@ class VDataBucketUtils:
|
|
|
4082
4082
|
logger.info("Add bucket " + str(bucket))
|
|
4083
4083
|
buckets.insert(0, bucket)
|
|
4084
4084
|
|
|
4085
|
+
def _getSeriesNameSet(bucket):
|
|
4086
|
+
names = set()
|
|
4087
|
+
for sb in bucket.seriesBuckets:
|
|
4088
|
+
names.add(sb.name)
|
|
4089
|
+
return names
|
|
4090
|
+
|
|
4091
|
+
def isStrictlyIdenticalBucket(left, right):
|
|
4092
|
+
if (left is None or right is None):
|
|
4093
|
+
return False
|
|
4094
|
+
if (left.getCrc() == 0 or left.getCrc() == 0):
|
|
4095
|
+
return False
|
|
4096
|
+
if (left.getCrc() != right.getCrc()):
|
|
4097
|
+
return False
|
|
4098
|
+
if (left.getStartTime() != right.getStartTime() or
|
|
4099
|
+
left.getEndTime() != right.getEndTime() or
|
|
4100
|
+
left.getCycle() != right.getCycle() or
|
|
4101
|
+
left.isLiving() != right.isLiving()):
|
|
4102
|
+
return False
|
|
4103
|
+
if (len(left.seriesBuckets) != len(right.seriesBuckets)):
|
|
4104
|
+
return False
|
|
4105
|
+
return VDataBucketUtils._getSeriesNameSet(left) == VDataBucketUtils._getSeriesNameSet(right)
|
|
4106
|
+
|
|
4085
4107
|
def sortAllBucketForAllQueueMode(buckets, bucket, dropMultiFileIntersects):
|
|
4086
4108
|
size = len(buckets)
|
|
4087
4109
|
if (size == 0):
|
|
@@ -4093,48 +4115,8 @@ class VDataBucketUtils:
|
|
|
4093
4115
|
for i in reversed(range(size)):
|
|
4094
4116
|
bk = buckets[i]
|
|
4095
4117
|
st = bk.getStartTime()
|
|
4096
|
-
if (
|
|
4097
|
-
|
|
4098
|
-
if (not bucket.isLiving()): # bucket is final
|
|
4099
|
-
if (bk.isLiving() or bk.getCycle() >= bucket.getCycle()):
|
|
4100
|
-
reason = "final" if bk.isLiving() else ("higher freq" if bk.getCycle() > bucket.getCycle() else "later")
|
|
4101
|
-
logger.warn("Keep " + reason + " bucket " + str(bucket) + " discard bucket " + str(bk))
|
|
4102
|
-
buckets[i] = bucket.merge(bk)
|
|
4103
|
-
return
|
|
4104
|
-
elif (bk.isLiving()): # bucket is living and bk is living
|
|
4105
|
-
bucketEndTime = bucket.getEndTime()
|
|
4106
|
-
et = bk.getEndTime()
|
|
4107
|
-
if (bucketEndTime > et or (bucketEndTime == et and bk.getCycle() > bucket.getCycle())):
|
|
4108
|
-
reason = "longer" if bucketEndTime > et else "higher freq"
|
|
4109
|
-
logger.warn("Keep " + reason + " bucket " + str(bucket) + " discard bucket " + str(bk))
|
|
4110
|
-
buckets[i] = bucket.merge(bk)
|
|
4111
|
-
return
|
|
4112
|
-
elif (bk.getEndTime() != 0 and bucket.getEndTime() > bk.getEndTime()): #bucket is living and bk is final, but bucket has extra end time
|
|
4113
|
-
logger.warn("Keep longer bucket " + str(bucket) + " discard bucket " + str(bk))
|
|
4114
|
-
buckets[i] = bucket.merge(bk)
|
|
4115
|
-
return
|
|
4116
|
-
bk.merge(bucket)
|
|
4117
|
-
logger.warn("Keep bucket " + str(bk) + " discard bucket" + str(bucket))
|
|
4118
|
-
else:
|
|
4119
|
-
if (dropMultiFileIntersects and not bucket.isLiving()):
|
|
4120
|
-
logger.warn("Keep final bucket " + str(bucket) + " discard bucket " + str(bk))
|
|
4121
|
-
buckets[i] = bucket.merge(bk)
|
|
4122
|
-
return
|
|
4123
|
-
if (bucket.isLiving()):
|
|
4124
|
-
if (bk.getEndTime() != 0 and bucket.getEndTime() > bk.getEndTime()): #overlapping living, lets do extra
|
|
4125
|
-
logger.warn("Add bucket " + str(bucket) + ", but only start from the last bucket's end time of " + str(bk.getEndTime()))
|
|
4126
|
-
bucket.setStartTime(bk.getEndTime() + 1)
|
|
4127
|
-
buckets.insert(i + 1, bucket)
|
|
4128
|
-
return
|
|
4129
|
-
else:
|
|
4130
|
-
if (bk.isLiving()): #we cannot be completely sure how much living bucket actually covers so we keep both
|
|
4131
|
-
logger.warn("Add bucket " + str(bucket) + ", also keep living bucket " + str(bk))
|
|
4132
|
-
buckets.insert(i + (1 if st < bucketStartTime else 0), bucket)
|
|
4133
|
-
return
|
|
4134
|
-
else:
|
|
4135
|
-
logger.warn('Time intersection problem with two final buckets')
|
|
4136
|
-
bk.merge(bucket)
|
|
4137
|
-
logger.warn("Keep bucket " + str(bk) + " discard bucket" + str(bucket))
|
|
4118
|
+
if (VDataBucketUtils.isStrictlyIdenticalBucket(bk, bucket)):
|
|
4119
|
+
logger.warn("Keep identical bucket " + str(bk) + " discard bucket " + str(bucket))
|
|
4138
4120
|
return
|
|
4139
4121
|
elif (st < bucketStartTime):
|
|
4140
4122
|
logger.info("Add bucket " + str(bucket))
|
|
@@ -4151,9 +4133,9 @@ class VDataBucketUtils:
|
|
|
4151
4133
|
_qetime = (queryEndTime if queryEndTime > 0 else meta._queryEndTime) if queryFilter else 0 #override if provided
|
|
4152
4134
|
for b in range(len(buckets)):
|
|
4153
4135
|
bucket = buckets[b]
|
|
4154
|
-
|
|
4136
|
+
cstime = bucket.getStartTime() if bucket.getStartTime() > 0 else 0 # current start time
|
|
4155
4137
|
cetime = sys.maxsize - 1 if bucket.isLiving() else bucket.getEndTime() # current end time
|
|
4156
|
-
qstime = max(_qstime,
|
|
4138
|
+
qstime = max(_qstime, cstime)
|
|
4157
4139
|
qetime = min(_qetime, cetime) if _qetime > 0 else cetime
|
|
4158
4140
|
|
|
4159
4141
|
for j in range (len(bucket.seriesBuckets)):
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|