Reduced calls to NpgsqlStatement.PreparedStatement property (#3915)

vonzshik · web-flow · commit 6e5a36803f7f · 2021-08-19T15:54:53.000+03:00
diff --git a/src/Npgsql/NpgsqlBatchCommand.cs b/src/Npgsql/NpgsqlBatchCommand.cs
@@ -139,6 +139,15 @@ internal PreparedStatement? PreparedStatement
         /// </summary>
         internal bool IsPrepared => PreparedStatement?.IsPrepared == true;
 
+        /// <summary>
+        /// Returns a prepared statement for this statement (including automatic preparation).
+        /// </summary>
+        internal bool TryGetPrepared([NotNullWhen(true)] out PreparedStatement? preparedStatement)
+        {
+            preparedStatement = PreparedStatement;
+            return preparedStatement?.IsPrepared == true;
+        }
+
         /// <summary>
         /// Initializes a new <see cref="NpgsqlBatchCommand"/>.
         /// </summary>
@@ -173,13 +182,13 @@ internal bool TryAutoPrepare(NpgsqlConnector connector)
         {
             // If this statement isn't prepared, see if it gets implicitly prepared.
             // Note that this may return null (not enough usages for automatic preparation).
-            if (!IsPrepared)
-                PreparedStatement = connector.PreparedStatementManager.TryGetAutoPrepared(this);
-            if (PreparedStatement is PreparedStatement pStatement)
+            if (!TryGetPrepared(out var preparedStatement))
+                preparedStatement = PreparedStatement = connector.PreparedStatementManager.TryGetAutoPrepared(this);
+            if (preparedStatement is not null)
             {
-                if (pStatement?.State == PreparedState.NotPrepared)
+                if (preparedStatement.State == PreparedState.NotPrepared)
                 {
-                    pStatement.State = PreparedState.BeingPrepared;
+                    preparedStatement.State = PreparedState.BeingPrepared;
                     IsPreparing = true;
                 }
 
diff --git a/src/Npgsql/NpgsqlDataReader.cs b/src/Npgsql/NpgsqlDataReader.cs
@@ -403,10 +403,10 @@ async Task<bool> NextResult(bool async, bool isConsuming = false, CancellationTo
                 {
                     var statement = _statements[StatementIndex];
 
-                    if (statement.IsPrepared)
+                    if (statement.TryGetPrepared(out var preparedStatement))
                     {
                         Expect<BindCompleteMessage>(await Connector.ReadMessage(async), Connector);
-                        RowDescription = statement.Description;
+                        RowDescription = preparedStatement.Description;
                     }
                     else // Non-prepared/preparing flow
                     {
@@ -602,11 +602,11 @@ async Task<bool> NextResultSchemaOnly(bool async, bool isConsuming = false, Canc
                 for (StatementIndex++; StatementIndex < _statements.Count; StatementIndex++)
                 {
                     var statement = _statements[StatementIndex];
-                    if (statement.IsPrepared)
+                    if (statement.TryGetPrepared(out var preparedStatement))
                     {
                         // Row descriptions have already been populated in the statement objects at the
                         // Prepare phase
-                        RowDescription = _statements[StatementIndex].Description;
+                        RowDescription = preparedStatement.Description;
                     }
                     else
                     {

Original file line number	Diff line number	Diff line change
`@@ -403,10 +403,10 @@ async Task<bool> NextResult(bool async, bool isConsuming = false, CancellationTo`
`403`	`403`	`{`
`404`	`404`	`var statement = _statements[StatementIndex];`
`405`	`405`
`406`		`- if (statement.IsPrepared)`
	`406`	`+ if (statement.TryGetPrepared(out var preparedStatement))`
`407`	`407`	`{`
`408`	`408`	`Expect<BindCompleteMessage>(await Connector.ReadMessage(async), Connector);`
`409`		`- RowDescription = statement.Description;`
	`409`	`+ RowDescription = preparedStatement.Description;`
`410`	`410`	`}`
`411`	`411`	`else // Non-prepared/preparing flow`
`412`	`412`	`{`
`@@ -602,11 +602,11 @@ async Task<bool> NextResultSchemaOnly(bool async, bool isConsuming = false, Canc`
`602`	`602`	`for (StatementIndex++; StatementIndex < _statements.Count; StatementIndex++)`
`603`	`603`	`{`
`604`	`604`	`var statement = _statements[StatementIndex];`
`605`		`- if (statement.IsPrepared)`
	`605`	`+ if (statement.TryGetPrepared(out var preparedStatement))`
`606`	`606`	`{`
`607`	`607`	`// Row descriptions have already been populated in the statement objects at the`
`608`	`608`	`// Prepare phase`
`609`		`- RowDescription = _statements[StatementIndex].Description;`
	`609`	`+ RowDescription = preparedStatement.Description;`
`610`	`610`	`}`
`611`	`611`	`else`
`612`	`612`	`{`