From 6ed79fa35cd540d4fc7440d44d31113e4013ebd4 Mon Sep 17 00:00:00 2001
From: arnavb <arnavb@uber.com>
Date: Fri, 26 Sep 2025 10:35:43 +0000
Subject: [PATCH 1/2] update

---
 .../thriftserver/types/DataTypeUtils.scala    | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/thriftserver/server/src/main/scala/org/apache/livy/thriftserver/types/DataTypeUtils.scala b/thriftserver/server/src/main/scala/org/apache/livy/thriftserver/types/DataTypeUtils.scala
index 90799f7a0..f8f0f190d 100644
--- a/thriftserver/server/src/main/scala/org/apache/livy/thriftserver/types/DataTypeUtils.scala
+++ b/thriftserver/server/src/main/scala/org/apache/livy/thriftserver/types/DataTypeUtils.scala
@@ -42,8 +42,8 @@ object DataTypeUtils {
       case "array" => ArrayType(toFieldType(sparkType \ "elementType"))
       case "struct" =>
         val fields = (sparkType \ "fields").children.map { f =>
-          // TODO: get comment from metadata
-          Field((f \ "name").extract[String], toFieldType(f \ "type"), "")
+          val comment = extractComment(f \ "metadata")
+          Field((f \ "name").extract[String], toFieldType(f \ "type"), comment)
         }
         StructType(fields.toArray)
       case "map" =>
@@ -52,6 +52,21 @@ object DataTypeUtils {
     }
   }
 
+  /**
+   * Extracts comment from Spark field metadata JSON.
+   * Spark stores comments in metadata under the "comment" key.
+   */
+  private def extractComment(metadata: JValue): String = {
+    metadata match {
+      case JObject(fields) =>
+        fields.find(_._1 == "comment") match {
+          case Some((_, JString(comment))) => comment
+          case _ => ""
+        }
+      case _ => ""
+    }
+  }
+
 
   /**
    * Converts a JSON representing the Spark schema (the one returned by `df.schema.json`) into
@@ -65,8 +80,8 @@ object DataTypeUtils {
     val fields = schema.children.map { field =>
       val name = (field \ "name").extract[String]
       val hiveType = toFieldType(field \ "type")
-      // TODO: retrieve comment from metadata
-      Field(name, hiveType, "")
+      val comment = extractComment(field \ "metadata")
+      Field(name, hiveType, comment)
     }
     Schema(fields.toArray)
   }

From 4ebe1cc9c70b3640e872574bc0ae18b136f6450b Mon Sep 17 00:00:00 2001
From: arnavb <arnavb@uber.com>
Date: Mon, 6 Oct 2025 08:07:16 +0000
Subject: [PATCH 2/2] update

---
 .../thriftserver/ThriftServerSuites.scala     | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/thriftserver/server/src/test/scala/org/apache/livy/thriftserver/ThriftServerSuites.scala b/thriftserver/server/src/test/scala/org/apache/livy/thriftserver/ThriftServerSuites.scala
index c0f4a36d3..cc28b02e6 100644
--- a/thriftserver/server/src/test/scala/org/apache/livy/thriftserver/ThriftServerSuites.scala
+++ b/thriftserver/server/src/test/scala/org/apache/livy/thriftserver/ThriftServerSuites.scala
@@ -310,6 +310,59 @@ trait CommonThriftTests {
 
   }
 
+  def getColumnsWithCommentsTest(connection: Connection): Unit = {
+    val metadata = connection.getMetaData
+    val statement = connection.createStatement()
+    try {
+      statement.execute(
+        "CREATE TABLE test_column_comments (" +
+        "id integer COMMENT 'User identifier', " +
+        "name string COMMENT 'User full name', " +
+        "age integer COMMENT 'User age in years') USING json")
+
+      val columnsResultSet = metadata.getColumns("", "default", "test_column_comments", "%")
+
+      columnsResultSet.next()
+      assert(columnsResultSet.getString("COLUMN_NAME") == "id")
+      assert(columnsResultSet.getString("REMARKS") == "User identifier",
+        "Column 'id' should have comment 'User identifier'")
+
+      columnsResultSet.next()
+      assert(columnsResultSet.getString("COLUMN_NAME") == "name")
+      assert(columnsResultSet.getString("REMARKS") == "User full name",
+        "Column 'name' should have comment 'User full name'")
+
+      columnsResultSet.next()
+      assert(columnsResultSet.getString("COLUMN_NAME") == "age")
+      assert(columnsResultSet.getString("REMARKS") == "User age in years",
+        "Column 'age' should have comment 'User age in years'")
+
+      assert(!columnsResultSet.next())
+      columnsResultSet.close()
+
+      statement.execute(
+        "CREATE TABLE test_struct_comments (" +
+        "person struct<id:int COMMENT 'Person ID', " +
+        "name:string COMMENT 'Person name'>, " +
+        "address struct<street:string COMMENT 'Street address', " +
+        "city:string COMMENT 'City name'>) " +
+        "USING json")
+
+      val rs = statement.executeQuery("SELECT person, address FROM test_struct_comments")
+      val rsMetaData = rs.getMetaData()
+
+      assert(rsMetaData.getColumnCount == 2)
+      assert(rsMetaData.getColumnName(1) == "person")
+      assert(rsMetaData.getColumnName(2) == "address")
+
+      rs.close()
+    } finally {
+      statement.execute("DROP TABLE IF EXISTS test_column_comments")
+      statement.execute("DROP TABLE IF EXISTS test_struct_comments")
+      statement.close()
+    }
+  }
+
   def operationLogRetrievalTest(statement: Statement): Unit = {
     statement.execute("select 1")
     val logIterator = statement.asInstanceOf[HiveStatement].getQueryLog().iterator()
@@ -562,6 +615,12 @@ class BinaryThriftServerSuite extends ThriftServerBaseTest with CommonThriftTest
     }
   }
 
+  test("fetch columns with comments") {
+    withJdbcConnection { connection =>
+      getColumnsWithCommentsTest(connection)
+    }
+  }
+
   test("operation log retrieval test") {
     withJdbcStatement { statement =>
       operationLogRetrievalTest(statement)
@@ -639,6 +698,12 @@ class HttpThriftServerSuite extends ThriftServerBaseTest with CommonThriftTests
     }
   }
 
+  test("fetch columns with comments") {
+    withJdbcConnection { connection =>
+      getColumnsWithCommentsTest(connection)
+    }
+  }
+
   test("operation log retrieval test") {
     withJdbcStatement { statement =>
       operationLogRetrievalTest(statement)