Skip to content

Fix QueryScheduler constructor using class name. #16280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KKcorps merged 2 commits into from
Jul 4, 2025
Merged

Fix QueryScheduler constructor using class name. #16280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
006e34a
Fix QueryScheduler constructor using class name.
vrajat Jul 4, 2025
bba33ae
Fix test
vrajat Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pinot-core/src/main/java/org/apache/pinot/core/query/scheduler/QuerySchedulerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ public static QueryScheduler create(PinotConfiguration schedulerConfig, QueryExe
break;
default:
scheduler =
getQuerySchedulerByClassName(schedulerName, schedulerConfig, queryExecutor, serverMetrics, latestQueryTime);
getQuerySchedulerByClassName(schedulerName, schedulerConfig, queryExecutor, serverMetrics, latestQueryTime,
resourceUsageAccountant);
break;
}

Expand All @@ -105,13 +106,15 @@ public static QueryScheduler create(PinotConfiguration schedulerConfig, QueryExe

@Nullable
private static QueryScheduler getQuerySchedulerByClassName(String className, PinotConfiguration schedulerConfig,
QueryExecutor queryExecutor, ServerMetrics serverMetrics, LongAccumulator latestQueryTime) {
QueryExecutor queryExecutor, ServerMetrics serverMetrics, LongAccumulator latestQueryTime,
ThreadResourceUsageAccountant resourceUsageAccountant) {
try {
Constructor<?> constructor = PluginManager.get().loadClass(className)
.getDeclaredConstructor(PinotConfiguration.class, QueryExecutor.class, ServerMetrics.class,
LongAccumulator.class);
LongAccumulator.class, ThreadResourceUsageAccountant.class);
constructor.setAccessible(true);
return (QueryScheduler) constructor.newInstance(schedulerConfig, queryExecutor, serverMetrics, latestQueryTime);
return (QueryScheduler) constructor.newInstance(schedulerConfig, queryExecutor, serverMetrics, latestQueryTime,
resourceUsageAccountant);
} catch (Exception e) {
LOGGER.error("Failed to instantiate scheduler class by name: {}", className, e);
return null;
Expand Down
4 changes: 2 additions & 2 deletions ...t-core/src/test/java/org/apache/pinot/core/query/scheduler/QuerySchedulerFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ public void testQuerySchedulerFactory() {
public static final class TestQueryScheduler extends QueryScheduler {

public TestQueryScheduler(PinotConfiguration config, QueryExecutor queryExecutor, ServerMetrics serverMetrics,
LongAccumulator latestQueryTime) {
LongAccumulator latestQueryTime, ThreadResourceUsageAccountant resourceUsageAccountant) {
super(config, queryExecutor,
new UnboundedResourceManager(config, new Tracing.DefaultThreadResourceUsageAccountant()), serverMetrics,
new UnboundedResourceManager(config, resourceUsageAccountant), serverMetrics,
latestQueryTime);
}

Expand Down
Loading