ijuma commented on a change in pull request #10184:
URL: https://github.com/apache/kafka/pull/10184#discussion_r581122071
##########
File path: core/src/main/scala/kafka/server/ControllerApis.scala
##########
@@ -195,6 +198,61 @@ class ControllerApis(val requestChannel: RequestChannel,
requestThrottleMs => createResponseCallback(requestThrottleMs))
}
+ def handleDeleteTopics(request: RequestChannel.Request): Unit = {
+ if (!config.deleteTopicEnable) {
+ if (request.context.apiVersion() < 3) {
+ throw new InvalidRequestException("Topic deletion is disabled.")
+ } else {
+ throw new TopicDeletionDisabledException()
+ }
+ }
+ val deleteTopicsRequest = request.body[DeleteTopicsRequest]
+ val nameToId = new mutable.HashMap[String, Uuid]
+ deleteTopicsRequest.data().topicNames().iterator().asScala.foreach {
Review comment:
You can do `forEach` on the Java collection directly, right? A few other
cases like that below.
##########
File path: core/src/main/scala/kafka/server/ControllerApis.scala
##########
@@ -195,6 +198,61 @@ class ControllerApis(val requestChannel: RequestChannel,
requestThrottleMs => createResponseCallback(requestThrottleMs))
}
+ def handleDeleteTopics(request: RequestChannel.Request): Unit = {
+ if (!config.deleteTopicEnable) {
+ if (request.context.apiVersion() < 3) {
+ throw new InvalidRequestException("Topic deletion is disabled.")
+ } else {
+ throw new TopicDeletionDisabledException()
+ }
+ }
+ val deleteTopicsRequest = request.body[DeleteTopicsRequest]
+ val nameToId = new mutable.HashMap[String, Uuid]
+ deleteTopicsRequest.data().topicNames().iterator().asScala.foreach {
+ name => nameToId.put(name, Uuid.ZERO_UUID)
+ }
+ deleteTopicsRequest.data().topics().iterator().asScala.foreach {
+ nameAndId => nameToId.put(nameAndId.name(), nameAndId.topicId())
+ }
+ val (describable, deletable) = {
+ if (authHelper.authorize(request.context, DELETE, CLUSTER,
CLUSTER_NAME)) {
+ (nameToId.keySet, nameToId.keySet)
+ } else {
+ val authorizedDescribeTopics: Set[String] =
authHelper.filterByAuthorized(
+ request.context, DESCRIBE, TOPIC, nameToId.keys)(n => n)
+ val authorizedDeleteTopics: Set[String] =
authHelper.filterByAuthorized(
+ request.context, DELETE, TOPIC, nameToId.keys)(n => n)
+ (authorizedDescribeTopics, authorizedDeleteTopics)
+ }
+ }
+ def sendResponse(response: DeleteTopicsResponseData): Unit = {
+ nameToId.keysIterator.foreach {
Review comment:
It's a bit odd to use iterators when calling `foreach` after. `iterator`
is typically useful when you want to do `map` or other such operations lazily.
`foreach` forces the iteration anyway.
##########
File path: core/src/main/scala/kafka/server/ControllerApis.scala
##########
@@ -195,6 +198,61 @@ class ControllerApis(val requestChannel: RequestChannel,
requestThrottleMs => createResponseCallback(requestThrottleMs))
}
+ def handleDeleteTopics(request: RequestChannel.Request): Unit = {
+ if (!config.deleteTopicEnable) {
+ if (request.context.apiVersion() < 3) {
+ throw new InvalidRequestException("Topic deletion is disabled.")
+ } else {
+ throw new TopicDeletionDisabledException()
+ }
+ }
+ val deleteTopicsRequest = request.body[DeleteTopicsRequest]
+ val nameToId = new mutable.HashMap[String, Uuid]
Review comment:
Nit: usually you would do `mutable.Map[String, Uuid]()` instead of using
`HashMap` directly.
##########
File path: core/src/main/scala/kafka/server/ControllerApis.scala
##########
@@ -195,6 +198,61 @@ class ControllerApis(val requestChannel: RequestChannel,
requestThrottleMs => createResponseCallback(requestThrottleMs))
}
+ def handleDeleteTopics(request: RequestChannel.Request): Unit = {
+ if (!config.deleteTopicEnable) {
+ if (request.context.apiVersion() < 3) {
+ throw new InvalidRequestException("Topic deletion is disabled.")
+ } else {
+ throw new TopicDeletionDisabledException()
+ }
+ }
+ val deleteTopicsRequest = request.body[DeleteTopicsRequest]
+ val nameToId = new mutable.HashMap[String, Uuid]
+ deleteTopicsRequest.data().topicNames().iterator().asScala.foreach {
+ name => nameToId.put(name, Uuid.ZERO_UUID)
+ }
+ deleteTopicsRequest.data().topics().iterator().asScala.foreach {
+ nameAndId => nameToId.put(nameAndId.name(), nameAndId.topicId())
+ }
+ val (describable, deletable) = {
+ if (authHelper.authorize(request.context, DELETE, CLUSTER,
CLUSTER_NAME)) {
+ (nameToId.keySet, nameToId.keySet)
+ } else {
+ val authorizedDescribeTopics: Set[String] =
authHelper.filterByAuthorized(
+ request.context, DESCRIBE, TOPIC, nameToId.keys)(n => n)
+ val authorizedDeleteTopics: Set[String] =
authHelper.filterByAuthorized(
+ request.context, DELETE, TOPIC, nameToId.keys)(n => n)
+ (authorizedDescribeTopics, authorizedDeleteTopics)
+ }
+ }
+ def sendResponse(response: DeleteTopicsResponseData): Unit = {
+ nameToId.keysIterator.foreach {
+ name => if (!deletable.contains(name)) {
+ val result = if (describable.contains(name)) {
+ new
DeletableTopicResult().setName(name).setErrorCode(TOPIC_AUTHORIZATION_FAILED.code)
+ } else {
+ new
DeletableTopicResult().setName(name).setErrorCode(UNKNOWN_TOPIC_OR_PARTITION.code)
+ }
+ response.responses().add(result)
+ }
+ }
+ requestHelper.sendResponseMaybeThrottle(request, throttleTimeMs => {
+ response.setThrottleTimeMs(throttleTimeMs)
+ new DeleteTopicsResponse(response)
+ })
+ }
+ val future = controller.deleteTopics(
+ nameToId.view.filterKeys(deletable.contains(_)).toMap.asJava)
Review comment:
I would use `filter` and remove `view` and `toMap`.
----------------------------------------------------------------
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
