IGNITE-13166 Flaky H2RowCachePageEvictionTest and IgniteCacheQueryH2IndexingLeakTest tests (apache#7947)

Author: korlov42

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ConcurrentStripedPool.java

@@ -124,37 +124,29 @@ public void clear() {
     /** {@inheritDoc} */
     @Override public @NotNull Iterator<E> iterator() {
         return new Iterator<E>() {
-            int idx = 0;
-            Iterator<E> it = stripePools[idx].iterator();
+            private int idx;
+
+            private Iterator<E> it = stripePools[idx].iterator();
 
             @Override public boolean hasNext() {
-                if (it.hasNext())
-                    return true;
+                while (true) {
+                    if (it.hasNext())
+                        return true;
 
-                idx++;
+                    if (++idx >= stripes)
+                        break;
 
-                if (idx < stripes) {
                     it = stripePools[idx].iterator();
-
-                    return it.hasNext();
                 }
-                else
-                    return false;
+
+                return false;
             }
 
             @Override public E next() {
-                if (it.hasNext())
+                if (hasNext())
                     return it.next();
 
-                idx++;
-
-                if (idx < stripes) {
-                    it = stripePools[idx].iterator();
-
-                    return it.next();
-                }
-                else
-                    throw new NoSuchElementException();
+                throw new NoSuchElementException();
             }
         };
     }

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ConnectionManager.java

@@ -76,7 +76,8 @@ public class ConnectionManager {
     private final Long stmtCleanupPeriod = Long.getLong(IGNITE_H2_INDEXING_CACHE_CLEANUP_PERIOD, 10_000);
 
     /** The timeout to remove entry from the statement cache if the thread doesn't perform any queries. */
-    private final Long stmtTimeout = Long.getLong(IGNITE_H2_INDEXING_CACHE_THREAD_USAGE_TIMEOUT, 600 * 1000);
+    private final Long stmtTimeout = Long.getLong(IGNITE_H2_INDEXING_CACHE_THREAD_USAGE_TIMEOUT, 600 * 1000)
+        * 1_000_000; // convert millis to nanos
 
     /** Database URL. */
     private final String dbUrl;
@@ -224,10 +225,8 @@ public void stop() {
      * Called periodically to clean up the statement cache.
      */
     private void cleanupStatements() {
-        long now = U.currentTimeMillis();
-
         connPool.forEach(c -> {
-            if (now - c.statementCache().lastUsage() > stmtTimeout)
+            if (c.statementCache().inactiveFor(stmtTimeout))
                 c.clearStatementCache();
         });
     }

modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2StatementCache.java

@@ -57,6 +57,8 @@ public final class H2StatementCache {
      * @param stmt Statement which will be cached.
      */
     void put(H2CachedStatementKey key, @NotNull PreparedStatement stmt) {
+        lastUsage = System.nanoTime();
+
         lruStmtCache.put(key, stmt);
     }
 
@@ -67,23 +69,19 @@ void put(H2CachedStatementKey key, @NotNull PreparedStatement stmt) {
      * @return Statement associated with a key.
      */
     @Nullable PreparedStatement get(H2CachedStatementKey key) {
+        lastUsage = System.nanoTime();
+
         return lruStmtCache.get(key);
     }
 
     /**
-     * The timestamp of the last usage of the cache.
+     * Checks if the current cache has not been used for at least {@code nanos} nanoseconds.
      *
-     * @return last usage timestamp
+     * @param nanos Interval in nanoseconds.
+     * @return {@code true} if the current cache has not been used for the specified period.
      */
-    long lastUsage() {
-        return lastUsage;
-    }
-
-    /**
-     * Updates the {@link #lastUsage} timestamp by current time.
-     */
-    void updateLastUsage() {
-        lastUsage = U.currentTimeMillis();
+    boolean inactiveFor(long nanos) {
+        return System.nanoTime() - lastUsage >= nanos;
     }
 
     /**
@@ -93,6 +91,8 @@ void updateLastUsage() {
      * @param sql SQL statement.
      */
     void remove(String schemaName, String sql, byte qryFlags) {
+        lastUsage = System.nanoTime();
+
         lruStmtCache.remove(new H2CachedStatementKey(schemaName, sql, qryFlags));
     }