LIRS cache: bugfix for very large cache sizes.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>For in-memory databases, queries with a "group by" column that
+<ul><li>LIRS cache: bugfix for very large cache sizes.
+</li><li>For in-memory databases, queries with a "group by" column that
     is also a hash index threw a RuntimeException.
 </li><li>Improved error message for some syntax errors.
 </li><li>File system abstraction: if used directly, some file systems did not work correctly

h2/src/main/org/h2/mvstore/cache/CacheLongKeyLIRS.java

@@ -777,9 +777,9 @@ public class CacheLongKeyLIRS<V> {
          */
         private void evict(Entry<V> newCold) {
             // ensure there are not too many hot entries:
-            // left shift of 5 is multiplication by 32, that means if there are less
+            // right shift of 5 is division by 32, that means if there are less
             // than 1/32 (3.125%) cold entries, a new hot entry needs to become cold
-            while ((queueSize << 5) < mapSize) {
+            while (queueSize < (mapSize >>> 5)) {
                 convertOldestHotToCold();
             }
             if (stackSize > 0) {

h2/src/tools/org/h2/dev/cache/CacheLIRS.java

@@ -725,9 +725,9 @@ public class CacheLIRS<K, V> extends AbstractMap<K, V> {
          */
         private void evict(Entry<K, V> newCold) {
             // ensure there are not too many hot entries:
-            // left shift of 5 is multiplication by 32, that means if there are less
+            // right shift of 5 is division by 32, that means if there are less
             // than 1/32 (3.125%) cold entries, a new hot entry needs to become cold
-            while ((queueSize << 5) < mapSize) {
+            while (queueSize < (mapSize >>> 5)) {
                 convertOldestHotToCold();
             }
             if (stackSize > 0) {