tolbertam commented on code in PR #3917: URL: https://github.com/apache/cassandra/pull/3917#discussion_r2077756472
########## src/java/org/apache/cassandra/db/SystemKeyspace.java: ########## @@ -1863,16 +1864,37 @@ public static void resetPreparedStatements() } public static int loadPreparedStatements(TriFunction<MD5Digest, String, String, Boolean> onLoaded) + { + return loadPreparedStatements(onLoaded, QueryProcessor.PRELOAD_PREPARED_STATEMENTS_FETCH_SIZE); + } + + public static int loadPreparedStatements(TriFunction<MD5Digest, String, String, Boolean> onLoaded, int pageSize) { String query = String.format("SELECT prepared_id, logged_keyspace, query_string FROM %s.%s", SchemaConstants.SYSTEM_KEYSPACE_NAME, PREPARED_STATEMENTS); - UntypedResultSet resultSet = executeOnceInternal(query); + UntypedResultSet resultSet = executeOnceInternalWithPaging(query, pageSize); int counter = 0; + long initialStatementsEvicted = QueryProcessor.metrics.preparedStatementsEvicted.getCount(); for (UntypedResultSet.Row row : resultSet) { if (onLoaded.accept(MD5Digest.wrap(row.getByteArray("prepared_id")), row.getString("query_string"), row.has("logged_keyspace") ? row.getString("logged_keyspace") : null)) counter++; + + if (counter % pageSize == 0 && QueryProcessor.isPreparedStatementCacheFull()) + { + // In the event that we detect that the prepared statement cache has filled up, return early to prevent Review Comment: That does sound like a more effective way of doing this, thanks! I just pushed 42496b5, hopefully that looks good. I kept the logic there that only tests this on page boundaries because I found in testing that Caffeine's caching behavior allows us to load past the cache size, so in order to prevent erroneously logging on startup its worth having a buffer before we log and stop iterating. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org For additional commands, e-mail: pr-h...@cassandra.apache.org