Skip to content

[release/6.0] Align preallocationSize behavior #59078

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

Closed
github-actions wants to merge 9 commits into from
Closed

[release/6.0] Align preallocationSize behavior #59078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc2d280
there should be no differences between OSes:
adamsitnik Sep 3, 2021
9c407be
align Windows implementation to behave like the Unix one
adamsitnik Sep 6, 2021
e7c7107
ensure files cant be shrinked on Unix-like systems that dont implemen…
adamsitnik Sep 7, 2021
862d45f
hopefully fix the Linux build
adamsitnik Sep 7, 2021
9bb0500
address code review feedback
adamsitnik Sep 9, 2021
583bc3d
FileMode.OpenOrCreate: don't change existing files
adamsitnik Sep 13, 2021
5956372
reduce code duplication
adamsitnik Sep 13, 2021
a129b2b
Apply suggestions from code review
adamsitnik Sep 13, 2021
47b59f2
update the comment, fix the build and remove unused parameter
adamsitnik Sep 13, 2021
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
Apply suggestions from code review 
Co-authored-by: Stephen Toub <[email protected]>
  • Loading branch information
@adamsitnik @stephentoub
2 people authored and github-actions committed Sep 14, 2021
commit a129b2b1c1f10d969a6507d1d3d50eab2f1f58f2
4 changes: 1 addition & 3 deletions ...ibraries/System.Private.CoreLib/src/Microsoft/Win32/SafeHandles/SafeFileHandle.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,7 @@ private static unsafe void Preallocate(string fullPath, long preallocationSize,
fileHandle.Dispose();
Interop.Kernel32.DeleteFile(fullPath);

throw errorCode == Interop.Errors.ERROR_DISK_FULL
? new IOException(SR.Format(SR.IO_DiskFull_Path_AllocationSize, fullPath, preallocationSize))
: new IOException(SR.Format(SR.IO_FileTooLarge_Path_AllocationSize, fullPath, preallocationSize));
throw new IOException(SR.Format(errorCode == Interop.Errors.ERROR_DISK_FULL ? SR.IO_DiskFull_Path_AllocationSize : SR.IO_FileTooLarge_Path_AllocationSize), fullPath, preallocationSize);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/IO/Strategies/FileStreamHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ internal static bool ShouldPreallocate(long preallocationSize, FileAccess access
=> preallocationSize > 0
&& (access & FileAccess.Write) != 0
&& mode != FileMode.Open && mode != FileMode.Append
&& (mode != FileMode.OpenOrCreate || fileHandle.CanSeek && RandomAccess.GetFileLength(fileHandle) == 0); // allow to extend only new files
&& (mode != FileMode.OpenOrCreate || (fileHandle.CanSeek && RandomAccess.GetFileLength(fileHandle) == 0)); // allow to extend only new files

internal static void ValidateArguments(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize, FileOptions options, long preallocationSize)
{
Expand Down