You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/07/13 08:53:58 UTC
[GitHub] [spark] panbingkun commented on a diff in pull request #37172: [SPARK-39759][SQL] Implement listIndexes in JDBC (H2 dialect)
panbingkun commented on code in PR #37172:
URL: https://github.com/apache/spark/pull/37172#discussion_r919823550
##########
sql/core/src/main/scala/org/apache/spark/sql/jdbc/H2Dialect.scala:
##########
@@ -110,6 +112,64 @@ private[sql] object H2Dialect extends JdbcDialect {
JdbcUtils.checkIfIndexExists(conn, sql, options)
}
+ // See
+ // https://www.h2database.com/html/systemtables.html?#information_schema_indexes
+ // https://www.h2database.com/html/systemtables.html?#information_schema_index_columns
+ override def listIndexes(
+ conn: Connection,
+ tableIdent: Identifier,
+ options: JDBCOptions): Array[TableIndex] = {
+ val sql = {
+ s"""
+ | SELECT
+ | i.INDEX_CATALOG AS INDEX_CATALOG,
+ | i.INDEX_SCHEMA AS INDEX_SCHEMA,
+ | i.INDEX_NAME AS INDEX_NAME,
+ | i.INDEX_TYPE_NAME AS INDEX_TYPE_NAME,
+ | i.REMARKS as REMARKS,
+ | ic.COLUMN_NAME AS COLUMN_NAME
+ | FROM INFORMATION_SCHEMA.INDEXES i, INFORMATION_SCHEMA.INDEX_COLUMNS ic
+ | WHERE i.TABLE_CATALOG = ic.TABLE_CATALOG
+ | AND i.TABLE_SCHEMA = ic.TABLE_SCHEMA
+ | AND i.TABLE_NAME = ic.TABLE_NAME
+ | AND i.INDEX_CATALOG = ic.INDEX_CATALOG
+ | AND i.INDEX_SCHEMA = ic.INDEX_SCHEMA
+ | AND i.INDEX_NAME = ic.INDEX_NAME
+ | AND i.TABLE_NAME = '${tableIdent.name()}'
+ | AND i.INDEX_SCHEMA = '${tableIdent.namespace().last}'
+ |""".stripMargin
+ }
+ var indexMap: Map[String, TableIndex] = Map()
+ try {
+ JdbcUtils.executeQuery(conn, options, sql) { rs =>
+ while (rs.next()) {
+ val indexName = rs.getString("INDEX_NAME")
+ val colName = rs.getString("COLUMN_NAME")
+ val indexType = rs.getString("INDEX_TYPE_NAME")
+ val indexComment = rs.getString("REMARKS")
+ if (indexMap.contains(indexName)) {
+ val index = indexMap(indexName)
+ val newIndex = new TableIndex(indexName, indexType,
+ index.columns() :+ FieldReference(colName),
+ index.columnProperties, index.properties)
+ indexMap += (indexName -> newIndex)
+ } else {
+ val properties = new util.Properties()
+ if (StringUtils.isNotEmpty(indexComment)) properties.put("COMMENT", indexComment)
Review Comment:
In fact, I found possible null pointer in the implementation of listIndexes(H2), indexComment default value is null.
However, the default value of MySQLDIalect is empty String.
@huaxingao
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org