Skip to content

Commit cca773a

Browse files
author
wangjunbo
committed
fix code
1 parent 9fcc2c6 commit cca773a

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@ private[kyuubi] class EngineRef(
339339

340340
def getServiceNodes(
341341
discoveryClient: DiscoveryClient,
342-
hostPort: (String, Int)): Seq[ServiceNodeInfo] = {
342+
hostPort: (String, Int)): Option[ServiceNodeInfo] = {
343343
tryWithLock(discoveryClient) {
344344
val serviceNodes = discoveryClient.getServiceNodesInfo(engineSpace)
345-
serviceNodes.filter { sn => (sn.host, sn.port) == hostPort }
345+
serviceNodes.filter { sn => (sn.host, sn.port) == hostPort }.headOption
346346
}
347347
}
348348

kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class KyuubiSessionImpl(
120120
engineLastAlive = System.currentTimeMillis()
121121
}
122122

123-
def listZkEngineNodes: Seq[ServiceNodeInfo] = {
123+
def getEngineNode: Option[ServiceNodeInfo] = {
124124
withDiscoveryClient(sessionConf) { discoveryClient =>
125125
engine.getServiceNodes(discoveryClient, _client.engineHostPort)
126126
}

kyuubi-server/src/main/scala/org/apache/kyuubi/sql/plan/command/DescribeEngine.scala

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,22 @@ import org.apache.kyuubi.sql.schema.{Column, Row, Schema}
3535
case class DescribeEngine() extends RunnableCommand {
3636

3737
override def run(kyuubiSession: KyuubiSession): Unit = {
38-
val rows = Seq(kyuubiSession.asInstanceOf[KyuubiSessionImpl]).flatMap { session =>
38+
val rows = Seq(kyuubiSession.asInstanceOf[KyuubiSessionImpl]).map { session =>
3939
lazy val client = session.client
40-
session.listZkEngineNodes.map { nodeInfo =>
41-
val values = new ListBuffer[String]()
42-
values += client.engineId.getOrElse("")
43-
values += client.engineName.getOrElse("")
44-
values += client.engineUrl.getOrElse("")
45-
values += s"${nodeInfo.host}:${nodeInfo.port}"
46-
values += nodeInfo.version.getOrElse("")
47-
values += nodeInfo.attributes.filter(_._1.contains("memory")).mkString(";")
48-
Row(values.toList)
40+
val values = new ListBuffer[String]()
41+
values += client.engineId.getOrElse("")
42+
values += client.engineName.getOrElse("")
43+
values += client.engineUrl.getOrElse("")
44+
session.getEngineNode match {
45+
case Some(nodeInfo) =>
46+
values += s"${nodeInfo.host}:${nodeInfo.port}"
47+
values += nodeInfo.version.getOrElse("")
48+
values += nodeInfo.attributes.mkString(",")
49+
case None =>
50+
values += ("", "", "")
4951
}
52+
53+
Row(values.toList)
5054
}
5155
iter = new IterableFetchIterator(rows)
5256
}

0 commit comments

Comments
 (0)