[SPARK-46325] Remove unnecessary override functions when constructing `WrappedCloseableIterator` in `ResponseValidator#wrapIterator`

• Type: Improvement
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 4.0.0
• Fix Version/s: 4.0.0
• Component/s: Connect
• Labels: pull-request-available
• Assignee: Yang Jie
• Reporter: Yang Jie
• Created: 08/Dec/23 07:14
• Updated: 08/Dec/23 22:00
• Resolved: 08/Dec/23 22:00

Description

Should reuse functions defined in WrappedCloseableIterator instead of overriding them

 
ResponseValidator#wrapIterator
 

def wrapIterator[T <: GeneratedMessageV3, V <: CloseableIterator[T]](
    inner: V): WrappedCloseableIterator[T] = {
  new WrappedCloseableIterator[T] {

    override def innerIterator: Iterator[T] = inner

    override def hasNext: Boolean = {
      innerIterator.hasNext
    }

    override def next(): T = {
      verifyResponse {
        innerIterator.next()
      }
    }

    override def close(): Unit = {
      innerIterator match {
        case it: CloseableIterator[T] => it.close()
        case _ => // nothing
      }
    }
  }
} 

WrappedCloseableIterator
 

private[sql] abstract class WrappedCloseableIterator[E] extends CloseableIterator[E] {

  def innerIterator: Iterator[E]

  override def next(): E = innerIterator.next()

  override def hasNext: Boolean = innerIterator.hasNext

  override def close(): Unit = innerIterator match {
    case it: CloseableIterator[E] => it.close()
    case _ => // nothing
  }
} 

Issue Links

• links to: GitHub Pull Request #44255