rename leasesTableName to bracketedLeasesTableName (#902)

* rename leasesTableName to bracketedLeasesTableName

* merge error

Author: MaddyDev

src/TriggerBinding/SqlTableChangeMonitor.cs

@@ -52,7 +52,7 @@ internal sealed class SqlTableChangeMonitor<T> : IDisposable
         private readonly int _userTableId;
         private readonly SqlObject _userTable;
         private readonly string _userFunctionId;
-        private readonly string _leasesTableName;
+        private readonly string _bracketedLeasesTableName;
         private readonly IReadOnlyList<string> _userTableColumns;
         private readonly IReadOnlyList<(string name, string type)> _primaryKeyColumns;
         private readonly IReadOnlyList<string> _rowMatchConditions;
@@ -98,7 +98,7 @@ internal sealed class SqlTableChangeMonitor<T> : IDisposable
         /// <param name="userTableId">SQL object ID of the user table</param>
         /// <param name="userTable"><see cref="SqlObject" /> instance created with user table name</param>
         /// <param name="userFunctionId">Unique identifier for the user function</param>
-        /// <param name="leasesTableName">Name of the leases table</param>
+        /// <param name="bracketedLeasesTableName">Name of the leases table</param>
         /// <param name="userTableColumns">List of all column names in the user table</param>
         /// <param name="primaryKeyColumns">List of primary key column names in the user table</param>
         /// <param name="executor">Defines contract for triggering user function</param>
@@ -110,7 +110,7 @@ public SqlTableChangeMonitor(
             int userTableId,
             SqlObject userTable,
             string userFunctionId,
-            string leasesTableName,
+            string bracketedLeasesTableName,
             IReadOnlyList<string> userTableColumns,
             IReadOnlyList<(string name, string type)> primaryKeyColumns,
             ITriggeredFunctionExecutor executor,
@@ -121,7 +121,7 @@ public SqlTableChangeMonitor(
             this._connectionString = !string.IsNullOrEmpty(connectionString) ? connectionString : throw new ArgumentNullException(nameof(connectionString));
             this._userTable = !string.IsNullOrEmpty(userTable?.FullName) ? userTable : throw new ArgumentNullException(nameof(userTable));
             this._userFunctionId = !string.IsNullOrEmpty(userFunctionId) ? userFunctionId : throw new ArgumentNullException(nameof(userFunctionId));
-            this._leasesTableName = !string.IsNullOrEmpty(leasesTableName) ? leasesTableName : throw new ArgumentNullException(nameof(leasesTableName));
+            this._bracketedLeasesTableName = !string.IsNullOrEmpty(bracketedLeasesTableName) ? bracketedLeasesTableName : throw new ArgumentNullException(nameof(bracketedLeasesTableName));
             this._userTableColumns = userTableColumns ?? throw new ArgumentNullException(nameof(userTableColumns));
             this._primaryKeyColumns = primaryKeyColumns ?? throw new ArgumentNullException(nameof(primaryKeyColumns));
             this._executor = executor ?? throw new ArgumentNullException(nameof(executor));
@@ -805,7 +805,7 @@ SELECT TOP {this._maxBatchSize}
                     l.{LeasesTableAttemptCountColumnName},
                     l.{LeasesTableLeaseExpirationTimeColumnName}
                 FROM CHANGETABLE(CHANGES {this._userTable.BracketQuotedFullName}, @last_sync_version) AS c
-                LEFT OUTER JOIN {this._leasesTableName} AS l ON {leasesTableJoinCondition}
+                LEFT OUTER JOIN {this._bracketedLeasesTableName} AS l ON {leasesTableJoinCondition}
                 LEFT OUTER JOIN {this._userTable.BracketQuotedFullName} AS u ON {userTableJoinCondition}
                 WHERE
                     (l.{LeasesTableLeaseExpirationTimeColumnName} IS NULL AND
@@ -842,7 +842,7 @@ private async Task<int> GetLeaseLockedRowCount(SqlConnection connection, SqlTran
 
                 SELECT COUNT(*)
                 FROM CHANGETABLE(CHANGES {this._userTable.BracketQuotedFullName}, @last_sync_version) AS c
-                LEFT OUTER JOIN {this._leasesTableName} AS l ON {leasesTableJoinCondition}
+                LEFT OUTER JOIN {this._bracketedLeasesTableName} AS l ON {leasesTableJoinCondition}
                 WHERE l.{LeasesTableLeaseExpirationTimeColumnName} IS NOT NULL AND l.{LeasesTableLeaseExpirationTimeColumnName} > SYSDATETIME()";
             try
             {
@@ -890,7 +890,7 @@ private SqlCommand BuildAcquireLeasesCommand(SqlConnection connection, SqlTransa
                     {AppLockStatements}
 
                     WITH {acquireLeasesCte} AS ( SELECT * FROM OPENJSON(@rowData) WITH ({string.Join(",", cteColumnDefinitions)}) )
-                    MERGE INTO {this._leasesTableName}
+                    MERGE INTO {this._bracketedLeasesTableName}
                         AS ExistingData
                     USING {acquireLeasesCte}
                         AS NewData
@@ -924,7 +924,7 @@ private SqlCommand BuildRenewLeasesCommand(SqlConnection connection, SqlTransact
             string renewLeasesQuery = $@"
                 {AppLockStatements}
 
-                UPDATE {this._leasesTableName}
+                UPDATE {this._bracketedLeasesTableName}
                 SET {LeasesTableLeaseExpirationTimeColumnName} = DATEADD(second, {LeaseIntervalInSeconds}, SYSDATETIME())
                 WHERE {matchCondition};
             ";
@@ -957,12 +957,12 @@ private SqlCommand BuildReleaseLeasesCommand(SqlConnection connection, SqlTransa
 $@"{AppLockStatements}
 
 WITH {releaseLeasesCte} AS ( SELECT * FROM OPENJSON(@rowData) WITH ({string.Join(",", cteColumnDefinitions)}) )
-UPDATE {this._leasesTableName}
+UPDATE {this._bracketedLeasesTableName}
 SET
     {LeasesTableChangeVersionColumnName} = cte.{SysChangeVersionColumnName},
     {LeasesTableAttemptCountColumnName} = 0,
     {LeasesTableLeaseExpirationTimeColumnName} = NULL
-FROM {this._leasesTableName} l INNER JOIN releaseLeasesCte cte ON {primaryKeyMatchingQuery}
+FROM {this._bracketedLeasesTableName} l INNER JOIN releaseLeasesCte cte ON {primaryKeyMatchingQuery}
 WHERE l.{LeasesTableChangeVersionColumnName} <= cte.{SysChangeVersionColumnName};";
 
             var command = new SqlCommand(releaseLeasesQuery, connection, transaction);
@@ -997,7 +997,7 @@ private SqlCommand BuildUpdateTablesPostInvocation(SqlConnection connection, Sql
                 SELECT @unprocessed_changes = COUNT(*) FROM (
                     SELECT c.{SysChangeVersionColumnName}
                     FROM CHANGETABLE(CHANGES {this._userTable.BracketQuotedFullName}, @current_last_sync_version) AS c
-                    LEFT OUTER JOIN {this._leasesTableName} AS l ON {leasesTableJoinCondition}
+                    LEFT OUTER JOIN {this._bracketedLeasesTableName} AS l ON {leasesTableJoinCondition}
                     WHERE
                         c.{SysChangeVersionColumnName} <= {newLastSyncVersion} AND
                         ((l.{LeasesTableChangeVersionColumnName} IS NULL OR
@@ -1011,7 +1011,7 @@ LEFT OUTER JOIN {this._leasesTableName} AS l ON {leasesTableJoinCondition}
                     SET LastSyncVersion = {newLastSyncVersion}, LastAccessTime = GETUTCDATE()
                     WHERE UserFunctionID = '{this._userFunctionId}' AND UserTableID = {this._userTableId};
 
-                    DELETE FROM {this._leasesTableName} WHERE {LeasesTableChangeVersionColumnName} <= {newLastSyncVersion};
+                    DELETE FROM {this._bracketedLeasesTableName} WHERE {LeasesTableChangeVersionColumnName} <= {newLastSyncVersion};
                 END
             ";
 

src/TriggerBinding/SqlTriggerListener.cs

@@ -125,8 +125,8 @@ public async Task StartAsync(CancellationToken cancellationToken)
                     IReadOnlyList<(string name, string type)> primaryKeyColumns = await GetPrimaryKeyColumnsAsync(connection, userTableId, this._logger, this._userTable.FullName, cancellationToken);
                     IReadOnlyList<string> userTableColumns = await this.GetUserTableColumnsAsync(connection, userTableId, cancellationToken);
 
-                    string leasesTableName = GetLeasesTableName(this._userDefinedLeasesTableName, this._userFunctionId, userTableId);
-                    this._telemetryProps[TelemetryPropertyName.LeasesTableName] = leasesTableName;
+                    string bracketedLeasesTableName = GetBracketedLeasesTableName(this._userDefinedLeasesTableName, this._userFunctionId, userTableId);
+                    this._telemetryProps[TelemetryPropertyName.LeasesTableName] = bracketedLeasesTableName;
 
                     var transactionSw = Stopwatch.StartNew();
                     long createdSchemaDurationMs = 0L, createGlobalStateTableDurationMs = 0L, insertGlobalStateTableRowDurationMs = 0L, createLeasesTableDurationMs = 0L;
@@ -136,7 +136,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
                         createdSchemaDurationMs = await this.CreateSchemaAsync(connection, transaction, cancellationToken);
                         createGlobalStateTableDurationMs = await this.CreateGlobalStateTableAsync(connection, transaction, cancellationToken);
                         insertGlobalStateTableRowDurationMs = await this.InsertGlobalStateTableRowAsync(connection, transaction, userTableId, cancellationToken);
-                        createLeasesTableDurationMs = await this.CreateLeasesTableAsync(connection, transaction, leasesTableName, primaryKeyColumns, cancellationToken);
+                        createLeasesTableDurationMs = await this.CreateLeasesTableAsync(connection, transaction, bracketedLeasesTableName, primaryKeyColumns, cancellationToken);
                         transaction.Commit();
                     }
 
@@ -145,7 +145,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
                         userTableId,
                         this._userTable,
                         this._userFunctionId,
-                        leasesTableName,
+                        bracketedLeasesTableName,
                         userTableColumns,
                         primaryKeyColumns,
                         this._executor,
@@ -154,7 +154,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
                         this._telemetryProps);
 
                     this._listenerState = ListenerStarted;
-                    this._logger.LogDebug($"Started SQL trigger listener for table: '{this._userTable.FullName}' (object ID: {userTableId}), function ID: {this._userFunctionId}, leases table: {leasesTableName}");
+                    this._logger.LogDebug($"Started SQL trigger listener for table: '{this._userTable.FullName}' (object ID: {userTableId}), function ID: {this._userFunctionId}, leases table: {bracketedLeasesTableName}");
 
                     var measures = new Dictionary<TelemetryMeasureName, double>
                     {

src/TriggerBinding/SqlTriggerMetricsProvider.cs

@@ -100,7 +100,7 @@ private async Task<long> GetUnprocessedChangeCountAsync()
         private SqlCommand BuildGetUnprocessedChangesCommand(SqlConnection connection, SqlTransaction transaction, IReadOnlyList<(string name, string type)> primaryKeyColumns, int userTableId)
         {
             string leasesTableJoinCondition = string.Join(" AND ", primaryKeyColumns.Select(col => $"c.{col.name.AsBracketQuotedString()} = l.{col.name.AsBracketQuotedString()}"));
-            string leasesTableName = GetLeasesTableName(this._userDefinedLeasesTableName, this._userFunctionId, userTableId);
+            string bracketedLeasesTableName = GetBracketedLeasesTableName(this._userDefinedLeasesTableName, this._userFunctionId, userTableId);
             string getUnprocessedChangesQuery = $@"
                 {AppLockStatements}
 
@@ -111,7 +111,7 @@ private SqlCommand BuildGetUnprocessedChangesCommand(SqlConnection connection, S
 
                 SELECT COUNT_BIG(*)
                 FROM CHANGETABLE(CHANGES {this._userTable.BracketQuotedFullName}, @last_sync_version) AS c
-                LEFT OUTER JOIN {leasesTableName} AS l ON {leasesTableJoinCondition}
+                LEFT OUTER JOIN {bracketedLeasesTableName} AS l ON {leasesTableJoinCondition}
                 WHERE
                     (l.{LeasesTableLeaseExpirationTimeColumnName} IS NULL AND
                        (l.{LeasesTableChangeVersionColumnName} IS NULL OR l.{LeasesTableChangeVersionColumnName} < c.{SysChangeVersionColumnName}) OR

src/TriggerBinding/SqlTriggerUtils.cs

@@ -120,7 +120,7 @@ internal static async Task<int> GetUserTableIdAsync(SqlConnection connection, Sq
         /// <param name="userDefinedLeasesTableName">Leases table name defined by the user</param>
         /// <param name="userTableId">SQL object ID of the user table</param>
         /// <param name="userFunctionId">Unique identifier for the user function</param>
-        internal static string GetLeasesTableName(string userDefinedLeasesTableName, string userFunctionId, int userTableId)
+        internal static string GetBracketedLeasesTableName(string userDefinedLeasesTableName, string userFunctionId, int userTableId)
         {
             return string.IsNullOrEmpty(userDefinedLeasesTableName) ? string.Format(CultureInfo.InvariantCulture, LeasesTableNameFormat, $"{userFunctionId}_{userTableId}") :
                 string.Format(CultureInfo.InvariantCulture, UserDefinedLeasesTableNameFormat, $"{userDefinedLeasesTableName.AsBracketQuotedString()}");