fix: now reserves first tuple correctly; fixed some typos

Signed-off-by: Alwin Zomotor <[email protected]>
carbynestack · Aug 30, 2024 · 9eb7718 · 9eb7718
1 parent 4372482
commit 9eb7718
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...o/carbynestack/castor/service/persistence/fragmentstore/TupleChunkFragmentRepository.java b/...o/carbynestack/castor/service/persistence/fragmentstore/TupleChunkFragmentRepository.java
@@ -388,10 +388,12 @@ ArrayList<TupleChunkFragmentEntity> lockAndRetrieveReservedTuplesForConsumption(
               + TUPLE_CHUNK_ID_COLUMN
               + " = :tupleChunkId AND "
               + START_INDEX_COLUMN
-              + " = :startIdx RETURNING "
+              + " <= :startIdx AND "
+              + END_INDEX_COLUMN
+              + " > :startIdx RETURNING "
               + RESERVATION_ID_COLUMN,
       nativeQuery = true)
-  String lockFirstTupleReturningReservatioId(
+  String lockFirstFragmentReturningReservationId(
       @Param("tupleChunkId") UUID tupleChunkId, @Param("startIdx") long startIdx);
 
   @Transactional

diff --git a/...rbynestack/castor/service/persistence/fragmentstore/TupleChunkFragmentStorageService.java b/...rbynestack/castor/service/persistence/fragmentstore/TupleChunkFragmentStorageService.java
@@ -132,7 +132,7 @@ public ArrayList<TupleChunkFragmentEntity> lockReservedFragments(String reservat
   public int lockReservedFragmentsWithoutRetrieving(
       UUID tupleChunkId, long startIdx, String reservationId) {
     String deletedId =
-        fragmentRepository.lockFirstTupleReturningReservatioId(tupleChunkId, startIdx);
+        fragmentRepository.lockFirstFragmentReturningReservationId(tupleChunkId, startIdx);
     if (deletedId != null && deletedId.equals(reservationId))
       return 1 + fragmentRepository.lockRemainingTuplesWithoutRetrieving(reservationId);
     else

diff --git a/...st/java/io/carbynestack/castor/service/persistence/cache/ReservationCachingServiceIT.java b/...st/java/io/carbynestack/castor/service/persistence/cache/ReservationCachingServiceIT.java
@@ -225,7 +225,7 @@ void testComposing() {
     Answer mocklockFirstTupleReturningReservationId =
         (Answer)
             invocation -> {
-              return tupleChunkFragmentRepository.lockFirstTupleReturningReservatioId(
+              return tupleChunkFragmentRepository.lockFirstFragmentReturningReservationId(
                   invocation.getArgument(0, UUID.class), invocation.getArgument(1, Long.class));
             };