diff options
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/storage/needle_map/compact_map.go | 16 | ||||
| -rw-r--r-- | weed/util/constants.go | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/weed/storage/needle_map/compact_map.go b/weed/storage/needle_map/compact_map.go index a1288cadb..f0b174029 100644 --- a/weed/storage/needle_map/compact_map.go +++ b/weed/storage/needle_map/compact_map.go @@ -91,15 +91,19 @@ func (cs *CompactSection) Set(key NeedleId, offset Offset, size Size) (oldOffset oldOffset.OffsetHigher, oldOffset.OffsetLower, oldSize = oldValue.OffsetHigher, oldValue.OffsetLower, oldValue.Size } cs.setOverflowEntry(skey, offset, size) +<<<<<<< Updated upstream return +======= + } else { + // if we maxed out our values bucket, pin its capacity to minimize memory usage + if len(cs.values) == MaxSectionBucketSize { + bucket := make([]SectionalNeedleValue, len(cs.values)) + copy(bucket, cs.values) + cs.values = bucket + } +>>>>>>> Stashed changes } - // if we maxed out our values bucket, pin its capacity to minimize memory usage - if len(cs.values) == MaxSectionBucketSize { - bucket := make([]SectionalNeedleValue, len(cs.values)) - copy(bucket, cs.values) - cs.values = bucket - } return } diff --git a/weed/util/constants.go b/weed/util/constants.go index c92d24f11..a5701c1a4 100644 --- a/weed/util/constants.go +++ b/weed/util/constants.go @@ -8,7 +8,7 @@ const HttpStatusCancelled = 499 var ( MAJOR_VERSION = int32(3) - MINOR_VERSION = int32(88) + MINOR_VERSION = int32(89) VERSION_NUMBER = fmt.Sprintf("%d.%02d", MAJOR_VERSION, MINOR_VERSION) VERSION = sizeLimit + " " + VERSION_NUMBER COMMIT = "" |