From 37a60594f1a71e06d74e394994c04e52f467f1d8 Mon Sep 17 00:00:00 2001 From: Dmitry Konstantinov Date: Wed, 22 Apr 2026 11:30:42 +0100 Subject: [PATCH] Adjust QueriesTableTest to pass if SEP Threads renaming is disabled patch by Dmitry Konstantinov; reviewed by Stefan Miklosovic, Caleb Rackliffe for CASSANDRA-21318 --- .../distributed/test/QueriesTableTest.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/test/distributed/org/apache/cassandra/distributed/test/QueriesTableTest.java b/test/distributed/org/apache/cassandra/distributed/test/QueriesTableTest.java index 2ca8fe564f..934987076a 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/QueriesTableTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/QueriesTableTest.java @@ -120,10 +120,14 @@ public class QueriesTableTest extends TestBaseImpl String threadId = row.get("thread_id").toString(); String task = row.get("task").toString(); - readVisible |= threadId.contains("Read") && task.contains("SELECT"); - coordinatorReadVisible |= threadId.contains("Native-Transport-Requests") && task.contains("SELECT"); - writeVisible |= threadId.contains("Mutation") && task.contains("Mutation"); - coordinatorWriteVisible |= threadId.contains("Native-Transport-Requests") && task.contains("INSERT"); + boolean localReaderThread = threadId.contains("Read") || threadId.contains("SharedPool-Worker"); + readVisible |= localReaderThread && task.contains("SELECT"); + boolean coordReaderThread = threadId.contains("Native-Transport-Requests") || threadId.contains("SharedPool-Worker"); + coordinatorReadVisible |= coordReaderThread && task.contains("SELECT"); + boolean localWriterThread = threadId.contains("Mutation") || threadId.contains("SharedPool-Worker"); + writeVisible |= localWriterThread && task.contains("Mutation"); + boolean coordWriterThread = threadId.contains("Native-Transport-Requests") || threadId.contains("SharedPool-Worker"); + coordinatorWriteVisible |= coordWriterThread && task.contains("INSERT"); } assertTrue(readVisible); @@ -164,8 +168,10 @@ public class QueriesTableTest extends TestBaseImpl String threadId = row.get("thread_id").toString(); String task = row.get("task").toString(); - readVisible |= threadId.contains("Read") && task.contains("SELECT"); - coordinatorUpdateVisible |= threadId.contains("Native-Transport-Requests") && task.contains("UPDATE"); + boolean localReaderThread = threadId.contains("Read") || threadId.contains("SharedPool-Worker"); + readVisible |= localReaderThread && task.contains("SELECT"); + boolean coordUpdateThread = threadId.contains("Native-Transport-Requests") || threadId.contains("SharedPool-Worker"); + coordinatorUpdateVisible |= coordUpdateThread && task.contains("UPDATE"); } assertTrue(readVisible); @@ -215,8 +221,10 @@ public class QueriesTableTest extends TestBaseImpl String threadId = row.get("thread_id").toString(); String task = row.get("task").toString(); - readVisible |= (threadId.contains("AccordExecutor") || threadId.contains("Read")) && task.contains("SELECT"); - coordinatorTxnVisible |= threadId.contains("Native-Transport-Requests") && task.contains("BEGIN TRANSACTION"); + boolean localTxThread = threadId.contains("AccordExecutor") || threadId.contains("Read") || threadId.contains("SharedPool-Worker"); + readVisible |= localTxThread && task.contains("SELECT"); + boolean coordTxThread = threadId.contains("Native-Transport-Requests") || threadId.contains("SharedPool-Worker"); + coordinatorTxnVisible |= coordTxThread && task.contains("BEGIN TRANSACTION"); } assertTrue(readVisible);