Skip to content

RM-9724 Add FocrceSeek to lockstatment for Batched Sql queries #1446

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

Open
dkudernatsch wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RM-9724 Add FocrceSeek to lockstatment for Batched Sql queries #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions ...nObjects.UnitTests/Persistence/Rdbms/DbCommandBuilders/BatchedLockDbCommandBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ public void Create_WithOneTableAndDefaultSchema ()
SET @IsReadCommittedSnapshotOn = (SELECT [is_read_committed_snapshot_on] FROM [sys].[databases] WHERE [database_id] = DB_ID());
IF (@TransactionIsolationLevel = 2 AND @IsReadCommittedSnapshotOn = 1)
BEGIN
SELECT [P].[col1], [P].[col2] FROM [Table] [T] WITH(ROWLOCK, XLOCK, READPAST)
SELECT [P].[col1], [P].[col2] FROM [Table] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL;
END
ELSE
BEGIN
SELECT [P].[col1], [P].[col2] FROM [Table] [T] WITH(ROWLOCK, XLOCK)
SELECT [P].[col1], [P].[col2] FROM [Table] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL;
END
Expand Down Expand Up @@ -105,13 +105,13 @@ public void Create_WithOneTableCustomSchema ()
SET @IsReadCommittedSnapshotOn = (SELECT [is_read_committed_snapshot_on] FROM [sys].[databases] WHERE [database_id] = DB_ID());
IF (@TransactionIsolationLevel = 2 AND @IsReadCommittedSnapshotOn = 1)
BEGIN
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table] [T] WITH(ROWLOCK, XLOCK, READPAST)
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL;
END
ELSE
BEGIN
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table] [T] WITH(ROWLOCK, XLOCK)
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL;
END
Expand Down Expand Up @@ -150,29 +150,29 @@ public void Create_WithMultipleTablesDefaultSchema ()
SET @IsReadCommittedSnapshotOn = (SELECT [is_read_committed_snapshot_on] FROM [sys].[databases] WHERE [database_id] = DB_ID());
IF (@TransactionIsolationLevel = 2 AND @IsReadCommittedSnapshotOn = 1)
BEGIN
SELECT [P].[col1], [P].[col2] FROM [Table1] [T] WITH(ROWLOCK, XLOCK, READPAST)
SELECT [P].[col1], [P].[col2] FROM [Table1] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table1 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL
UNION ALL
SELECT [P].[col1], [P].[col2] FROM [Table2] [T] WITH(ROWLOCK, XLOCK, READPAST)
SELECT [P].[col1], [P].[col2] FROM [Table2] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table2 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL
UNION ALL
SELECT [P].[col1], [P].[col2] FROM [Table3] [T] WITH(ROWLOCK, XLOCK, READPAST)
SELECT [P].[col1], [P].[col2] FROM [Table3] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table3 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL;
END
ELSE
BEGIN
SELECT [P].[col1], [P].[col2] FROM [Table1] [T] WITH(ROWLOCK, XLOCK)
SELECT [P].[col1], [P].[col2] FROM [Table1] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table1 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL
UNION ALL
SELECT [P].[col1], [P].[col2] FROM [Table2] [T] WITH(ROWLOCK, XLOCK)
SELECT [P].[col1], [P].[col2] FROM [Table2] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table2 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL
UNION ALL
SELECT [P].[col1], [P].[col2] FROM [Table3] [T] WITH(ROWLOCK, XLOCK)
SELECT [P].[col1], [P].[col2] FROM [Table3] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table3 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL;
END
Expand Down Expand Up @@ -211,29 +211,29 @@ public void Create_WithMultipleTablesCustomSchema ()
SET @IsReadCommittedSnapshotOn = (SELECT [is_read_committed_snapshot_on] FROM [sys].[databases] WHERE [database_id] = DB_ID());
IF (@TransactionIsolationLevel = 2 AND @IsReadCommittedSnapshotOn = 1)
BEGIN
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table1] [T] WITH(ROWLOCK, XLOCK, READPAST)
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table1] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table1 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL
UNION ALL
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table2] [T] WITH(ROWLOCK, XLOCK, READPAST)
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table2] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table2 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL
UNION ALL
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table3] [T] WITH(ROWLOCK, XLOCK, READPAST)
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table3] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table3 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL;
END
ELSE
BEGIN
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table1] [T] WITH(ROWLOCK, XLOCK)
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table1] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table1 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL
UNION ALL
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table2] [T] WITH(ROWLOCK, XLOCK)
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table2] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table2 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL
UNION ALL
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table3] [T] WITH(ROWLOCK, XLOCK)
SELECT [P].[col1], [P].[col2] FROM [customscheme].[Table3] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)
RIGHT JOIN @TVP_Lock_Table3 [P] ON [P].[col1] = [T].[col1] AND [P].[col2] = [T].[col2]
WHERE [T].[ID] IS NULL;
END
Expand Down
2 changes: 1 addition & 1 deletion ...cts.UnitTests/Persistence/Rdbms/SqlServer/IntegrationTests/SqlProviderGeneratedSqlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ public void Save_BatchedSaveCommandFactory ()
_testHelper.ExpectExecuteReader(
sequence,
expectedCommandBehavior:CommandBehavior.Default,
"DECLARE @TransactionIsolationLevel int;\r\nDECLARE @IsReadCommittedSnapshotOn bit;\r\nSET @TransactionIsolationLevel = (SELECT [transaction_isolation_level] FROM [sys].[dm_exec_sessions] WHERE [session_id] = @@SPID);\r\nSET @IsReadCommittedSnapshotOn = (SELECT [is_read_committed_snapshot_on] FROM [sys].[databases] WHERE [database_id] = DB_ID());\r\nIF (@TransactionIsolationLevel = 2 AND @IsReadCommittedSnapshotOn = 1)\r\nBEGIN\r\nSELECT [P].[ID], [P].[Timestamp] FROM [Employee] [T] WITH(ROWLOCK, XLOCK, READPAST)\r\nRIGHT JOIN @TVP_Lock_Employee [P] ON [P].[ID] = [T].[ID] AND [P].[Timestamp] = [T].[Timestamp]\r\nWHERE [T].[ID] IS NULL;\r\nEND\r\nELSE\r\nBEGIN\r\nSELECT [P].[ID], [P].[Timestamp] FROM [Employee] [T] WITH(ROWLOCK, XLOCK)\r\nRIGHT JOIN @TVP_Lock_Employee [P] ON [P].[ID] = [T].[ID] AND [P].[Timestamp] = [T].[Timestamp]\r\nWHERE [T].[ID] IS NULL;\r\nEND",
"DECLARE @TransactionIsolationLevel int;\r\nDECLARE @IsReadCommittedSnapshotOn bit;\r\nSET @TransactionIsolationLevel = (SELECT [transaction_isolation_level] FROM [sys].[dm_exec_sessions] WHERE [session_id] = @@SPID);\r\nSET @IsReadCommittedSnapshotOn = (SELECT [is_read_committed_snapshot_on] FROM [sys].[databases] WHERE [database_id] = DB_ID());\r\nIF (@TransactionIsolationLevel = 2 AND @IsReadCommittedSnapshotOn = 1)\r\nBEGIN\r\nSELECT [P].[ID], [P].[Timestamp] FROM [Employee] [T] WITH(ROWLOCK, XLOCK, READPAST, FORCESEEK)\r\nRIGHT JOIN @TVP_Lock_Employee [P] ON [P].[ID] = [T].[ID] AND [P].[Timestamp] = [T].[Timestamp]\r\nWHERE [T].[ID] IS NULL;\r\nEND\r\nELSE\r\nBEGIN\r\nSELECT [P].[ID], [P].[Timestamp] FROM [Employee] [T] WITH(ROWLOCK, XLOCK, FORCESEEK)\r\nRIGHT JOIN @TVP_Lock_Employee [P] ON [P].[ID] = [T].[ID] AND [P].[Timestamp] = [T].[Timestamp]\r\nWHERE [T].[ID] IS NULL;\r\nEND",
Tuple.Create("@TVP_Lock_Employee", DbType.Object, (object)expectedLockTvpValue));

_testHelper.ExpectExecuteNonQuery(
Expand Down
6 changes: 5 additions & 1 deletion ...ion/Data/DomainObjects/Persistence/Rdbms/DbCommandBuilders/BatchedLockDbCommandBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,11 @@ private string CreateLockStatement (
{
var selectColumns = string.Join(", ", columns.Select(c => $"{parameterAlias}.{c}"));
var joinCondition = string.Join(" AND ", columns.Select(c => $"{parameterAlias}.{c} = {tableAlias}.{c}"));
var tableHints = forReadCommittedIsolation ? "ROWLOCK, XLOCK, READPAST" : "ROWLOCK, XLOCK";

@MichaelKetting MichaelKetting Aug 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should update the Lock_DoesNotWaitToFail_ForOtherTransaction_WithIsolationLevel_ReadCommitted to use more than two Tasks and possibly switch from Task to Thread. It doesn't have to be in this PR but it would be correct and helpful to demonstrate the issue. If not done here, we need a follow-up task.

// FORCESEEK guarantees that the optimizer seeks into the target table's index instead of scanning it, which would otherwise
// XLOCK every row of the table (not just the rows being locked) on small tables and cause spurious ConcurrencyViolations
// for concurrent batches locking disjoint rows (RM-9724). The target table's ID column always has a clustered index (its
// primary key), so a seek plan always exists.
var tableHints = forReadCommittedIsolation ? "ROWLOCK, XLOCK, READPAST, FORCESEEK" : "ROWLOCK, XLOCK, FORCESEEK";

return $"""
SELECT {selectColumns} FROM {schemaName}{tableName} {tableAlias} WITH({tableHints})
Expand Down