Commitdbdef88

committed

Fix switching transacted streams

1 parentfb281a4 commitdbdef88Copy full SHA for dbdef88

File tree

+44

-14

lines changed

+44

-14

lines changed

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -174,4 +174,37 @@ public void SwitchFile(Version version, int subStorageCount)`
`174`	`174`	`try{File.Delete(fileName);}catch{}`
`175`	`175`	`}`
`176`	`176`	`}`
	`177`	`+`
	`178`	`+[TestMethod]`
	`179`	`+[DataRow(Version.V3,0)]`
	`180`	`+[DataRow(Version.V3,1)]`
	`181`	`+[DataRow(Version.V3,2)]`
	`182`	`+[DataRow(Version.V3,4)]// Required 2 sectors including root`
	`183`	`+[DataRow(Version.V4,0)]`
	`184`	`+[DataRow(Version.V4,1)]`
	`185`	`+[DataRow(Version.V4,2)]`
	`186`	`+[DataRow(Version.V4,32)]// Required 2 sectors including root`
	`187`	`+publicvoidSwitchTransactedStream(Versionversion,intsubStorageCount)`
	`188`	`+{`
	`189`	`+usingMemoryStreamoriginalMemoryStream=new();`
	`190`	`+usingMemoryStreamswitchedMemoryStream=new();`
	`191`	`+`
	`192`	`+using(varrootStorage=RootStorage.Create(originalMemoryStream,version,StorageModeFlags.Transacted\|StorageModeFlags.LeaveOpen))`
	`193`	`+{`
	`194`	`+for(inti=0;i<subStorageCount;i++)`
	`195`	`+rootStorage.CreateStorage($"Test{i}");`
	`196`	`+`
	`197`	`+rootStorage.SwitchTo(switchedMemoryStream);`
	`198`	`+rootStorage.Commit();`
	`199`	`+}`
	`200`	`+`
	`201`	`+using(varrootStorage=RootStorage.Open(switchedMemoryStream))`
	`202`	`+{`
	`203`	`+IEnumerable<EntryInfo>entries=rootStorage.EnumerateEntries();`
	`204`	`+Assert.AreEqual(subStorageCount,entries.Count());`
	`205`	`+`
	`206`	`+for(inti=0;i<subStorageCount;i++)`
	`207`	`+rootStorage.OpenStorage($"Test{i}");`
	`208`	`+}`
	`209`	`+}`
`177`	`210`	`}`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ internal sealed class RootContext : ContextBase, IDisposable`
`26`	`26`
`27`	`27`	`publicStreamBaseStream{get;}`
`28`	`28`
	`29`	`+publicStreamStream{get;}`
	`30`	`+`
`29`	`31`	`publicCfbBinaryReaderReader{get;}`
`30`	`32`
`31`	`33`	`publicCfbBinaryWriterWriter`
`@@ -104,17 +106,20 @@ public RootContext(RootContextSite rootContextSite, Stream stream, Version versi`
`104`	`106`	`DirectoryEntriesPerSector=SectorSize/DirectoryEntry.Length;`
`105`	`107`	`Length=stream.Length;`
`106`	`108`
`107`		`-StreamactualStream=stream;`
`108`	`109`	`if(contextFlags.HasFlag(IOContextFlags.Transacted))`
`109`	`110`	`{`
`110`	`111`	`StreamoverlayStream=streamisMemoryStream?newMemoryStream():File.Create(Path.GetTempFileName());`
`111`	`112`	`transactedStream=newTransactedStream(ContextSite,stream,overlayStream);`
`112`		`-actualStream=newBufferedStream(transactedStream,SectorSize);`
	`113`	`+Stream=newBufferedStream(transactedStream,SectorSize);`
	`114`	`+}`
	`115`	`+else`
	`116`	`+{`
	`117`	`+Stream=stream;`
`113`	`118`	`}`
`114`	`119`
`115`		`-Reader=new(actualStream);`
	`120`	`+Reader=new(Stream);`
`116`	`121`	`if(stream.CanWrite)`
`117`		`-writer=new(actualStream);`
	`122`	`+writer=new(Stream);`
`118`	`123`
`119`	`124`	`Fat=new(ContextSite);`
`120`	`125`	`DirectoryEntries=new(ContextSite);`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static RootStorage Create(Stream stream, Version version = Version.V3, St`
`78`	`78`	`returnnewRootStorage(rootContextSite,flags);`
`79`	`79`	`}`
`80`	`80`
`81`		`-publicstaticRootStorageCreateInMemory(Versionversion=Version.V3)=>Create(newMemoryStream(),version);`
	`81`	`+publicstaticRootStorageCreateInMemory(Versionversion=Version.V3,StorageModeFlagsflags=StorageModeFlags.None)=>Create(newMemoryStream(),version,flags);`
`82`	`82`
`83`	`83`	`publicstaticRootStorageOpen(stringfileName,FileModemode,StorageModeFlagsflags=StorageModeFlags.None)`
`84`	`84`	`{`
`@@ -205,15 +205,7 @@ public void Revert()`
`205`	`205`	`privatevoidSwitchToCore(Streamstream,boolallowLeaveOpen)`
`206`	`206`	`{`
`207`	`207`	`Flush();`
`208`		`-`
`209`		`-stream.SetLength(Context.BaseStream.Length);`
`210`		`-`
`211`		`-stream.Position=0;`
`212`		`-Context.BaseStream.Position=0;`
`213`		`-`
`214`		`-Context.BaseStream.CopyTo(stream);`
`215`		`-stream.Position=0;`
`216`		`-`
	`208`	`+Context.Stream.CopyAllTo(stream);`
`217`	`209`	`Context.Dispose();`
`218`	`210`
`219`	`211`	`IOContextFlagscontextFlags=ToIOContextFlags(storageModeFlags);`

Comments

(0)