[Th2-5165] Use cache in BookInfo

cradle-cassandra/src/main/java/com/exactpro/cradle/cassandra/dao/messages/AbstractMessageIteratorProvider.java

@@ -47,7 +47,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -56,8 +55,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 
 import static com.exactpro.cradle.Order.REVERSE;
@@ -84,10 +81,7 @@ abstract public class AbstractMessageIteratorProvider<T> extends IteratorProvide
 	protected final MessageBatchIteratorFilter<MessageBatchEntity> batchFilter;
 	protected final MessageBatchIteratorCondition<MessageBatchEntity> iterationCondition;
 
-	private final Lock lock = new ReentrantLock();
-	@GuardedBy("lock")
 	private final Iterator<PageInfo> pageProvider;
-	@GuardedBy("lock")
 	// only get / set operation are guarded by lock
 	private TakeWhileIterator<MessageBatchEntity> takeWhileIterator;
 
@@ -219,22 +213,17 @@ protected CassandraStoredMessageFilter createFilter(@Nonnull PageInfo pageInfo,
 	}
 
 	protected @Nullable PageInfo nextPage() {
-		lock.lock();
-		try {
-			if (takeWhileIterator != null && takeWhileIterator.isHalted()) {
-				LOGGER.debug("Iterator was interrupted because iterator condition was not met");
-				return null;
-			}
-
-			if (limit > 0 && returned.get() >= limit) {
-				LOGGER.debug("Filtering interrupted because limit for records to return ({}) is reached ({})", limit, returned);
-				return null;
-			}
+		if (takeWhileIterator != null && takeWhileIterator.isHalted()) {
+			LOGGER.debug("Iterator was interrupted because iterator condition was not met");
+			return null;
+		}
 
-			return pageProvider.hasNext() ? pageProvider.next() : null;
-		} finally {
-			lock.unlock();
+		if (limit > 0 && returned.get() >= limit) {
+			LOGGER.debug("Filtering interrupted because limit for records to return ({}) is reached ({})", limit, returned);
+			return null;
 		}
+
+		return pageProvider.hasNext() ? pageProvider.next() : null;
 	}
 
 	protected Iterator<StoredMessageBatch> getBatchedIterator(PageId pageId,
@@ -248,19 +237,14 @@ protected Iterator<StoredMessageBatch> getBatchedIterator(PageId pageId,
 				pagedIterator,
 				batchFilter::test);
 
-		lock.lock();
-		try {
-			// We need to store this iterator since
-			// it gives info whether or no iterator was halted
-			takeWhileIterator = new TakeWhileIterator<>(
-					filteringIterator,
-					iterationCondition);
+		// We need to store this iterator since
+		// it gives info whether or no iterator was halted
+		takeWhileIterator = new TakeWhileIterator<>(
+				filteringIterator,
+				iterationCondition);
 
-			return new ConvertingIterator<>(
-					takeWhileIterator, entity ->
-					MessagesWorker.mapMessageBatchEntity(pageId, entity));
-		} finally {
-			lock.unlock();
-		}
+		return new ConvertingIterator<>(
+				takeWhileIterator, entity ->
+				MessagesWorker.mapMessageBatchEntity(pageId, entity));
 	}
 }

cradle-cassandra/src/main/java/com/exactpro/cradle/cassandra/dao/messages/GroupedMessageIteratorProvider.java

@@ -26,7 +26,6 @@
 import com.exactpro.cradle.cassandra.iterators.PagedIterator;
 import com.exactpro.cradle.cassandra.resultset.IteratorProvider;
 import com.exactpro.cradle.cassandra.retries.SelectQueryExecutor;
-import com.exactpro.cradle.cassandra.utils.ThreadSafeProvider;
 import com.exactpro.cradle.cassandra.workers.MessagesWorker;
 import com.exactpro.cradle.filters.FilterForGreater;
 import com.exactpro.cradle.filters.FilterForLess;
@@ -68,7 +67,7 @@ public class GroupedMessageIteratorProvider extends IteratorProvider<StoredGroup
 	private final GroupedMessageFilter filter;
 	protected final FilterForGreater<Instant> leftBoundFilter;
 	protected final FilterForLess<Instant> rightBoundFilter;
-	private final ThreadSafeProvider<PageInfo> pageProvider;
+	private final Iterator<PageInfo> pageProvider;
 	private final Function<BoundStatementBuilder, BoundStatementBuilder> readAttrs;
 	/** limit must be strictly positive ( limit greater than 0 ) */
 	private final int limit;
@@ -96,12 +95,10 @@ public GroupedMessageIteratorProvider(String requestInfo,
 		this.returned = new AtomicInteger();
 		this.leftBoundFilter = createLeftBoundFilter(filter);
 		this.rightBoundFilter = createRightBoundFilter(filter);
-		this.pageProvider = new ThreadSafeProvider<>(
-			book.getPages(
-				leftBoundFilter.getValue(),
-				rightBoundFilter.getValue(),
-				order
-			)
+		this.pageProvider = book.getPages(
+			leftBoundFilter.getValue(),
+			rightBoundFilter.getValue(),
+			order
 		);
 		this.order = order;
 	}
@@ -174,10 +171,10 @@ private LocalTime getNearestBatchTime(Instant timestamp,
 
 	@Override
 	public CompletableFuture<Iterator<StoredGroupedMessageBatch>> nextIterator() {
-		PageInfo nextPage = pageProvider.next();
-		if (nextPage == null) {
+		if (!pageProvider.hasNext()) {
 			return CompletableFuture.completedFuture(null);
 		}
+		PageInfo nextPage = pageProvider.next();
 
 		if (limit > 0 && returned.get() >= limit) {
 			logger.debug("Filtering interrupted because limit for records to return ({}) is reached ({})", limit, returned);

cradle-cassandra/src/main/java/com/exactpro/cradle/cassandra/dao/statistics/EntityStatisticsIteratorProvider.java

@@ -25,7 +25,6 @@
 import com.exactpro.cradle.cassandra.iterators.PagedIterator;
 import com.exactpro.cradle.cassandra.resultset.IteratorProvider;
 import com.exactpro.cradle.cassandra.retries.SelectQueryExecutor;
-import com.exactpro.cradle.cassandra.utils.ThreadSafeProvider;
 import com.exactpro.cradle.counters.CounterSample;
 import com.exactpro.cradle.iterators.ConvertingIterator;
 
@@ -45,7 +44,7 @@ public class EntityStatisticsIteratorProvider extends IteratorProvider<CounterSa
     private final FrameType frameType;
     private final FrameInterval frameInterval;
     private final Function<BoundStatementBuilder, BoundStatementBuilder> readAttrs;
-    private final ThreadSafeProvider<PageInfo> pageProvider;
+    private final Iterator<PageInfo> pageProvider;
     public EntityStatisticsIteratorProvider(String requestInfo, CassandraOperators operators, BookInfo book,
                                             ExecutorService composingService, SelectQueryExecutor selectQueryExecutor,
                                             EntityType entityType,
@@ -60,21 +59,19 @@ public EntityStatisticsIteratorProvider(String requestInfo, CassandraOperators o
         this.frameType = frameType;
         this.frameInterval = frameInterval;
         this.readAttrs = readAttrs;
-        this.pageProvider = new ThreadSafeProvider<>(
-                book.getPages(
-                        frameInterval.getInterval().getStart(),
-                        frameInterval.getInterval().getEnd(),
-                        DIRECT
-                )
+        this.pageProvider = book.getPages(
+            frameInterval.getInterval().getStart(),
+            frameInterval.getInterval().getEnd(),
+            DIRECT
         );
     }
 
     @Override
     public CompletableFuture<Iterator<CounterSample>> nextIterator() {
-        PageInfo pageInfo = pageProvider.next();
-        if(pageInfo == null){
+        if(!pageProvider.hasNext()){
             return CompletableFuture.completedFuture(null);
         }
+        PageInfo pageInfo = pageProvider.next();
 
         Instant actualStart = frameInterval.getFrameType().getFrameStart(frameInterval.getInterval().getStart());
         Instant actualEnd = frameInterval.getFrameType().getFrameEnd(frameInterval.getInterval().getEnd());

cradle-cassandra/src/main/java/com/exactpro/cradle/cassandra/dao/statistics/MessageStatisticsIteratorProvider.java

@@ -24,7 +24,6 @@
 import com.exactpro.cradle.cassandra.iterators.PagedIterator;
 import com.exactpro.cradle.cassandra.resultset.IteratorProvider;
 import com.exactpro.cradle.cassandra.retries.SelectQueryExecutor;
-import com.exactpro.cradle.cassandra.utils.ThreadSafeProvider;
 import com.exactpro.cradle.counters.CounterSample;
 import com.exactpro.cradle.iterators.ConvertingIterator;
 
@@ -44,7 +43,7 @@ public class MessageStatisticsIteratorProvider extends IteratorProvider<CounterS
     private final Direction direction;
     private final FrameInterval frameInterval;
     private final Function<BoundStatementBuilder, BoundStatementBuilder> readAttrs;
-    private final ThreadSafeProvider<PageInfo> pageProvider;
+    private final Iterator<PageInfo> pageProvider;
 
     public MessageStatisticsIteratorProvider(String requestInfo, CassandraOperators operators, BookInfo book,
                                              ExecutorService composingService, SelectQueryExecutor selectQueryExecutor,
@@ -59,22 +58,20 @@ public MessageStatisticsIteratorProvider(String requestInfo, CassandraOperators
         this.direction = direction;
         this.frameInterval = frameInterval;
         this.readAttrs = readAttrs;
-        this.pageProvider = new ThreadSafeProvider<>(
-                book.getPages(
-                        frameInterval.getInterval().getStart(),
-                        frameInterval.getInterval().getEnd(),
-                        DIRECT
-                )
+        this.pageProvider = book.getPages(
+            frameInterval.getInterval().getStart(),
+            frameInterval.getInterval().getEnd(),
+            DIRECT
         );
 
     }
 
     @Override
     public CompletableFuture<Iterator<CounterSample>> nextIterator() {
-        PageInfo pageInfo = pageProvider.next();
-        if(pageInfo == null){
+        if(!pageProvider.hasNext()){
             return CompletableFuture.completedFuture(null);
         }
+        PageInfo pageInfo = pageProvider.next();
 
         Instant actualStart = frameInterval.getFrameType().getFrameStart(frameInterval.getInterval().getStart());
         Instant actualEnd = frameInterval.getFrameType().getFrameEnd(frameInterval.getInterval().getEnd());

cradle-cassandra/src/main/java/com/exactpro/cradle/cassandra/dao/testevents/TestEventIteratorProvider.java

@@ -25,7 +25,6 @@
 import com.exactpro.cradle.cassandra.iterators.PagedIterator;
 import com.exactpro.cradle.cassandra.resultset.IteratorProvider;
 import com.exactpro.cradle.cassandra.retries.SelectQueryExecutor;
-import com.exactpro.cradle.cassandra.utils.ThreadSafeProvider;
 import com.exactpro.cradle.filters.ComparisonOperation;
 import com.exactpro.cradle.filters.FilterForGreater;
 import com.exactpro.cradle.iterators.ConvertingIterator;
@@ -71,7 +70,7 @@ public class TestEventIteratorProvider extends IteratorProvider<StoredTestEvent>
 	private final int limit;
 	private final AtomicInteger returned = new AtomicInteger();
     private final Instant actualFrom;
-	private final ThreadSafeProvider<PageInfo> pageProvider;
+	private final Iterator<PageInfo> pageProvider;
 	private final TestEventFilter filter;
 	private final FilterForGreater<Instant> leftBoundFilter;
 
@@ -91,23 +90,21 @@ public TestEventIteratorProvider(String requestInfo, TestEventFilter filter, Cas
 		this.leftBoundFilter = createLeftBoundFilter(book, eventBatchDurationWorker, actualFrom, readAttrs, filter);
 		this.filter = filter;
 
-		this.pageProvider = new ThreadSafeProvider<>(
-				book.getPages(
-						// we must calculate the first timestamp by origin filter because
-						// left bound filter is calculated according to max duration of event batch on the first page
-						findFirstTimestamp(filter.getPageId(), filter.getStartTimestampFrom(), book),
-						findLastTimestamp(filter.getPageId(), filter.getStartTimestampTo(), book),
-						filter.getOrder()
-				)
+		this.pageProvider = book.getPages(
+			// we must calculate the first timestamp by origin filter because
+			// left bound filter is calculated according to max duration of event batch on the first page
+			findFirstTimestamp(filter.getPageId(), filter.getStartTimestampFrom(), book),
+			findLastTimestamp(filter.getPageId(), filter.getStartTimestampTo(), book),
+			filter.getOrder()
 		);
 	}
 
 	@Override
 	public CompletableFuture<Iterator<StoredTestEvent>> nextIterator() {
-		PageInfo nextPage = pageProvider.next();
-		if (nextPage == null) {
+		if (!pageProvider.hasNext()) {
 			return CompletableFuture.completedFuture(null);
 		}
+		PageInfo nextPage = pageProvider.next();
 
 		if (limit > 0 && returned.get() >= limit) {
 			LOGGER.debug("Filtering interrupted because limit for records to return ({}) is reached ({})", limit, returned);