|  | 
| 48 | 48 | import java.util.concurrent.atomic.AtomicLong; | 
| 49 | 49 | 
 | 
| 50 | 50 | import static org.elasticsearch.cluster.node.DiscoveryNode.STATELESS_ENABLED_SETTING_NAME; | 
| 51 |  | -import static org.elasticsearch.index.IndexSettings.INDEX_FAST_REFRESH_SETTING; | 
| 52 | 51 | import static org.elasticsearch.index.cache.bitset.BitsetFilterCache.INDEX_LOAD_RANDOM_ACCESS_FILTERS_EAGERLY_SETTING; | 
| 53 | 52 | import static org.hamcrest.Matchers.equalTo; | 
| 54 | 53 | import static org.hamcrest.Matchers.greaterThan; | 
| @@ -271,38 +270,23 @@ public void onRemoval(ShardId shardId, Accountable accountable) { | 
| 271 | 270 |     public void testShouldLoadRandomAccessFiltersEagerly() { | 
| 272 | 271 |         var values = List.of(true, false); | 
| 273 | 272 |         for (var hasIndexRole : values) { | 
| 274 |  | -            for (var indexFastRefresh : values) { | 
| 275 |  | -                for (var loadFiltersEagerly : values) { | 
| 276 |  | -                    for (var isStateless : values) { | 
| 277 |  | -                        if (isStateless) { | 
| 278 |  | -                            assertEquals( | 
| 279 |  | -                                loadFiltersEagerly && indexFastRefresh && hasIndexRole == false, | 
| 280 |  | -                                BitsetFilterCache.shouldLoadRandomAccessFiltersEagerly( | 
| 281 |  | -                                    bitsetFilterCacheSettings(isStateless, hasIndexRole, loadFiltersEagerly, indexFastRefresh) | 
| 282 |  | -                                ) | 
| 283 |  | -                            ); | 
| 284 |  | -                        } else { | 
| 285 |  | -                            assertEquals( | 
| 286 |  | -                                loadFiltersEagerly, | 
| 287 |  | -                                BitsetFilterCache.shouldLoadRandomAccessFiltersEagerly( | 
| 288 |  | -                                    bitsetFilterCacheSettings(isStateless, hasIndexRole, loadFiltersEagerly, indexFastRefresh) | 
| 289 |  | -                                ) | 
| 290 |  | -                            ); | 
| 291 |  | -                        } | 
|  | 273 | +            for (var loadFiltersEagerly : values) { | 
|  | 274 | +                for (var isStateless : values) { | 
|  | 275 | +                    boolean result = BitsetFilterCache.shouldLoadRandomAccessFiltersEagerly( | 
|  | 276 | +                        bitsetFilterCacheSettings(isStateless, hasIndexRole, loadFiltersEagerly) | 
|  | 277 | +                    ); | 
|  | 278 | +                    if (isStateless) { | 
|  | 279 | +                        assertEquals(loadFiltersEagerly && hasIndexRole == false, result); | 
|  | 280 | +                    } else { | 
|  | 281 | +                        assertEquals(loadFiltersEagerly, result); | 
| 292 | 282 |                     } | 
| 293 | 283 |                 } | 
| 294 | 284 |             } | 
| 295 | 285 |         } | 
| 296 | 286 |     } | 
| 297 | 287 | 
 | 
| 298 |  | -    private IndexSettings bitsetFilterCacheSettings( | 
| 299 |  | -        boolean isStateless, | 
| 300 |  | -        boolean hasIndexRole, | 
| 301 |  | -        boolean loadFiltersEagerly, | 
| 302 |  | -        boolean indexFastRefresh | 
| 303 |  | -    ) { | 
|  | 288 | +    private IndexSettings bitsetFilterCacheSettings(boolean isStateless, boolean hasIndexRole, boolean loadFiltersEagerly) { | 
| 304 | 289 |         var indexSettingsBuilder = Settings.builder().put(INDEX_LOAD_RANDOM_ACCESS_FILTERS_EAGERLY_SETTING.getKey(), loadFiltersEagerly); | 
| 305 |  | -        if (isStateless) indexSettingsBuilder.put(INDEX_FAST_REFRESH_SETTING.getKey(), indexFastRefresh); | 
| 306 | 290 | 
 | 
| 307 | 291 |         var nodeSettingsBuilder = Settings.builder() | 
| 308 | 292 |             .putList( | 
|  | 
0 commit comments