Skip to content

Bugfix. Avoid passing null table name input to translation util #12726

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
saurabhd336 merged 1 commit into from
Mar 26, 2024
Merged

Bugfix. Avoid passing null table name input to translation util #12726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions ...ler/src/main/java/org/apache/pinot/controller/api/resources/PinotTaskRestletResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ public List<JobKey> getCronSchedulerJobKeys()
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation("Fetch cron scheduler job keys")
public Map<String, Object> getCronSchedulerJobDetails(
@ApiParam(value = "Table name (with type suffix)") @QueryParam("tableName") String tableName,
@ApiParam(value = "Table name (with type suffix)", required = true) @QueryParam("tableName") String tableName,
@ApiParam(value = "Task type") @QueryParam("taskType") String taskType, @Context HttpHeaders headers)
throws SchedulerException {
Scheduler scheduler = _pinotTaskManager.getScheduler();
Expand Down Expand Up @@ -618,15 +618,17 @@ public Map<String, Object> getCronSchedulerJobDetails(
public Map<String, String> scheduleTasks(@ApiParam(value = "Task type") @QueryParam("taskType") String taskType,
@ApiParam(value = "Table name (with type suffix)") @QueryParam("tableName") String tableName,
@Context HttpHeaders headers) {
tableName = DatabaseUtils.translateTableName(tableName, headers);
if (taskType != null) {
// Schedule task for the given task type
String taskName = tableName != null ? _pinotTaskManager.scheduleTask(taskType, tableName)
String taskName = tableName != null
? _pinotTaskManager.scheduleTask(taskType, DatabaseUtils.translateTableName(tableName, headers))
: _pinotTaskManager.scheduleTask(taskType);
return Collections.singletonMap(taskType, taskName);
} else {
// Schedule tasks for all task types
return tableName != null ? _pinotTaskManager.scheduleTasks(tableName) : _pinotTaskManager.scheduleTasks();
return tableName != null
? _pinotTaskManager.scheduleTasks(DatabaseUtils.translateTableName(tableName, headers))
: _pinotTaskManager.scheduleTasks();
}
}

Expand Down