Commitf856dc9

authored and

committed

Trim non-transacted streams on flush

1 parentcc31d17 commitf856dc9Copy full SHA for f856dc9

File tree

+48

-7

lines changed

+48

-7

lines changed

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -207,4 +207,28 @@ public void SwitchTransactedStream(Version version, int subStorageCount)`
`207`	`207`	`rootStorage.OpenStorage($"Test{i}");`
`208`	`208`	`}`
`209`	`209`	`}`
	`210`	`+`
	`211`	`+[TestMethod]`
	`212`	`+[DataRow(false)]`
	`213`	`+[DataRow(true)]`
	`214`	`+publicvoidDeleteTrimsBaseStream(boolconsolidate)`
	`215`	`+{`
	`216`	`+usingvarrootStorage=RootStorage.CreateInMemory(Version.V3);`
	`217`	`+using(CfbStreamstream=rootStorage.CreateStream("Test"))`
	`218`	`+{`
	`219`	`+byte[]buffer=TestData.CreateByteArray(4096);`
	`220`	`+stream.Write(buffer,0,buffer.Length);`
	`221`	`+}`
	`222`	`+`
	`223`	`+rootStorage.Flush(consolidate);`
	`224`	`+`
	`225`	`+longoriginalLength=rootStorage.BaseStream.Length;`
	`226`	`+`
	`227`	`+rootStorage.Delete("Test");`
	`228`	`+rootStorage.Flush(consolidate);`
	`229`	`+`
	`230`	`+longnewLength=rootStorage.BaseStream.Length;`
	`231`	`+`
	`232`	`+Assert.IsTrue(originalLength>newLength);`
	`233`	`+}`
`210`	`234`	`}`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,18 @@ public uint Add(FatEnumerator fatEnumerator, uint startIndex)`
`141`	`141`	`returnentry.Index;`
`142`	`142`	`}`
`143`	`143`
	`144`	`+publicSectorGetLastUsedSector()`
	`145`	`+{`
	`146`	`+uintlastUsedSectorIndex=uint.MaxValue;`
	`147`	`+foreach(FatEntryentryinthis)`
	`148`	`+{`
	`149`	`+if(!entry.IsFree)`
	`150`	`+lastUsedSectorIndex=entry.Index;`
	`151`	`+}`
	`152`	`+`
	`153`	`+returnnew(lastUsedSectorIndex,Context.SectorSize);`
	`154`	`+}`
	`155`	`+`
`144`	`156`	`publicIEnumerator<FatEntry>GetEnumerator()=>newFatEnumerator(Context.Fat);`
`145`	`157`
`146`	`158`	`IEnumeratorIEnumerable.GetEnumerator()=>GetEnumerator();`

Lines changed: 12 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,6 @@ public FatStream MiniStream`
`87`	`87`
`88`	`88`	`publicuintSectorCount=>(uint)Math.Max(0,(Length-SectorSize)/SectorSize);// TODO: Check`
`89`	`89`
`90`		`-boolisDirty;`
`91`		`-`
`92`	`90`	`publicRootContext(RootContextSiterootContextSite,Streamstream,Versionversion,IOContextFlagscontextFlags=IOContextFlags.None)`
`93`	`91`	`:base(rootContextSite)`
`94`	`92`	`{`
`@@ -178,20 +176,27 @@ public void Flush()`
`178`	`176`	`{`
`179`	`177`	`Fat.Flush();`
`180`	`178`
`181`		`-if(isDirty&&writeris notnull&&transactedStreamisnull)`
	`179`	`+if(writeris notnull&&transactedStreamisnull)`
`182`	`180`	`{`
`183`		`-// Ensure the stream is as long as expected`
`184`		`-BaseStream.SetLength(Length);`
	`181`	`+TrimBaseStream();`
`185`	`182`	`WriteHeader();`
`186`		`-isDirty=false;`
`187`	`183`	`}`
`188`	`184`	`}`
`189`	`185`
`190`	`186`	`publicvoidExtendStreamLength(longlength)`
`191`	`187`	`{`
`192`	`188`	`if(Length<length)`
`193`	`189`	`Length=length;`
`194`		`-isDirty=true;`
	`190`	`+}`
	`191`	`+`
	`192`	`+voidTrimBaseStream()`
	`193`	`+{`
	`194`	`+SectorlastUsedSector=Fat.GetLastUsedSector();`
	`195`	`+if(!lastUsedSector.IsValid)`
	`196`	`+thrownewFileFormatException("Last used sector is invalid");`
	`197`	`+`
	`198`	`+Length=lastUsedSector.EndPosition;`
	`199`	`+BaseStream.SetLength(Length);`
`195`	`200`	`}`
`196`	`201`
`197`	`202`	`publicvoidWriteHeader()`

Comments

(0)