Skip to content

Move into shared for SqlCachedBuffer.cs #1280

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
merged 10 commits into from
Oct 8, 2021
Merged

Move into shared for SqlCachedBuffer.cs #1280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a7d82e
Move the netcore version of SqlCachedBuffer to src and update referen…
lcheunglci Sep 23, 2021
a183f01
Update the code to conform with the coding style
lcheunglci Sep 23, 2021
7520331
Update the get accessor to expression body definition
lcheunglci Sep 23, 2021
986fe1c
Remove ToXmlReader because it's not referenced anywhere on both netfx…
lcheunglci Sep 23, 2021
500c4a0
Merge branch 'dotnet:main' into MergeShared-SqlCachedBuffer
lcheunglci Sep 28, 2021
7dd8488
Merge branch 'dotnet:main' into MergeShared-SqlCachedBuffer
lcheunglci Sep 29, 2021
fac9f00
Apply suggestions from code review
lcheunglci Oct 5, 2021
65f6488
Revised the expression bodied getter and spacing based on the comments
lcheunglci Oct 5, 2021
043764b
Resolve merge conflict
lcheunglci Oct 6, 2021
ee8f9f2
Fix compiler error due to redefinition of IsNull
lcheunglci Oct 6, 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
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
<Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCachedBuffer.cs">
<Link>Microsoft\Data\SqlClient\SqlCachedBuffer.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
</Compile>
Expand Down Expand Up @@ -496,7 +499,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlCachedBuffer.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
<Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCachedBuffer.cs">
<Link>Microsoft\Data\SqlClient\SqlCachedBuffer.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
<Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
</Compile>
Expand Down Expand Up @@ -456,7 +459,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlCachedBuffer.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlCertificateCallbacks.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientOriginalAddressInfo.cs" />
Expand Down
148 changes: 0 additions & 148 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs
View file
Open in desktop

This file was deleted.

46 changes: 21 additions & 25 deletions ...crosoft/Data/SqlClient/SqlCachedBuffer.cs → ...crosoft/Data/SqlClient/SqlCachedBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
namespace Microsoft.Data.SqlClient
{
// Caches the bytes returned from partial length prefixed datatypes, like XML
sealed internal class SqlCachedBuffer : System.Data.SqlTypes.INullable
internal sealed class SqlCachedBuffer : INullable
{
public static readonly SqlCachedBuffer Null = new SqlCachedBuffer();
private const int _maxChunkSize = 2048; // Arbitrary value for chunk size. Revisit this later for better perf
public static readonly SqlCachedBuffer Null = new();
private const int MaxChunkSize = 2048; // Arbitrary value for chunk size. Revisit this later for better perf

private List<byte[]> _cachedBytes;
private readonly List<byte[]> _cachedBytes;

private SqlCachedBuffer()
{
Expand All @@ -30,23 +30,20 @@ private SqlCachedBuffer(List<byte[]> cachedBytes)
_cachedBytes = cachedBytes;
}

internal List<byte[]> CachedBytes
{
get { return _cachedBytes; }
}
internal List<byte[]> CachedBytes =>_cachedBytes;

// Reads off from the network buffer and caches bytes. Only reads one column value in the current row.
/// <summary>
/// Reads off from the network buffer and caches bytes. Only reads one column value in the current row.
/// </summary>
internal static bool TryCreate(SqlMetaDataPriv metadata, TdsParser parser, TdsParserStateObject stateObj, out SqlCachedBuffer buffer)
{
int cb = 0;
ulong plplength;
byte[] byteArr;

List<byte[]> cachedBytes = new List<byte[]>();
List<byte[]> cachedBytes = new();
buffer = null;

// the very first length is already read.
if (!parser.TryPlpBytesLeft(stateObj, out plplength))
if (!parser.TryPlpBytesLeft(stateObj, out ulong plplength))
{
return false;
}
Expand All @@ -55,10 +52,12 @@ internal static bool TryCreate(SqlMetaDataPriv metadata, TdsParser parser, TdsPa
do
{
if (plplength == 0)
{
break;
}
do
{
cb = (plplength > (ulong)_maxChunkSize) ? _maxChunkSize : (int)plplength;
int cb = (plplength > (ulong)MaxChunkSize) ? MaxChunkSize : (int)plplength;
byteArr = new byte[cb];
if (!stateObj.TryReadPlpBytes(ref byteArr, 0, cb, out cb))
{
Expand Down Expand Up @@ -105,27 +104,32 @@ internal Stream ToStream()
override public string ToString()
{
if (IsNull)
{
throw new SqlNullValueException();
}

if (_cachedBytes.Count == 0)
{
return string.Empty;
}
SqlXml sxml = new SqlXml(ToStream());
SqlXml sxml = new(ToStream());
return sxml.Value;
}

internal SqlString ToSqlString()
{
if (IsNull)
{
return SqlString.Null;
}

string str = ToString();
return new SqlString(str);
}

internal SqlXml ToSqlXml()
{
SqlXml sx = new SqlXml(ToStream());
SqlXml sx = new(ToStream());
return sx;
}

Expand All @@ -136,14 +140,6 @@ internal XmlReader ToXmlReader()
return SqlTypeWorkarounds.SqlXmlCreateSqlXmlReader(ToStream(), closeInput: false, async: false);
}

public bool IsNull
{
get
{
return (_cachedBytes == null) ? true : false;
}
}


public bool IsNull => _cachedBytes == null;
}
}