Skip to content

Add continue request usage #3605

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 2 commits into from
Sep 24, 2025
Merged

Add continue request usage #3605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692fc52
add continue request usage
Wraith2 Sep 9, 2025
df52b34
unify TryReadByteArrayWithContinue overloads
Wraith2 Sep 12, 2025
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
25 changes: 5 additions & 20 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6377,25 +6377,10 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value,
case TdsEnums.SQLVARBINARY:
case TdsEnums.SQLIMAGE:
byte[] b = null;

// If varbinary(max), we only read the first chunk here, expecting the caller to read the rest
if (isPlp)
{
// If we are given -1 for length, then we read the entire value,
// otherwise only the requested amount, usually first chunk.
result = stateObj.TryReadPlpBytes(ref b, 0, length, out _);
if (result != TdsOperationStatus.Done)
{
return result;
}
}
else
result = stateObj.TryReadByteArrayWithContinue(length, isPlp, out b);
if (result != TdsOperationStatus.Done)
{
result = stateObj.TryReadByteArrayWithContinue(length, out b);
if (result != TdsOperationStatus.Done)
{
return result;
}
return result;
}

if (md.isEncrypted
Expand Down Expand Up @@ -6462,7 +6447,7 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value,
case TdsEnums.SQLVECTOR:
// Vector data is read as non-plp binary value.
// This is same as reading varbinary(8000).
result = stateObj.TryReadByteArrayWithContinue(length, out b);
result = stateObj.TryReadByteArrayWithContinue(length, isPlp: false, out b);
if (result != TdsOperationStatus.Done)
{
return result;
Expand Down Expand Up @@ -6790,7 +6775,7 @@ internal TdsOperationStatus TryReadSqlValueInternal(SqlBuffer value, byte tdsTyp
// Note: Better not come here with plp data!!
Debug.Assert(length <= TdsEnums.MAXSIZE);
byte[] b = new byte[length];
result = stateObj.TryReadByteArray(b, length);
result = stateObj.TryReadByteArrayWithContinue(length, isPlp: false, out b);
if (result != TdsOperationStatus.Done)
{
return result;
Expand Down
22 changes: 4 additions & 18 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6541,24 +6541,10 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value,
case TdsEnums.SQLIMAGE:
byte[] b = null;

// If varbinary(max), we only read the first chunk here, expecting the caller to read the rest
if (isPlp)
{
// If we are given -1 for length, then we read the entire value,
// otherwise only the requested amount, usually first chunk.
result = stateObj.TryReadPlpBytes(ref b, 0, length, out _);
if (result != TdsOperationStatus.Done)
{
return result;
}
}
else
result = stateObj.TryReadByteArrayWithContinue(length, isPlp, out b);
if (result != TdsOperationStatus.Done)
{
result = stateObj.TryReadByteArrayWithContinue(length, out b);
if (result != TdsOperationStatus.Done)
{
return result;
}
return result;
}

if (md.isEncrypted
Expand Down Expand Up @@ -6625,7 +6611,7 @@ internal TdsOperationStatus TryReadSqlValue(SqlBuffer value,
case TdsEnums.SQLVECTOR:
// Vector data is read as non-plp binary value.
// This is same as reading varbinary(8000).
result = stateObj.TryReadByteArrayWithContinue(length, out b);
result = stateObj.TryReadByteArrayWithContinue(length, isPlp: false, out b);
if (result != TdsOperationStatus.Done)
{
return result;
Expand Down
7 changes: 6 additions & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ internal static TdsOperationStatus TryCreate(SqlMetaDataPriv metadata, TdsParser
{
buffer = null;

stateObj.RequestContinue(true);
(bool canContinue, bool isStarting, bool isContinuing) = stateObj.GetSnapshotStatuses();

List<byte[]> cachedBytes = null;
Expand Down Expand Up @@ -81,13 +82,17 @@ internal static TdsOperationStatus TryCreate(SqlMetaDataPriv metadata, TdsParser
result = stateObj.TryReadPlpBytes(ref byteArr, 0, cb, out cb, canContinue, writeDataSizeToSnapshot: false, compatibilityMode: false);
if (result != TdsOperationStatus.Done)
{
if (result == TdsOperationStatus.NeedMoreData && canContinue && cb == byteArr.Length && (isContinuing || !isStarting))
if (result == TdsOperationStatus.NeedMoreData && canContinue && cb == byteArr.Length)
{
// succeeded in getting the data but failed to find the next plp length
returnAfterAdd = true;
}
else
{
if (canContinue)
{
stateObj.SetSnapshotStorage(cachedBytes);
}
return result;
}
}
Expand Down
78 changes: 50 additions & 28 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1560,45 +1560,67 @@ public TdsOperationStatus TryReadByteArray(Span<byte> buff, int len, out int tot
return TdsOperationStatus.Done;
}

public TdsOperationStatus TryReadByteArrayWithContinue(int length, out byte[] bytes)
internal TdsOperationStatus TryReadByteArrayWithContinue(int length, bool isPlp, out byte[] value)
{
bytes = null;
int offset = 0;
byte[] temp = null;
(bool canContinue, bool isStarting, bool isContinuing) = GetSnapshotStatuses();
if (canContinue)
Debug.Assert(_syncOverAsync || !_asyncReadWithoutSnapshot, "This method is not safe to call when doing sync over async");

byte[] buf = null;
RequestContinue(true);
(bool canContinue, bool _, bool isContinuing) = GetSnapshotStatuses();

if (isPlp)
{
temp = TryTakeSnapshotStorage() as byte[];
Debug.Assert(temp != null || !isContinuing, "if continuing stored buffer must be present to contain previous data to continue from");
Debug.Assert(bytes == null || bytes.Length == length, "stored buffer length must be null or must have been created with the correct length");

if (temp != null)
bool compatibilityMode = LocalAppContextSwitches.UseCompatibilityAsyncBehaviour;
TdsOperationStatus result = TryReadPlpBytes(ref buf, 0, int.MaxValue, out length, canContinue && !compatibilityMode, canContinue && !compatibilityMode, compatibilityMode);
if (result != TdsOperationStatus.Done)
{
offset = GetSnapshotTotalSize();
value = null;
return result;
}

AssertValidState();
}
else
{
int startOffset = 0;
if (canContinue)
{
buf = TryTakeSnapshotStorage() as byte[];
Debug.Assert(buf != null || !isContinuing, "if continuing stored buffer must be present to contain previous data to continue from");
Debug.Assert(buf == null || buf.Length == length, "stored buffer length must be null or must have been created with the correct length");

if (buf != null)
{
startOffset = GetSnapshotTotalSize();
}
}

if (temp == null)
{
temp = new byte[length];
}
if (buf == null || buf.Length < length)
{
buf = new byte[length];
}

TdsOperationStatus result = TryReadByteArray(temp, length, out _, offset, isStarting || isContinuing);
TdsOperationStatus result = TryReadByteArray(buf, length, out _, startOffset, canContinue);

if (result == TdsOperationStatus.Done)
{
bytes = temp;
}
else if (result == TdsOperationStatus.NeedMoreData)
{
if (canContinue)
if (result != TdsOperationStatus.Done)
{
SetSnapshotStorage(temp);
if (result == TdsOperationStatus.NeedMoreData)
{
if (canContinue)
{
SetSnapshotStorage(buf);
}
}
value = null;
return result;
}

AssertValidState();

}

return result;
value = buf;
return TdsOperationStatus.Done;
}

// Takes no arguments and returns a byte from the buffer. If the buffer is empty, it is filled
Expand Down Expand Up @@ -1947,7 +1969,7 @@ internal TdsOperationStatus TryReadString(int length, out string value)

if (((_inBytesUsed + cBytes) > _inBytesRead) || (_inBytesPacket < cBytes))
{
TdsOperationStatus result = TryReadByteArrayWithContinue(cBytes, out buf);
TdsOperationStatus result = TryReadByteArrayWithContinue(cBytes, isPlp: false, out buf);
if (result != TdsOperationStatus.Done)
{
value = null;
Expand Down Expand Up @@ -2841,7 +2863,7 @@ internal TdsOperationStatus TryReadNetworkPacket()
}

// previous buffer is in snapshot
_inBuff = new byte[_inBuff.Length];
NewBuffer(_inBuff.Length);
result = TdsOperationStatus.NeedMoreData;
}

Expand Down
Loading