Excluded in start of range in ListBy when it is not last property…

… of key now works correctly.
Bobris · Jul 6, 2024 · 622322c · 622322c
1 parent 82c9eaa
commit 622322c
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 104 deletions.
diff --git a/BTDB/ODBLayer/RelationBuilder.cs b/BTDB/ODBLayer/RelationBuilder.cs
@@ -551,8 +551,6 @@ void BuildRemoveByIdAdvancedParamMethod(MethodInfo method, ParameterInfo[] param
         var primaryKeyFields = FilterOutInKeyValues(ClientRelationVersionInfo.PrimaryKeyFields.Span);
         var field = primaryKeyFields[prefixParamCount];
 
-        if (parameters.Length != primaryKeyFields.Length)
-            ForbidExcludePropositionInDebug(reqMethod.Generator, advEnumParamOrder, advEnumParam);
         ValidateAdvancedEnumParameter(field, advEnumParamType, method.Name);
 
         reqMethod.Generator.Ldarg(0); //manipulator for call RemoveByIdAdvancedParam
@@ -667,8 +665,6 @@ void BuildListByIdMethod(MethodInfo method, IILMethod reqMethod)
             var primaryKeyFields = FilterOutInKeyValues(ClientRelationVersionInfo.PrimaryKeyFields.Span);
             var field = primaryKeyFields[prefixParamCount];
 
-            if (parameters.Length != primaryKeyFields.Length)
-                ForbidExcludePropositionInDebug(reqMethod.Generator, advEnumParamOrder, advEnumParam);
             ValidateAdvancedEnumParameter(field, advEnumParamType, method.Name);
 
             reqMethod.Generator.Ldarg(0).Castclass(typeof(IRelationDbManipulator));
@@ -845,8 +841,6 @@ void PrepareAnyCountByIdWithAep(MethodInfo method, IILMethod reqMethod, Paramete
         var primaryKeyFields = FilterOutInKeyValues(ClientRelationVersionInfo.PrimaryKeyFields.Span);
         var field = primaryKeyFields[prefixParamCount];
 
-        if (parameters.Length != primaryKeyFields.Length)
-            ForbidExcludePropositionInDebug(reqMethod.Generator, advEnumParamOrder, advEnumParam);
         ValidateAdvancedEnumParameter(field, advEnumParamType, method.Name);
 
         WritePrimaryKeyPrefixFinishedByAdvancedEnumeratorWithoutOrder(method, parameters, reqMethod,
@@ -871,8 +865,6 @@ void BuildListByMethod(MethodInfo method, IILMethod reqMethod)
             var skFields = ClientRelationVersionInfo.GetSecondaryKeyFields(secondaryKeyIndex);
             var field = skFields[prefixParamCount];
 
-            if (parameters.Length != skFields.Length)
-                ForbidExcludePropositionInDebug(reqMethod.Generator, advEnumParamOrder, advEnumParam);
             ValidateAdvancedEnumParameter(field, advEnumParamType, method.Name);
 
             reqMethod.Generator
@@ -966,22 +958,6 @@ void BuildListByMethod(MethodInfo method, IILMethod reqMethod)
         }
     }
 
-    [Conditional("DEBUG")]
-    void ForbidExcludePropositionInDebug(IILGen ilGenerator, ushort advEnumParamOrder, Type advEnumParamType)
-    {
-        var propositionCheckFinished = ilGenerator.DefineLabel();
-        ilGenerator
-            .LdcI4((int)KeyProposition.Excluded)
-            .Ldarg(advEnumParamOrder)
-            .Ldfld(advEnumParamType.GetField(nameof(AdvancedEnumeratorParam<int>.StartProposition))!)
-            .Ceq()
-            .Brfalse(propositionCheckFinished)
-            .Ldstr("Not supported Excluded proposition when listing by partial key.")
-            .Newobj(() => new InvalidOperationException(null))
-            .Throw()
-            .Mark(propositionCheckFinished);
-    }
-
     void BuildCountByMethod(MethodInfo method, IILMethod reqMethod)
     {
         var parameters = method.GetParameters();
@@ -1061,8 +1037,6 @@ void PrepareAnyCountByWithAep(MethodInfo method, IILMethod reqMethod, ParameterI
         var skFields = ClientRelationVersionInfo.GetSecondaryKeyFields(secondaryKeyIndex);
         var field = skFields[prefixParamCount];
 
-        if (parameters.Length != skFields.Length)
-            ForbidExcludePropositionInDebug(reqMethod.Generator, advEnumParamOrder, advEnumParam);
         ValidateAdvancedEnumParameter(field, advEnumParamType, method.Name);
 
         var (pushWriter, ctxLocFactory) = WriterPushers(reqMethod.Generator);

diff --git a/BTDB/ODBLayer/RelationEnumerator.cs b/BTDB/ODBLayer/RelationEnumerator.cs
@@ -829,6 +829,15 @@ public RelationAdvancedEnumerator(
         }
         else
         {
+            if (startKeyProposition == KeyProposition.Excluded)
+            {
+                if (_keyValueTr.FindLastKey(startKeyBytes))
+                {
+                    startIndex = _keyValueTr.GetKeyIndex() - prefixIndex + 1;
+                    goto startIndexFound;
+                }
+            }
+
             switch (_keyValueTr.Find(startKeyBytes, (uint)prefixLen))
             {
                 case FindResult.Exact:
@@ -853,6 +862,7 @@ public RelationAdvancedEnumerator(
             }
         }
 
+        startIndexFound:
         _count = (uint)Math.Max(0, endIndex - startIndex + 1);
         _startPos = (uint)(_ascending ? startIndex : endIndex);
         _pos = 0;
@@ -1108,15 +1118,19 @@ public RelationAdvancedOrderedEnumerator(IRelationDbManipulator manipulator,
         }
         else
         {
+            if (startKeyProposition == KeyProposition.Excluded)
+            {
+                if (_keyValueTr.FindLastKey(startKeyBytes))
+                {
+                    startIndex = _keyValueTr.GetKeyIndex() - prefixIndex + 1;
+                    goto startIndexFound;
+                }
+            }
+
             switch (_keyValueTr.Find(startKeyBytes, (uint)prefixLen))
             {
                 case FindResult.Exact:
                     startIndex = _keyValueTr.GetKeyIndex() - prefixIndex;
-                    if (startKeyProposition == KeyProposition.Excluded)
-                    {
-                        startIndex++;
-                    }
-
                     break;
                 case FindResult.Previous:
                     startIndex = _keyValueTr.GetKeyIndex() - prefixIndex + 1;
@@ -1132,6 +1146,7 @@ public RelationAdvancedOrderedEnumerator(IRelationDbManipulator manipulator,
             }
         }
 
+        startIndexFound:
         _count = (uint)Math.Max(0, endIndex - startIndex + 1);
         _startPos = (uint)(_ascending ? startIndex : endIndex);
         _pos = 0;