3.89

k8s/charts/seaweedfs/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 description: SeaweedFS
 name: seaweedfs
-appVersion: "3.88"
+appVersion: "3.89"
 # Dev note: Trigger a helm chart release by `git tag -a helm-<version>`
-version: 4.0.388
+version: 4.0.389

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
 }
 

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         = ""