Merge | TdsParser functional changes #3555
Conversation
netcore: removed a simple WriteInt which did nothing besides call BinaryPrimitives. netcore: when there's space in the packet buffer, WriteInt will now write to it directly (rather than write to a stack-allocated span and copy.)
This removes the need for TdsParser.netcore.cs.
…s never referenced in the format string
Messages of the netfx exceptions are more detailed
Added mask to netcore logic. Also removed mask on _encryptionOption from netfx - this will never be outside the range of EncryptionOptions.OPTIONS_MASK.
… is set and certificate is not automatically trusted
This passed state around, but never passed enough state to remove the state machine. Sync with netcore.
…instances from WriteUnterminatedSqlValue
| @@ -10342,27 +10377,23 @@ private Task TDSExecuteRPCAddParameter(TdsParserStateObject stateObj, SqlParamet | |||
| // This is in its own method to avoid always allocating the lambda in TDSExecuteRPCParameter | |||
| private void TDSExecuteRPCParameterSetupWriteCompletion(SqlCommand cmd, IList<_SqlRPC> rpcArray, int timeout, bool inSchema, SqlNotificationRequest notificationRequest, TdsParserStateObject stateObj, bool isCommandProc, bool sync, TaskCompletionSource<object> completion, int startRpc, int startParam, Task writeParamTask) | |||
| { | |||
| AsyncHelper.ContinueTaskWithState( | |||
| AsyncHelper.ContinueTask( | |||
There was a problem hiding this comment.
Why don't we want the state parameter anymore?
There was a problem hiding this comment.
I'd switched away from using a state parameter because it wasn't doing anything and it wasn't present in netcore. We pass this as the state, cast it back to a TdsParser, then don't use it anywhere in the lambda expression (which closes over another 11 variables); it's used once in the failure path (which closes over another variable, so can't currently be made static either.)
The halfway house doesn't really help anyone, but I'm happy enough to reintroduce the state parameter and use a tuple in both places if you'd prefer?
There was a problem hiding this comment.
Ok, if it's not used downstream that's fine. The netore version is typically better than the netfx.
| @@ -11160,7 +11191,7 @@ internal void WriteBulkCopyMetaData(_SqlMetaDataSet metadataCollection, int coun | |||
| stateObj.WriteByte(md.scale); | |||
| break; | |||
| case SqlDbTypeExtensions.Json: | |||
| stateObj.WriteByteArray(s_jsonMetadataSubstituteSequence, s_xmlMetadataSubstituteSequence.Length, 0); | |||
| stateObj.WriteByteArray(s_jsonMetadataSubstituteSequence, s_jsonMetadataSubstituteSequence.Length, 0); | |||
| WriteGuid((Guid)value, stateObj); | ||
| Debug.Assert(length == 16, "Invalid length for guid type in com+ object"); |
There was a problem hiding this comment.
You should probably invert these lines. Generally asserts come before the work they are preconditions for.
Description
This should cover all necessary functional changes to TdsParser. With these changes merged, the class as a whole should be ready to merge after TdsParserStateObject is dealt with.
Not all of these changes are functional - some are simply necessary to see the real ones clearly. Possibly impactful commits here are:
ints and there was space in the packet buffer,WriteIntwould write the bytes to a stackalloc'dSpan<byte>and then copy into the buffer. I've eliminated the unnecessary intermediary span, and we now write directly into the buffer.There's also one other commit (6d98357) which looks more impactful than it is.
s_xmlMetadataSubstituteSequenceands_jsonMetadataSubstituteSequenceare the same length, so there's no runtime impact here.Issues
Relates to #1261.
Testing
Unit tests passed locally.