chenboat commented on a change in pull request #4608: Unit tests and bug fixes
for DeleteTable rest API for controller.
URL: https://github.com/apache/incubator-pinot/pull/4608#discussion_r325495546
##########
File path:
pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
##########
@@ -254,20 +254,41 @@ public SuccessResponse deleteTable(
List<String> tablesDeleted = new LinkedList<>();
try {
- if (tableType != TableType.REALTIME &&
!TableNameBuilder.REALTIME.tableHasTypeSuffix(tableName)) {
+ if (toDeleteOfflineTable(tableName, tableType) &&
_pinotHelixResourceManager
+ .hasOfflineTable(tableName)) {
_pinotHelixResourceManager.deleteOfflineTable(tableName);
tablesDeleted.add(TableNameBuilder.OFFLINE.tableNameWithType(tableName));
}
- if (tableType != TableType.OFFLINE &&
!TableNameBuilder.OFFLINE.tableHasTypeSuffix(tableName)) {
+ if (toDeleteRealtimeTable(tableName, tableType) &&
_pinotHelixResourceManager
+ .hasRealtimeTable(tableName)) {
_pinotHelixResourceManager.deleteRealtimeTable(tableName);
tablesDeleted.add(TableNameBuilder.REALTIME.tableNameWithType(tableName));
}
+ if (tablesDeleted.size() == 0) {
+ throw new ControllerApplicationException(LOGGER, "Table '" + tableName
+ "' does not exist",
+ Response.Status.NOT_FOUND);
+ }
return new SuccessResponse("Tables: " + tablesDeleted + " deleted");
} catch (Exception e) {
- throw new ControllerApplicationException(LOGGER, e.getMessage(),
Response.Status.INTERNAL_SERVER_ERROR, e);
+ throw new ControllerApplicationException(LOGGER, e.getMessage(),
+ Response.Status.INTERNAL_SERVER_ERROR, e);
}
}
+ // Return true if tableType is NOT offline (i.e., null or realtime) and
table name does not end
+ // with _offline suffix.
+ private boolean toDeleteRealtimeTable(String tableName, TableType tableType)
{
Review comment:
Done. Combine two functions into one: I also use positive condition testing
to make it easier to understand.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
