[KYUUBI #7305] Address review nits

wangzhigang1999 · wangzhigang1999 · commit 7e6d727a997f · 2026-05-12T21:42:52.000+08:00
- ImpalaDialect: simplify Statement/ResultSet lifecycle with
  JdbcUtils.withCloseable
- Rename ExecuteMetaDataOperation -&gt; MetaDataOperation
- Rename runMetaDataCall -&gt; fetchMetaData
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/ImpalaDialect.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/ImpalaDialect.scala
@@ -20,6 +20,7 @@ import java.sql.Connection
 
 import org.apache.kyuubi.engine.jdbc.impala.{ImpalaSchemaHelper, ImpalaTRowSetGenerator}
 import org.apache.kyuubi.engine.jdbc.schema.{JdbcTRowSetGenerator, SchemaHelper}
+import org.apache.kyuubi.util.JdbcUtils.withCloseable
 
 class ImpalaDialect extends JdbcDialect {
 
@@ -30,21 +31,20 @@ class ImpalaDialect extends JdbcDialect {
   // database switch lands as plain Impala SQL the backend understands.
   override def setSchema(conn: Connection, schema: String): Unit = {
     val escaped = schema.replace("`", "``")
-    val stmt = conn.createStatement()
-    try stmt.execute(s"USE `$escaped`")
-    finally stmt.close()
+    withCloseable(conn.createStatement()) { stmt =>
+      stmt.execute(s"USE `$escaped`")
+    }
   }
 
   // Symmetric to `setSchema`: `KyuubiConnection#getSchema` ships a Kyuubi-private session
   // config (`kyuubi.operation.get.current.database`) that Impalad rejects. Read the current
   // database via plain SQL.
   override def getCurrentSchema(conn: Connection): String = {
-    val stmt = conn.createStatement()
-    try {
-      val rs = stmt.executeQuery("SELECT current_database()")
-      try if (rs.next()) rs.getString(1) else null
-      finally rs.close()
-    } finally stmt.close()
+    withCloseable(conn.createStatement()) { stmt =>
+      withCloseable(stmt.executeQuery("SELECT current_database()")) { rs =>
+        if (rs.next()) rs.getString(1) else null
+      }
+    }
   }
 
   override def getTRowSetGenerator(): JdbcTRowSetGenerator = new ImpalaTRowSetGenerator
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetCatalogs.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetCatalogs.scala
@@ -21,7 +21,7 @@ import java.sql.{Connection, ResultSet}
 import org.apache.kyuubi.engine.jdbc.dialect.JdbcDialect
 import org.apache.kyuubi.session.Session
 
-class GetCatalogs(session: Session) extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+class GetCatalogs(session: Session) extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getCatalogs(conn)
 }
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetColumns.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetColumns.scala
@@ -27,7 +27,7 @@ class GetColumns(
     schema: String,
     tableName: String,
     columnName: String)
-  extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+  extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getColumns(conn, catalog, schema, tableName, columnName)
 }
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetCrossReference.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetCrossReference.scala
@@ -29,8 +29,8 @@ class GetCrossReference(
     foreignCatalog: String,
     foreignSchema: String,
     foreignTable: String)
-  extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+  extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getCrossReference(
       conn,
       primaryCatalog,
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetFunctions.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetFunctions.scala
@@ -22,7 +22,7 @@ import org.apache.kyuubi.engine.jdbc.dialect.JdbcDialect
 import org.apache.kyuubi.session.Session
 
 class GetFunctions(session: Session, catalog: String, schema: String, functionName: String)
-  extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+  extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getFunctions(conn, catalog, schema, functionName)
 }
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetPrimaryKeys.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetPrimaryKeys.scala
@@ -22,7 +22,7 @@ import org.apache.kyuubi.engine.jdbc.dialect.JdbcDialect
 import org.apache.kyuubi.session.Session
 
 class GetPrimaryKeys(session: Session, catalog: String, schema: String, tableName: String)
-  extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+  extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getPrimaryKeys(conn, catalog, schema, tableName)
 }
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetSchemas.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetSchemas.scala
@@ -22,7 +22,7 @@ import org.apache.kyuubi.engine.jdbc.dialect.JdbcDialect
 import org.apache.kyuubi.session.Session
 
 class GetSchemas(session: Session, catalog: String, schema: String)
-  extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+  extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getSchemas(conn, catalog, schema)
 }
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetTableTypes.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetTableTypes.scala
@@ -21,7 +21,7 @@ import java.sql.{Connection, ResultSet}
 import org.apache.kyuubi.engine.jdbc.dialect.JdbcDialect
 import org.apache.kyuubi.session.Session
 
-class GetTableTypes(session: Session) extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+class GetTableTypes(session: Session) extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getTableTypes(conn)
 }
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetTables.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetTables.scala
@@ -27,7 +27,7 @@ class GetTables(
     schema: String,
     tableName: String,
     tableTypes: Array[String])
-  extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+  extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getTables(conn, catalog, schema, tableName, tableTypes)
 }
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetTypeInfo.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/GetTypeInfo.scala
@@ -21,7 +21,7 @@ import java.sql.{Connection, ResultSet}
 import org.apache.kyuubi.engine.jdbc.dialect.JdbcDialect
 import org.apache.kyuubi.session.Session
 
-class GetTypeInfo(session: Session) extends ExecuteMetaDataOperation(session) {
-  override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =
+class GetTypeInfo(session: Session) extends MetaDataOperation(session) {
+  override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =
     dialect.getTypeInfo(conn)
 }
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/MetaDataOperation.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/operation/MetaDataOperation.scala
@@ -32,11 +32,11 @@ import org.apache.kyuubi.shaded.hive.service.rpc.thrift.TFetchResultsResp
 
 /**
  * Base class that streams the result of a `DatabaseMetaData.getXxx(...)` call against the
- * session connection. Subclasses fix the particular metadata RPC via [[runMetaDataCall]].
+ * session connection. Subclasses fix the particular metadata RPC via [[fetchMetaData]].
  */
-abstract class ExecuteMetaDataOperation(session: Session) extends JdbcOperation(session) {
+abstract class MetaDataOperation(session: Session) extends JdbcOperation(session) {
 
-  protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet
+  protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet
 
   private val operationLog: OperationLog = OperationLog.createOperationLog(session, getHandle)
   override def getOperationLog: Option[OperationLog] = Option(operationLog)
@@ -47,7 +47,7 @@ abstract class ExecuteMetaDataOperation(session: Session) extends JdbcOperation(
     setState(OperationState.RUNNING)
     try {
       val connection = session.asInstanceOf[JdbcSessionImpl].sessionConnection
-      val resultSet = runMetaDataCall(dialect, connection)
+      val resultSet = fetchMetaData(dialect, connection)
       val iterator = new ResultSetFetchIterator(resultSet)
       try {
         // Normalise spec-divergent column labels (e.g. Impala HS2 TABLE_MD -> TABLE_SCHEM).
diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/schema/SchemaHelper.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/schema/SchemaHelper.scala
@@ -34,7 +34,7 @@ abstract class SchemaHelper {
    * Intentionally NOT applied inside [[toTTTableSchema]] because that method is also used
    * for ordinary `ExecuteStatement` results - calling it there would silently rewrite a
    * user-defined `SELECT col AS TABLE_MD` column. Only [[org.apache.kyuubi.engine.jdbc.
-   * operation.ExecuteMetaDataOperation]] should route Column labels through this method.
+   * operation.MetaDataOperation]] should route Column labels through this method.
    */
   def normalizeMetadataColumnLabel(label: String): String = label
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import java.sql.{Connection, ResultSet}`
`21`	`21`	`import org.apache.kyuubi.engine.jdbc.dialect.JdbcDialect`
`22`	`22`	`import org.apache.kyuubi.session.Session`
`23`	`23`
`24`		`-class GetCatalogs(session: Session) extends ExecuteMetaDataOperation(session) {`
`25`		`- override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =`
	`24`	`+class GetCatalogs(session: Session) extends MetaDataOperation(session) {`
	`25`	`+ override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =`
`26`	`26`	`dialect.getCatalogs(conn)`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import org.apache.kyuubi.engine.jdbc.dialect.JdbcDialect`
`22`	`22`	`import org.apache.kyuubi.session.Session`
`23`	`23`
`24`	`24`	`class GetFunctions(session: Session, catalog: String, schema: String, functionName: String)`
`25`		`- extends ExecuteMetaDataOperation(session) {`
`26`		`- override protected def runMetaDataCall(dialect: JdbcDialect, conn: Connection): ResultSet =`
	`25`	`+ extends MetaDataOperation(session) {`
	`26`	`+ override protected def fetchMetaData(dialect: JdbcDialect, conn: Connection): ResultSet =`
`27`	`27`	`dialect.getFunctions(conn, catalog, schema, functionName)`
`28`	`28`	`}`