Skip to content

Unify BufferedFileStreamStrategy seeking #78984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamsitnik merged 6 commits into from
Dec 23, 2022
Merged

Unify BufferedFileStreamStrategy seeking #78984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a59639
Unify BufferedFileStreamStrategy seeking
pedrobsaila Nov 29, 2022
356010e
make Position setter clearer
pedrobsaila Dec 3, 2022
0acbfbd
add else
pedrobsaila Dec 3, 2022
a752686
add missing test coverage
adamsitnik Dec 23, 2022
5f7dc6c
move the validation logic to FileStream so each strategy does not nee…
adamsitnik Dec 23, 2022
cc0e737
OSFileStreamStrategy.Position should delegate to Seek too
adamsitnik Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move the validation logic to FileStream so each strategy does not nee… 
…d to duplicate it
  • Loading branch information
@adamsitnik
adamsitnik committed Dec 23, 2022
commit 5f7dc6c76acdbc3f10322a7c23afea5202a3d4a1
28 changes: 23 additions & 5 deletions src/libraries/System.Private.CoreLib/src/System/IO/FileStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,12 +487,13 @@ public override long Position
{
ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument.value, ExceptionResource.ArgumentOutOfRange_NeedNonNegNum);
}
else if (_strategy.IsClosed)
{
ThrowHelper.ThrowObjectDisposedException_FileClosed();
}
else if (!CanSeek)
{
if(_strategy.IsClosed)
{
ThrowHelper.ThrowObjectDisposedException_FileClosed();
}

ThrowHelper.ThrowNotSupportedException_UnseekableStream();
}

Expand Down Expand Up @@ -583,7 +584,24 @@ public override void EndWrite(IAsyncResult asyncResult)

public override bool CanSeek => _strategy.CanSeek;

public override long Seek(long offset, SeekOrigin origin) => _strategy.Seek(offset, origin);
public override long Seek(long offset, SeekOrigin origin)
{
if (origin < SeekOrigin.Begin || origin > SeekOrigin.End)
{
throw new ArgumentException(SR.Argument_InvalidSeekOrigin, nameof(origin));
}
else if (!CanSeek)
{
if (_strategy.IsClosed)
{
ThrowHelper.ThrowObjectDisposedException_FileClosed();
}

ThrowHelper.ThrowNotSupportedException_UnseekableStream();
}

return _strategy.Seek(offset, origin);
}

internal Task BaseFlushAsync(CancellationToken cancellationToken)
=> base.FlushAsync(cancellationToken);
Expand Down
3 changes: 0 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/IO/Strategies/BufferedFileStreamStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,9 +896,6 @@ public override void CopyTo(Stream destination, int bufferSize)

public override long Seek(long offset, SeekOrigin origin)
{
EnsureNotClosed();
EnsureCanSeek();

// If we have bytes in the write buffer, flush them out, seek and be done.
if (_writePos > 0)
{
Expand Down
5 changes: 0 additions & 5 deletions src/libraries/System.Private.CoreLib/src/System/IO/Strategies/OSFileStreamStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,6 @@ internal sealed override void Flush(bool flushToDisk)

public sealed override long Seek(long offset, SeekOrigin origin)
{
if (origin < SeekOrigin.Begin || origin > SeekOrigin.End)
throw new ArgumentException(SR.Argument_InvalidSeekOrigin, nameof(origin));
if (_fileHandle.IsClosed) ThrowHelper.ThrowObjectDisposedException_FileClosed();
if (!CanSeek) ThrowHelper.ThrowNotSupportedException_UnseekableStream();

long oldPos = _filePosition;
long pos = origin switch
{
Expand Down