Fix condition for getting srcRecordInfo (use HasMainLogSrc instead of…

… HeadAddress comparison).
microsoft · Mar 7, 2025 · dac62d7 · dac62d7
1 parent 9e1427e
commit dac62d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libs/storage/Tsavorite/cs/src/core/Index/Tsavorite/Implementation/InternalRMW.cs b/libs/storage/Tsavorite/cs/src/core/Index/Tsavorite/Implementation/InternalRMW.cs
@@ -92,10 +92,10 @@ internal OperationStatus InternalRMW<TInput, TOutput, TContext, TSessionFunction
                         case LatchDestination.Retry:
                             goto LatchRelease;
                         case LatchDestination.CreateNewRecord:
-                            if (stackCtx.recSrc.LogicalAddress >= hlogBase.HeadAddress)
+                            if (stackCtx.recSrc.HasMainLogSrc)
                                 srcRecordInfo = ref stackCtx.recSrc.GetInfo();
-
                             goto CreateNewRecord;
+
                         default:
                             Debug.Assert(latchDestination == LatchDestination.NormalProcessing, "Unknown latchDestination value; expected NormalProcessing");
                             break;
@@ -325,7 +325,7 @@ private LatchDestination CheckCPRConsistencyRMW(Phase phase, ref OperationStackC
                     if (IsRecordVersionNew(stackCtx.recSrc.LogicalAddress))
                         break;      // Normal Processing; V+1 thread encountered a record in V+1
 
-                    if (stackCtx.recSrc.LogicalAddress >= hlogBase.HeadAddress)
+                    if (stackCtx.recSrc.HasMainLogSrc)
                         return LatchDestination.CreateNewRecord;    // Record is in memory so force creation of a (V+1) record
                     break;  // Normal Processing; the record is below HeadAddress so the operation will go pending
 

diff --git a/libs/storage/Tsavorite/cs/src/core/Index/Tsavorite/Implementation/InternalUpsert.cs b/libs/storage/Tsavorite/cs/src/core/Index/Tsavorite/Implementation/InternalUpsert.cs
@@ -86,10 +86,10 @@ internal OperationStatus InternalUpsert<TInput, TOutput, TContext, TSessionFunct
                         case LatchDestination.Retry:
                             goto LatchRelease;
                         case LatchDestination.CreateNewRecord:
-                            if (stackCtx.recSrc.LogicalAddress >= hlogBase.HeadAddress)
+                            if (stackCtx.recSrc.HasMainLogSrc)
                                 srcRecordInfo = ref stackCtx.recSrc.GetInfo();
-
                             goto CreateNewRecord;
+
                         default:
                             Debug.Assert(latchDestination == LatchDestination.NormalProcessing, "Unknown latchDestination value; expected NormalProcessing");
                             break;