You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by "PavithranRick (via GitHub)" <gi...@apache.org> on 2025/11/20 00:02:44 UTC
[PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
PavithranRick opened a new pull request, #14303:
URL: https://github.com/apache/hudi/pull/14303
### Describe the issue this Pull Request addresses
This PR introduces the `ShowMetadataTableHistoryProcedure`, a new Spark SQL procedure that displays timeline information for both the data table and metadata table side-by-side, enabling analysis of metadata table synchronization and evolution.
### Summary and Changelog
- Unified Timeline View: Shows data table and metadata table timelines in a single result
- Side-by-Side Format: Metadata table columns first, then data table columns
- Time Formatting: Proper `MM-dd HH:mm:ss` formatting for requested/inflight/completed times
- Archive Support: Includes archived timeline via `showArchived` parameter
- Filtering: SQL-based filtering and time range support (`startTime` / `endTime`)
- Error Handling: Graceful handling when metadata table doesn't exist
### Impact
- New public API:
`show_metadata_table_history(table, path, limit, showArchived, filter, startTime, endTime)`
- 11-column output schema showing metadata table and data table timeline information
### Risk Level
Low
Verification performed:
- Comprehensive test coverage: 3 focused test cases
- Schema validation: all output fields properly typed and validated
- Error handling: graceful handling of invalid filters, missing tables, and timeline access failures
- Timeline consistency: proper handling of both active and archived timelines with correct state mapping
### Documentation Update
Update Hudi Spark SQL procedures documentation to include `show_metadata_table_history` usage examples and parameter descriptions.
### Contributor's checklist
- [ ] Read through contributor's guide
- [ ] Enough context is provided in the sections above
- [ ] Adequate tests were added if applicable
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #14303:
URL: https://github.com/apache/hudi/pull/14303#issuecomment-3558979158
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"status" : "PENDING",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601",
"triggerID" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* e2f8428262d6ffaa7938bf1065d9e165cc00f9b5 Azure: [PENDING](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601)
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</details>
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #14303:
URL: https://github.com/apache/hudi/pull/14303#issuecomment-3559713906
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"status" : "FAILURE",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601",
"triggerID" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* e2f8428262d6ffaa7938bf1065d9e165cc00f9b5 Azure: [FAILURE](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601)
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</details>
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #14303:
URL: https://github.com/apache/hudi/pull/14303#issuecomment-3599134145
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"status" : "FAILURE",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601",
"triggerID" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"triggerType" : "PUSH"
}, {
"hash" : "f2b08043f3fab58210980743f53c4aee94ddef14",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "f2b08043f3fab58210980743f53c4aee94ddef14",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* e2f8428262d6ffaa7938bf1065d9e165cc00f9b5 Azure: [FAILURE](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601)
* f2b08043f3fab58210980743f53c4aee94ddef14 UNKNOWN
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</details>
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #14303:
URL: https://github.com/apache/hudi/pull/14303#issuecomment-3555136059
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* e2f8428262d6ffaa7938bf1065d9e165cc00f9b5 UNKNOWN
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</details>
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #14303:
URL: https://github.com/apache/hudi/pull/14303#issuecomment-3599443219
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"status" : "DELETED",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601",
"triggerID" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"triggerType" : "PUSH"
}, {
"hash" : "f2b08043f3fab58210980743f53c4aee94ddef14",
"status" : "SUCCESS",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9804",
"triggerID" : "f2b08043f3fab58210980743f53c4aee94ddef14",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* f2b08043f3fab58210980743f53c4aee94ddef14 Azure: [SUCCESS](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9804)
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</details>
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
Posted by "CTTY (via GitHub)" <gi...@apache.org>.
CTTY commented on code in PR #14303:
URL: https://github.com/apache/hudi/pull/14303#discussion_r2617477207
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
+ ProcedureParameter.optional(2, "limit", DataTypes.IntegerType, 20),
+ ProcedureParameter.optional(3, "showArchived", DataTypes.BooleanType, false),
+ ProcedureParameter.optional(4, "filter", DataTypes.StringType, ""),
+ ProcedureParameter.optional(5, "startTime", DataTypes.StringType, ""),
+ ProcedureParameter.optional(6, "endTime", DataTypes.StringType, "")
+ )
+
+ private val OUTPUT_TYPE = new StructType(Array[StructField](
+ StructField("instant_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty)
+ ))
+
+ def parameters: Array[ProcedureParameter] = PARAMETERS
+
+ def outputType: StructType = OUTPUT_TYPE
+
+ override def call(args: ProcedureArgs): Seq[Row] = {
+ super.checkArgs(PARAMETERS, args)
+
+ val tableName = getArgValueOrDefault(args, PARAMETERS(0))
+ val path = getArgValueOrDefault(args, PARAMETERS(1))
+ val limit = getArgValueOrDefault(args, PARAMETERS(2)).get.asInstanceOf[Int]
+ val showArchived = getArgValueOrDefault(args, PARAMETERS(3)).get.asInstanceOf[Boolean]
+ val filter = getArgValueOrDefault(args, PARAMETERS(4)).get.asInstanceOf[String]
+ val startTime = getArgValueOrDefault(args, PARAMETERS(5)).get.asInstanceOf[String]
+ val endTime = getArgValueOrDefault(args, PARAMETERS(6)).get.asInstanceOf[String]
+
+ validateFilter(filter, outputType)
+
+ val dataTableBasePath = getBasePath(tableName, path)
+ val metaClient = createMetaClient(jsc, dataTableBasePath)
+
+ val metadataTableBasePath = HoodieTableMetadata.getMetadataTableBasePath(dataTableBasePath)
+ val metadataMetaClient = try {
+ Some(HoodieTableMetaClient.builder()
+ .setConf(HadoopFSUtils.getStorageConfWithCopy(jsc.hadoopConfiguration()))
+ .setBasePath(metadataTableBasePath)
+ .setLoadActiveTimelineOnLoad(false)
+ .build())
+ } catch {
+ case _: Exception =>
+ None
+ }
+ metadataMetaClient match {
+ case Some(mdMetaClient) => getTimelineEntries(metaClient, mdMetaClient, limit, showArchived, filter, startTime, endTime)
+ case None => Seq.empty[Row]
+ }
+ }
+
+ override def build: Procedure = new ShowMetadataTableHistoryProcedure()
+
+ private def getTimelineEntries(
+ dataMetaClient: HoodieTableMetaClient,
+ metadataMetaClient: HoodieTableMetaClient,
+ limit: Int,
+ showArchived: Boolean,
+ filter: String,
+ startTime: String,
+ endTime: String): Seq[Row] = {
+
+ val dataInstantInfoMap = buildInstantInfoFromTimeline(dataMetaClient)
+ val metadataInstantInfoMap = buildInstantInfoFromTimeline(metadataMetaClient)
+
+ val allInstantTimes = collection.mutable.Set[String]()
+
+ val dataActiveTimeline = dataMetaClient.getActiveTimeline
+ val dataArchivedTimeline = if (showArchived) Some(dataMetaClient.getArchivedTimeline) else None
+
+ val metadataActiveTimeline = metadataMetaClient.getActiveTimeline
+ val metadataArchivedTimeline = if (showArchived) Some(metadataMetaClient.getArchivedTimeline) else None
+
+ allInstantTimes ++= dataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (dataArchivedTimeline.isDefined) {
+ allInstantTimes ++= dataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ allInstantTimes ++= metadataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (metadataArchivedTimeline.isDefined) {
+ allInstantTimes ++= metadataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ val filteredInstantTimes = if (startTime.nonEmpty && endTime.nonEmpty) {
+ allInstantTimes.filter { instantTime =>
+ val timeMatches = (instantTime >= startTime && instantTime <= endTime)
+ timeMatches
+ }
+ } else {
+ allInstantTimes
+ }
+
+ val sortedInstantTimes = filteredInstantTimes.toSeq.sorted(Ordering[String].reverse)
+
+ val entries = sortedInstantTimes.map { instantTime =>
+ createTimelineEntry(
+ instantTime,
+ dataActiveTimeline,
+ dataArchivedTimeline,
+ metadataActiveTimeline,
+ metadataArchivedTimeline,
+ dataInstantInfoMap,
+ metadataInstantInfoMap
+ )
+ }
Review Comment:
I think this is kinda verbose, maybe
```suggestion
val entries =
allInstantTimes
.filter(t => startTime.nonEmpty && endTime.nonEmpty || (t >= startTime && t <= endTime))
.toSeq
.sorted(Ordering.String.reverse)
.map { instantTime =>
createTimelineEntry(
instantTime,
dataActiveTimeline,
dataArchivedTimeline,
metadataActiveTimeline,
metadataArchivedTimeline,
dataInstantInfoMap,
metadataInstantInfoMap
)
}
```
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
+ ProcedureParameter.optional(2, "limit", DataTypes.IntegerType, 20),
+ ProcedureParameter.optional(3, "showArchived", DataTypes.BooleanType, false),
+ ProcedureParameter.optional(4, "filter", DataTypes.StringType, ""),
+ ProcedureParameter.optional(5, "startTime", DataTypes.StringType, ""),
+ ProcedureParameter.optional(6, "endTime", DataTypes.StringType, "")
+ )
+
+ private val OUTPUT_TYPE = new StructType(Array[StructField](
+ StructField("instant_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty)
+ ))
+
+ def parameters: Array[ProcedureParameter] = PARAMETERS
+
+ def outputType: StructType = OUTPUT_TYPE
+
+ override def call(args: ProcedureArgs): Seq[Row] = {
+ super.checkArgs(PARAMETERS, args)
+
+ val tableName = getArgValueOrDefault(args, PARAMETERS(0))
+ val path = getArgValueOrDefault(args, PARAMETERS(1))
+ val limit = getArgValueOrDefault(args, PARAMETERS(2)).get.asInstanceOf[Int]
+ val showArchived = getArgValueOrDefault(args, PARAMETERS(3)).get.asInstanceOf[Boolean]
+ val filter = getArgValueOrDefault(args, PARAMETERS(4)).get.asInstanceOf[String]
+ val startTime = getArgValueOrDefault(args, PARAMETERS(5)).get.asInstanceOf[String]
+ val endTime = getArgValueOrDefault(args, PARAMETERS(6)).get.asInstanceOf[String]
+
+ validateFilter(filter, outputType)
+
+ val dataTableBasePath = getBasePath(tableName, path)
+ val metaClient = createMetaClient(jsc, dataTableBasePath)
+
+ val metadataTableBasePath = HoodieTableMetadata.getMetadataTableBasePath(dataTableBasePath)
+ val metadataMetaClient = try {
+ Some(HoodieTableMetaClient.builder()
+ .setConf(HadoopFSUtils.getStorageConfWithCopy(jsc.hadoopConfiguration()))
+ .setBasePath(metadataTableBasePath)
+ .setLoadActiveTimelineOnLoad(false)
+ .build())
+ } catch {
+ case _: Exception =>
+ None
+ }
+ metadataMetaClient match {
+ case Some(mdMetaClient) => getTimelineEntries(metaClient, mdMetaClient, limit, showArchived, filter, startTime, endTime)
+ case None => Seq.empty[Row]
+ }
+ }
+
+ override def build: Procedure = new ShowMetadataTableHistoryProcedure()
+
+ private def getTimelineEntries(
+ dataMetaClient: HoodieTableMetaClient,
+ metadataMetaClient: HoodieTableMetaClient,
+ limit: Int,
+ showArchived: Boolean,
+ filter: String,
+ startTime: String,
+ endTime: String): Seq[Row] = {
+
+ val dataInstantInfoMap = buildInstantInfoFromTimeline(dataMetaClient)
+ val metadataInstantInfoMap = buildInstantInfoFromTimeline(metadataMetaClient)
+
+ val allInstantTimes = collection.mutable.Set[String]()
+
+ val dataActiveTimeline = dataMetaClient.getActiveTimeline
+ val dataArchivedTimeline = if (showArchived) Some(dataMetaClient.getArchivedTimeline) else None
+
+ val metadataActiveTimeline = metadataMetaClient.getActiveTimeline
+ val metadataArchivedTimeline = if (showArchived) Some(metadataMetaClient.getArchivedTimeline) else None
+
+ allInstantTimes ++= dataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (dataArchivedTimeline.isDefined) {
+ allInstantTimes ++= dataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ allInstantTimes ++= metadataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (metadataArchivedTimeline.isDefined) {
+ allInstantTimes ++= metadataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ val filteredInstantTimes = if (startTime.nonEmpty && endTime.nonEmpty) {
+ allInstantTimes.filter { instantTime =>
+ val timeMatches = (instantTime >= startTime && instantTime <= endTime)
+ timeMatches
+ }
+ } else {
+ allInstantTimes
+ }
+
+ val sortedInstantTimes = filteredInstantTimes.toSeq.sorted(Ordering[String].reverse)
+
+ val entries = sortedInstantTimes.map { instantTime =>
+ createTimelineEntry(
+ instantTime,
+ dataActiveTimeline,
+ dataArchivedTimeline,
+ metadataActiveTimeline,
+ metadataArchivedTimeline,
+ dataInstantInfoMap,
+ metadataInstantInfoMap
+ )
+ }
+
+ val filteredEntries = applyFilter(entries, filter, outputType)
+
+ val finalEntries = if (startTime.nonEmpty && endTime.nonEmpty) {
+ filteredEntries
+ } else {
+ filteredEntries.take(limit)
+ }
+
+ finalEntries
+ }
+
+ private def createTimelineEntry(
+ instantTime: String,
+ dataActiveTimeline: HoodieTimeline,
+ dataArchivedTimeline: Option[HoodieTimeline],
+ metadataActiveTimeline: HoodieTimeline,
+ metadataArchivedTimeline: Option[HoodieTimeline],
+ dataInstantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]],
+ metadataInstantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]]): Row = {
+
+ val dataInstant = findInstant(dataActiveTimeline, dataArchivedTimeline, instantTime)
+ val metadataInstant = findInstant(metadataActiveTimeline, metadataArchivedTimeline, instantTime)
+
+ val action = dataInstant.map(_.getAction).orNull
+ val state = dataInstant.map(_.getState.toString).orNull
+ val requestedTime = getFormattedDateForState(instantTime, HoodieInstant.State.REQUESTED, dataInstantInfoMap)
+ val inflightTime = getFormattedDateForState(instantTime, HoodieInstant.State.INFLIGHT, dataInstantInfoMap)
+ val completedTime = getFormattedDateForState(instantTime, HoodieInstant.State.COMPLETED, dataInstantInfoMap)
+
+ val mtAction = metadataInstant.map(_.getAction).orNull
+ val mtState = metadataInstant.map(_.getState.toString).orNull
+ val mtRequestedTime = getFormattedDateForState(instantTime, HoodieInstant.State.REQUESTED, metadataInstantInfoMap)
+ val mtInflightTime = getFormattedDateForState(instantTime, HoodieInstant.State.INFLIGHT, metadataInstantInfoMap)
+ val mtCompletedTime = getFormattedDateForState(instantTime, HoodieInstant.State.COMPLETED, metadataInstantInfoMap)
+
+ Row(
+ instantTime,
+ mtAction,
+ mtState,
+ mtRequestedTime,
+ mtInflightTime,
+ mtCompletedTime,
+ action,
+ state,
+ requestedTime,
+ inflightTime,
+ completedTime
+ )
+ }
+
+ private def findInstant(
+ activeTimeline: HoodieTimeline,
+ archivedTimeline: Option[HoodieTimeline],
+ instantTime: String): Option[HoodieInstant] = {
+
+ val activeInstant = activeTimeline.getInstants.iterator().asScala
+ .find(_.requestedTime() == instantTime)
+
+ activeInstant.orElse {
+ archivedTimeline.flatMap { archived =>
+ archived.getInstants.iterator().asScala
+ .find(_.requestedTime() == instantTime)
+ }
+ }
+ }
+
+ private case class HoodieInstantWithModTime(state: HoodieInstant.State,
+ action: String,
+ requestedTime: String,
+ completionTime: String,
+ modificationTimeMs: Long
+ ) {
+ def getModificationTime: Long = modificationTimeMs
Review Comment:
iirc, scala case class variables can be directly accessed like `instantWithModTime.modificationTime`, and we don't need an extra getter
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
Review Comment:
should the `table` and `path` be `required` rather than `optional`?
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
+ ProcedureParameter.optional(2, "limit", DataTypes.IntegerType, 20),
+ ProcedureParameter.optional(3, "showArchived", DataTypes.BooleanType, false),
+ ProcedureParameter.optional(4, "filter", DataTypes.StringType, ""),
+ ProcedureParameter.optional(5, "startTime", DataTypes.StringType, ""),
+ ProcedureParameter.optional(6, "endTime", DataTypes.StringType, "")
+ )
+
+ private val OUTPUT_TYPE = new StructType(Array[StructField](
+ StructField("instant_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty)
+ ))
+
+ def parameters: Array[ProcedureParameter] = PARAMETERS
+
+ def outputType: StructType = OUTPUT_TYPE
+
+ override def call(args: ProcedureArgs): Seq[Row] = {
+ super.checkArgs(PARAMETERS, args)
+
+ val tableName = getArgValueOrDefault(args, PARAMETERS(0))
+ val path = getArgValueOrDefault(args, PARAMETERS(1))
+ val limit = getArgValueOrDefault(args, PARAMETERS(2)).get.asInstanceOf[Int]
+ val showArchived = getArgValueOrDefault(args, PARAMETERS(3)).get.asInstanceOf[Boolean]
+ val filter = getArgValueOrDefault(args, PARAMETERS(4)).get.asInstanceOf[String]
+ val startTime = getArgValueOrDefault(args, PARAMETERS(5)).get.asInstanceOf[String]
+ val endTime = getArgValueOrDefault(args, PARAMETERS(6)).get.asInstanceOf[String]
+
+ validateFilter(filter, outputType)
+
+ val dataTableBasePath = getBasePath(tableName, path)
+ val metaClient = createMetaClient(jsc, dataTableBasePath)
+
+ val metadataTableBasePath = HoodieTableMetadata.getMetadataTableBasePath(dataTableBasePath)
+ val metadataMetaClient = try {
+ Some(HoodieTableMetaClient.builder()
+ .setConf(HadoopFSUtils.getStorageConfWithCopy(jsc.hadoopConfiguration()))
+ .setBasePath(metadataTableBasePath)
+ .setLoadActiveTimelineOnLoad(false)
+ .build())
+ } catch {
+ case _: Exception =>
+ None
+ }
+ metadataMetaClient match {
+ case Some(mdMetaClient) => getTimelineEntries(metaClient, mdMetaClient, limit, showArchived, filter, startTime, endTime)
+ case None => Seq.empty[Row]
+ }
+ }
+
+ override def build: Procedure = new ShowMetadataTableHistoryProcedure()
+
+ private def getTimelineEntries(
+ dataMetaClient: HoodieTableMetaClient,
+ metadataMetaClient: HoodieTableMetaClient,
+ limit: Int,
+ showArchived: Boolean,
+ filter: String,
+ startTime: String,
+ endTime: String): Seq[Row] = {
+
+ val dataInstantInfoMap = buildInstantInfoFromTimeline(dataMetaClient)
+ val metadataInstantInfoMap = buildInstantInfoFromTimeline(metadataMetaClient)
+
+ val allInstantTimes = collection.mutable.Set[String]()
+
+ val dataActiveTimeline = dataMetaClient.getActiveTimeline
+ val dataArchivedTimeline = if (showArchived) Some(dataMetaClient.getArchivedTimeline) else None
+
+ val metadataActiveTimeline = metadataMetaClient.getActiveTimeline
+ val metadataArchivedTimeline = if (showArchived) Some(metadataMetaClient.getArchivedTimeline) else None
+
+ allInstantTimes ++= dataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (dataArchivedTimeline.isDefined) {
+ allInstantTimes ++= dataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ allInstantTimes ++= metadataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (metadataArchivedTimeline.isDefined) {
+ allInstantTimes ++= metadataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ val filteredInstantTimes = if (startTime.nonEmpty && endTime.nonEmpty) {
+ allInstantTimes.filter { instantTime =>
+ val timeMatches = (instantTime >= startTime && instantTime <= endTime)
+ timeMatches
+ }
+ } else {
+ allInstantTimes
+ }
+
+ val sortedInstantTimes = filteredInstantTimes.toSeq.sorted(Ordering[String].reverse)
+
+ val entries = sortedInstantTimes.map { instantTime =>
+ createTimelineEntry(
+ instantTime,
+ dataActiveTimeline,
+ dataArchivedTimeline,
+ metadataActiveTimeline,
+ metadataArchivedTimeline,
+ dataInstantInfoMap,
+ metadataInstantInfoMap
+ )
+ }
+
+ val filteredEntries = applyFilter(entries, filter, outputType)
+
+ val finalEntries = if (startTime.nonEmpty && endTime.nonEmpty) {
+ filteredEntries
+ } else {
+ filteredEntries.take(limit)
+ }
+
+ finalEntries
+ }
+
+ private def createTimelineEntry(
+ instantTime: String,
+ dataActiveTimeline: HoodieTimeline,
+ dataArchivedTimeline: Option[HoodieTimeline],
+ metadataActiveTimeline: HoodieTimeline,
+ metadataArchivedTimeline: Option[HoodieTimeline],
+ dataInstantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]],
+ metadataInstantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]]): Row = {
+
+ val dataInstant = findInstant(dataActiveTimeline, dataArchivedTimeline, instantTime)
+ val metadataInstant = findInstant(metadataActiveTimeline, metadataArchivedTimeline, instantTime)
+
+ val action = dataInstant.map(_.getAction).orNull
+ val state = dataInstant.map(_.getState.toString).orNull
+ val requestedTime = getFormattedDateForState(instantTime, HoodieInstant.State.REQUESTED, dataInstantInfoMap)
+ val inflightTime = getFormattedDateForState(instantTime, HoodieInstant.State.INFLIGHT, dataInstantInfoMap)
+ val completedTime = getFormattedDateForState(instantTime, HoodieInstant.State.COMPLETED, dataInstantInfoMap)
+
+ val mtAction = metadataInstant.map(_.getAction).orNull
+ val mtState = metadataInstant.map(_.getState.toString).orNull
+ val mtRequestedTime = getFormattedDateForState(instantTime, HoodieInstant.State.REQUESTED, metadataInstantInfoMap)
+ val mtInflightTime = getFormattedDateForState(instantTime, HoodieInstant.State.INFLIGHT, metadataInstantInfoMap)
+ val mtCompletedTime = getFormattedDateForState(instantTime, HoodieInstant.State.COMPLETED, metadataInstantInfoMap)
+
+ Row(
+ instantTime,
+ mtAction,
+ mtState,
+ mtRequestedTime,
+ mtInflightTime,
+ mtCompletedTime,
+ action,
+ state,
+ requestedTime,
+ inflightTime,
+ completedTime
+ )
+ }
+
+ private def findInstant(
+ activeTimeline: HoodieTimeline,
+ archivedTimeline: Option[HoodieTimeline],
+ instantTime: String): Option[HoodieInstant] = {
+
+ val activeInstant = activeTimeline.getInstants.iterator().asScala
+ .find(_.requestedTime() == instantTime)
+
+ activeInstant.orElse {
+ archivedTimeline.flatMap { archived =>
+ archived.getInstants.iterator().asScala
+ .find(_.requestedTime() == instantTime)
+ }
+ }
+ }
+
+ private case class HoodieInstantWithModTime(state: HoodieInstant.State,
+ action: String,
+ requestedTime: String,
+ completionTime: String,
+ modificationTimeMs: Long
+ ) {
+ def getModificationTime: Long = modificationTimeMs
+ }
+
+ private def buildInstantInfoFromTimeline(metaClient: HoodieTableMetaClient): Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]] = {
+ try {
+ val storage = metaClient.getStorage
+ val timelinePath = metaClient.getTimelinePath
+ val instantFileNameParser = metaClient.getInstantFileNameParser
+ val instantGenerator = metaClient.getInstantGenerator
+
+ val instantMap = scala.collection.mutable.Map[String, scala.collection.mutable.Map[HoodieInstant.State, HoodieInstantWithModTime]]()
+
+ val fileStream = HoodieTableMetaClient.scanFiles(storage, timelinePath, path => {
+ val extension = instantFileNameParser.getTimelineFileExtension(path.getName)
+ metaClient.getActiveTimeline.getValidExtensionsInActiveTimeline.contains(extension)
+ })
+
+ fileStream.forEach { storagePathInfo =>
+ try {
+ val instant = instantGenerator.createNewInstant(storagePathInfo)
+ val instantWithModTime = HoodieInstantWithModTime(
+ instant.getState,
+ instant.getAction,
+ instant.requestedTime(),
+ instant.getCompletionTime,
+ storagePathInfo.getModificationTime
+ )
+
+ instantMap.getOrElseUpdate(instant.requestedTime(), scala.collection.mutable.Map[HoodieInstant.State, HoodieInstantWithModTime]())
+ .put(instant.getState, instantWithModTime)
+ } catch {
+ case _: Exception => // Skip invalid files
+ }
+ }
+ instantMap.map { case (timestamp, stateMap) =>
+ timestamp -> stateMap.toMap
+ }.toMap
+ } catch {
+ case _: Exception => Map.empty[String, Map[HoodieInstant.State, HoodieInstantWithModTime]]
+ }
+ }
+
+ private def getFormattedDateForState(instantTimestamp: String, state: HoodieInstant.State,
+ instantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]]): String = {
+ val stateMap = instantInfoMap.get(instantTimestamp)
+ if (stateMap.isDefined) {
+ val stateInfo = stateMap.get.get(state)
+ if (stateInfo.isDefined) {
+ val modificationTime = stateInfo.get.getModificationTime
+ if (modificationTime > 0) {
+ val date = new java.util.Date(modificationTime)
+ val formatter = new java.text.SimpleDateFormat("MM-dd HH:mm:ss")
+ formatter.format(date)
+ } else {
+ instantTimestamp
+ }
+ } else {
+ null
+ }
+ } else {
+ null
+ }
+ }
Review Comment:
We can simplify this to
```suggestion
val formatter = new java.text.SimpleDateFormat("MM-dd HH:mm:ss")
instantInfoMap.get(instantTimestamp)
.flatMap(_.get(state))
.map(_.modificationTimeMs)
.filter(_ > 0)
.map(time => formatter.format(new java.util.Date(time)))
.getOrElse(instantTimestamp)
```
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
+ ProcedureParameter.optional(2, "limit", DataTypes.IntegerType, 20),
+ ProcedureParameter.optional(3, "showArchived", DataTypes.BooleanType, false),
+ ProcedureParameter.optional(4, "filter", DataTypes.StringType, ""),
+ ProcedureParameter.optional(5, "startTime", DataTypes.StringType, ""),
+ ProcedureParameter.optional(6, "endTime", DataTypes.StringType, "")
Review Comment:
nit: We do not have to assign default values for these
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
Review Comment:
```suggestion
ProcedureParameter.optional(1, "path", DataTypes.StringType),
```
`path` should not have default value
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
+ ProcedureParameter.optional(2, "limit", DataTypes.IntegerType, 20),
+ ProcedureParameter.optional(3, "showArchived", DataTypes.BooleanType, false),
+ ProcedureParameter.optional(4, "filter", DataTypes.StringType, ""),
+ ProcedureParameter.optional(5, "startTime", DataTypes.StringType, ""),
+ ProcedureParameter.optional(6, "endTime", DataTypes.StringType, "")
+ )
+
+ private val OUTPUT_TYPE = new StructType(Array[StructField](
+ StructField("instant_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty)
+ ))
+
+ def parameters: Array[ProcedureParameter] = PARAMETERS
+
+ def outputType: StructType = OUTPUT_TYPE
+
+ override def call(args: ProcedureArgs): Seq[Row] = {
+ super.checkArgs(PARAMETERS, args)
+
+ val tableName = getArgValueOrDefault(args, PARAMETERS(0))
+ val path = getArgValueOrDefault(args, PARAMETERS(1))
+ val limit = getArgValueOrDefault(args, PARAMETERS(2)).get.asInstanceOf[Int]
+ val showArchived = getArgValueOrDefault(args, PARAMETERS(3)).get.asInstanceOf[Boolean]
+ val filter = getArgValueOrDefault(args, PARAMETERS(4)).get.asInstanceOf[String]
+ val startTime = getArgValueOrDefault(args, PARAMETERS(5)).get.asInstanceOf[String]
+ val endTime = getArgValueOrDefault(args, PARAMETERS(6)).get.asInstanceOf[String]
+
+ validateFilter(filter, outputType)
+
+ val dataTableBasePath = getBasePath(tableName, path)
+ val metaClient = createMetaClient(jsc, dataTableBasePath)
+
+ val metadataTableBasePath = HoodieTableMetadata.getMetadataTableBasePath(dataTableBasePath)
+ val metadataMetaClient = try {
+ Some(HoodieTableMetaClient.builder()
+ .setConf(HadoopFSUtils.getStorageConfWithCopy(jsc.hadoopConfiguration()))
+ .setBasePath(metadataTableBasePath)
+ .setLoadActiveTimelineOnLoad(false)
+ .build())
+ } catch {
+ case _: Exception =>
+ None
+ }
+ metadataMetaClient match {
+ case Some(mdMetaClient) => getTimelineEntries(metaClient, mdMetaClient, limit, showArchived, filter, startTime, endTime)
+ case None => Seq.empty[Row]
+ }
+ }
+
+ override def build: Procedure = new ShowMetadataTableHistoryProcedure()
+
+ private def getTimelineEntries(
+ dataMetaClient: HoodieTableMetaClient,
+ metadataMetaClient: HoodieTableMetaClient,
+ limit: Int,
+ showArchived: Boolean,
+ filter: String,
+ startTime: String,
+ endTime: String): Seq[Row] = {
+
+ val dataInstantInfoMap = buildInstantInfoFromTimeline(dataMetaClient)
+ val metadataInstantInfoMap = buildInstantInfoFromTimeline(metadataMetaClient)
+
+ val allInstantTimes = collection.mutable.Set[String]()
+
+ val dataActiveTimeline = dataMetaClient.getActiveTimeline
+ val dataArchivedTimeline = if (showArchived) Some(dataMetaClient.getArchivedTimeline) else None
+
+ val metadataActiveTimeline = metadataMetaClient.getActiveTimeline
+ val metadataArchivedTimeline = if (showArchived) Some(metadataMetaClient.getArchivedTimeline) else None
+
+ allInstantTimes ++= dataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (dataArchivedTimeline.isDefined) {
+ allInstantTimes ++= dataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ allInstantTimes ++= metadataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (metadataArchivedTimeline.isDefined) {
+ allInstantTimes ++= metadataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ val filteredInstantTimes = if (startTime.nonEmpty && endTime.nonEmpty) {
+ allInstantTimes.filter { instantTime =>
+ val timeMatches = (instantTime >= startTime && instantTime <= endTime)
+ timeMatches
+ }
+ } else {
+ allInstantTimes
+ }
+
+ val sortedInstantTimes = filteredInstantTimes.toSeq.sorted(Ordering[String].reverse)
+
+ val entries = sortedInstantTimes.map { instantTime =>
+ createTimelineEntry(
+ instantTime,
+ dataActiveTimeline,
+ dataArchivedTimeline,
+ metadataActiveTimeline,
+ metadataArchivedTimeline,
+ dataInstantInfoMap,
+ metadataInstantInfoMap
+ )
+ }
+
+ val filteredEntries = applyFilter(entries, filter, outputType)
+
+ val finalEntries = if (startTime.nonEmpty && endTime.nonEmpty) {
Review Comment:
Could it be possible that only `startTime` is empty, and `endTime` is not?
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
+ ProcedureParameter.optional(2, "limit", DataTypes.IntegerType, 20),
+ ProcedureParameter.optional(3, "showArchived", DataTypes.BooleanType, false),
+ ProcedureParameter.optional(4, "filter", DataTypes.StringType, ""),
+ ProcedureParameter.optional(5, "startTime", DataTypes.StringType, ""),
+ ProcedureParameter.optional(6, "endTime", DataTypes.StringType, "")
+ )
+
+ private val OUTPUT_TYPE = new StructType(Array[StructField](
+ StructField("instant_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty)
+ ))
+
+ def parameters: Array[ProcedureParameter] = PARAMETERS
+
+ def outputType: StructType = OUTPUT_TYPE
+
+ override def call(args: ProcedureArgs): Seq[Row] = {
+ super.checkArgs(PARAMETERS, args)
+
+ val tableName = getArgValueOrDefault(args, PARAMETERS(0))
+ val path = getArgValueOrDefault(args, PARAMETERS(1))
+ val limit = getArgValueOrDefault(args, PARAMETERS(2)).get.asInstanceOf[Int]
+ val showArchived = getArgValueOrDefault(args, PARAMETERS(3)).get.asInstanceOf[Boolean]
+ val filter = getArgValueOrDefault(args, PARAMETERS(4)).get.asInstanceOf[String]
+ val startTime = getArgValueOrDefault(args, PARAMETERS(5)).get.asInstanceOf[String]
+ val endTime = getArgValueOrDefault(args, PARAMETERS(6)).get.asInstanceOf[String]
+
+ validateFilter(filter, outputType)
+
+ val dataTableBasePath = getBasePath(tableName, path)
+ val metaClient = createMetaClient(jsc, dataTableBasePath)
+
+ val metadataTableBasePath = HoodieTableMetadata.getMetadataTableBasePath(dataTableBasePath)
+ val metadataMetaClient = try {
+ Some(HoodieTableMetaClient.builder()
+ .setConf(HadoopFSUtils.getStorageConfWithCopy(jsc.hadoopConfiguration()))
+ .setBasePath(metadataTableBasePath)
+ .setLoadActiveTimelineOnLoad(false)
+ .build())
+ } catch {
+ case _: Exception =>
+ None
+ }
+ metadataMetaClient match {
+ case Some(mdMetaClient) => getTimelineEntries(metaClient, mdMetaClient, limit, showArchived, filter, startTime, endTime)
+ case None => Seq.empty[Row]
+ }
+ }
+
+ override def build: Procedure = new ShowMetadataTableHistoryProcedure()
+
+ private def getTimelineEntries(
+ dataMetaClient: HoodieTableMetaClient,
+ metadataMetaClient: HoodieTableMetaClient,
+ limit: Int,
+ showArchived: Boolean,
+ filter: String,
+ startTime: String,
+ endTime: String): Seq[Row] = {
+
+ val dataInstantInfoMap = buildInstantInfoFromTimeline(dataMetaClient)
+ val metadataInstantInfoMap = buildInstantInfoFromTimeline(metadataMetaClient)
+
+ val allInstantTimes = collection.mutable.Set[String]()
+
+ val dataActiveTimeline = dataMetaClient.getActiveTimeline
+ val dataArchivedTimeline = if (showArchived) Some(dataMetaClient.getArchivedTimeline) else None
+
+ val metadataActiveTimeline = metadataMetaClient.getActiveTimeline
+ val metadataArchivedTimeline = if (showArchived) Some(metadataMetaClient.getArchivedTimeline) else None
+
+ allInstantTimes ++= dataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (dataArchivedTimeline.isDefined) {
+ allInstantTimes ++= dataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ allInstantTimes ++= metadataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (metadataArchivedTimeline.isDefined) {
+ allInstantTimes ++= metadataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ val filteredInstantTimes = if (startTime.nonEmpty && endTime.nonEmpty) {
+ allInstantTimes.filter { instantTime =>
+ val timeMatches = (instantTime >= startTime && instantTime <= endTime)
+ timeMatches
+ }
+ } else {
+ allInstantTimes
+ }
+
+ val sortedInstantTimes = filteredInstantTimes.toSeq.sorted(Ordering[String].reverse)
+
+ val entries = sortedInstantTimes.map { instantTime =>
+ createTimelineEntry(
+ instantTime,
+ dataActiveTimeline,
+ dataArchivedTimeline,
+ metadataActiveTimeline,
+ metadataArchivedTimeline,
+ dataInstantInfoMap,
+ metadataInstantInfoMap
+ )
+ }
+
+ val filteredEntries = applyFilter(entries, filter, outputType)
+
+ val finalEntries = if (startTime.nonEmpty && endTime.nonEmpty) {
+ filteredEntries
+ } else {
+ filteredEntries.take(limit)
+ }
+
+ finalEntries
+ }
+
+ private def createTimelineEntry(
+ instantTime: String,
+ dataActiveTimeline: HoodieTimeline,
+ dataArchivedTimeline: Option[HoodieTimeline],
+ metadataActiveTimeline: HoodieTimeline,
+ metadataArchivedTimeline: Option[HoodieTimeline],
+ dataInstantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]],
+ metadataInstantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]]): Row = {
+
+ val dataInstant = findInstant(dataActiveTimeline, dataArchivedTimeline, instantTime)
+ val metadataInstant = findInstant(metadataActiveTimeline, metadataArchivedTimeline, instantTime)
+
+ val action = dataInstant.map(_.getAction).orNull
+ val state = dataInstant.map(_.getState.toString).orNull
+ val requestedTime = getFormattedDateForState(instantTime, HoodieInstant.State.REQUESTED, dataInstantInfoMap)
+ val inflightTime = getFormattedDateForState(instantTime, HoodieInstant.State.INFLIGHT, dataInstantInfoMap)
+ val completedTime = getFormattedDateForState(instantTime, HoodieInstant.State.COMPLETED, dataInstantInfoMap)
+
+ val mtAction = metadataInstant.map(_.getAction).orNull
+ val mtState = metadataInstant.map(_.getState.toString).orNull
+ val mtRequestedTime = getFormattedDateForState(instantTime, HoodieInstant.State.REQUESTED, metadataInstantInfoMap)
+ val mtInflightTime = getFormattedDateForState(instantTime, HoodieInstant.State.INFLIGHT, metadataInstantInfoMap)
+ val mtCompletedTime = getFormattedDateForState(instantTime, HoodieInstant.State.COMPLETED, metadataInstantInfoMap)
+
+ Row(
+ instantTime,
+ mtAction,
+ mtState,
+ mtRequestedTime,
+ mtInflightTime,
+ mtCompletedTime,
+ action,
+ state,
+ requestedTime,
+ inflightTime,
+ completedTime
+ )
+ }
+
+ private def findInstant(
+ activeTimeline: HoodieTimeline,
+ archivedTimeline: Option[HoodieTimeline],
+ instantTime: String): Option[HoodieInstant] = {
+
+ val activeInstant = activeTimeline.getInstants.iterator().asScala
+ .find(_.requestedTime() == instantTime)
+
+ activeInstant.orElse {
+ archivedTimeline.flatMap { archived =>
+ archived.getInstants.iterator().asScala
+ .find(_.requestedTime() == instantTime)
+ }
+ }
+ }
+
+ private case class HoodieInstantWithModTime(state: HoodieInstant.State,
+ action: String,
+ requestedTime: String,
+ completionTime: String,
+ modificationTimeMs: Long
+ ) {
+ def getModificationTime: Long = modificationTimeMs
+ }
+
+ private def buildInstantInfoFromTimeline(metaClient: HoodieTableMetaClient): Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]] = {
+ try {
+ val storage = metaClient.getStorage
+ val timelinePath = metaClient.getTimelinePath
+ val instantFileNameParser = metaClient.getInstantFileNameParser
+ val instantGenerator = metaClient.getInstantGenerator
+
+ val instantMap = scala.collection.mutable.Map[String, scala.collection.mutable.Map[HoodieInstant.State, HoodieInstantWithModTime]]()
+
+ val fileStream = HoodieTableMetaClient.scanFiles(storage, timelinePath, path => {
+ val extension = instantFileNameParser.getTimelineFileExtension(path.getName)
+ metaClient.getActiveTimeline.getValidExtensionsInActiveTimeline.contains(extension)
+ })
+
+ fileStream.forEach { storagePathInfo =>
+ try {
+ val instant = instantGenerator.createNewInstant(storagePathInfo)
+ val instantWithModTime = HoodieInstantWithModTime(
+ instant.getState,
+ instant.getAction,
+ instant.requestedTime(),
+ instant.getCompletionTime,
+ storagePathInfo.getModificationTime
+ )
+
+ instantMap.getOrElseUpdate(instant.requestedTime(), scala.collection.mutable.Map[HoodieInstant.State, HoodieInstantWithModTime]())
+ .put(instant.getState, instantWithModTime)
+ } catch {
+ case _: Exception => // Skip invalid files
Review Comment:
Should we log invalid files?
##########
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/ShowMetadataTableHistoryProcedure.scala:
##########
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.hudi.command.procedures
+
+import org.apache.hudi.common.table.HoodieTableMetaClient
+import org.apache.hudi.common.table.timeline.{HoodieInstant, HoodieTimeline}
+import org.apache.hudi.hadoop.fs.HadoopFSUtils
+import org.apache.hudi.metadata.HoodieTableMetadata
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
+
+import java.util.function.Supplier
+
+import scala.collection.JavaConverters._
+
+class ShowMetadataTableHistoryProcedure extends BaseProcedure with ProcedureBuilder {
+
+ private val PARAMETERS = Array[ProcedureParameter](
+ ProcedureParameter.optional(0, "table", DataTypes.StringType),
+ ProcedureParameter.optional(1, "path", DataTypes.StringType, ""),
+ ProcedureParameter.optional(2, "limit", DataTypes.IntegerType, 20),
+ ProcedureParameter.optional(3, "showArchived", DataTypes.BooleanType, false),
+ ProcedureParameter.optional(4, "filter", DataTypes.StringType, ""),
+ ProcedureParameter.optional(5, "startTime", DataTypes.StringType, ""),
+ ProcedureParameter.optional(6, "endTime", DataTypes.StringType, "")
+ )
+
+ private val OUTPUT_TYPE = new StructType(Array[StructField](
+ StructField("instant_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("metadata_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_action", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_state", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_requested_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_inflight_time", DataTypes.StringType, nullable = true, Metadata.empty),
+ StructField("data_table_completed_time", DataTypes.StringType, nullable = true, Metadata.empty)
+ ))
+
+ def parameters: Array[ProcedureParameter] = PARAMETERS
+
+ def outputType: StructType = OUTPUT_TYPE
+
+ override def call(args: ProcedureArgs): Seq[Row] = {
+ super.checkArgs(PARAMETERS, args)
+
+ val tableName = getArgValueOrDefault(args, PARAMETERS(0))
+ val path = getArgValueOrDefault(args, PARAMETERS(1))
+ val limit = getArgValueOrDefault(args, PARAMETERS(2)).get.asInstanceOf[Int]
+ val showArchived = getArgValueOrDefault(args, PARAMETERS(3)).get.asInstanceOf[Boolean]
+ val filter = getArgValueOrDefault(args, PARAMETERS(4)).get.asInstanceOf[String]
+ val startTime = getArgValueOrDefault(args, PARAMETERS(5)).get.asInstanceOf[String]
+ val endTime = getArgValueOrDefault(args, PARAMETERS(6)).get.asInstanceOf[String]
+
+ validateFilter(filter, outputType)
+
+ val dataTableBasePath = getBasePath(tableName, path)
+ val metaClient = createMetaClient(jsc, dataTableBasePath)
+
+ val metadataTableBasePath = HoodieTableMetadata.getMetadataTableBasePath(dataTableBasePath)
+ val metadataMetaClient = try {
+ Some(HoodieTableMetaClient.builder()
+ .setConf(HadoopFSUtils.getStorageConfWithCopy(jsc.hadoopConfiguration()))
+ .setBasePath(metadataTableBasePath)
+ .setLoadActiveTimelineOnLoad(false)
+ .build())
+ } catch {
+ case _: Exception =>
+ None
+ }
+ metadataMetaClient match {
+ case Some(mdMetaClient) => getTimelineEntries(metaClient, mdMetaClient, limit, showArchived, filter, startTime, endTime)
+ case None => Seq.empty[Row]
+ }
+ }
+
+ override def build: Procedure = new ShowMetadataTableHistoryProcedure()
+
+ private def getTimelineEntries(
+ dataMetaClient: HoodieTableMetaClient,
+ metadataMetaClient: HoodieTableMetaClient,
+ limit: Int,
+ showArchived: Boolean,
+ filter: String,
+ startTime: String,
+ endTime: String): Seq[Row] = {
+
+ val dataInstantInfoMap = buildInstantInfoFromTimeline(dataMetaClient)
+ val metadataInstantInfoMap = buildInstantInfoFromTimeline(metadataMetaClient)
+
+ val allInstantTimes = collection.mutable.Set[String]()
+
+ val dataActiveTimeline = dataMetaClient.getActiveTimeline
+ val dataArchivedTimeline = if (showArchived) Some(dataMetaClient.getArchivedTimeline) else None
+
+ val metadataActiveTimeline = metadataMetaClient.getActiveTimeline
+ val metadataArchivedTimeline = if (showArchived) Some(metadataMetaClient.getArchivedTimeline) else None
+
+ allInstantTimes ++= dataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (dataArchivedTimeline.isDefined) {
+ allInstantTimes ++= dataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ allInstantTimes ++= metadataActiveTimeline.getInstants.iterator().asScala.map(_.requestedTime())
+ if (metadataArchivedTimeline.isDefined) {
+ allInstantTimes ++= metadataArchivedTimeline.get.getInstants.iterator().asScala.map(_.requestedTime())
+ }
+
+ val filteredInstantTimes = if (startTime.nonEmpty && endTime.nonEmpty) {
+ allInstantTimes.filter { instantTime =>
+ val timeMatches = (instantTime >= startTime && instantTime <= endTime)
+ timeMatches
+ }
+ } else {
+ allInstantTimes
+ }
+
+ val sortedInstantTimes = filteredInstantTimes.toSeq.sorted(Ordering[String].reverse)
+
+ val entries = sortedInstantTimes.map { instantTime =>
+ createTimelineEntry(
+ instantTime,
+ dataActiveTimeline,
+ dataArchivedTimeline,
+ metadataActiveTimeline,
+ metadataArchivedTimeline,
+ dataInstantInfoMap,
+ metadataInstantInfoMap
+ )
+ }
+
+ val filteredEntries = applyFilter(entries, filter, outputType)
+
+ val finalEntries = if (startTime.nonEmpty && endTime.nonEmpty) {
+ filteredEntries
+ } else {
+ filteredEntries.take(limit)
+ }
+
+ finalEntries
+ }
+
+ private def createTimelineEntry(
+ instantTime: String,
+ dataActiveTimeline: HoodieTimeline,
+ dataArchivedTimeline: Option[HoodieTimeline],
+ metadataActiveTimeline: HoodieTimeline,
+ metadataArchivedTimeline: Option[HoodieTimeline],
+ dataInstantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]],
+ metadataInstantInfoMap: Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]]): Row = {
+
+ val dataInstant = findInstant(dataActiveTimeline, dataArchivedTimeline, instantTime)
+ val metadataInstant = findInstant(metadataActiveTimeline, metadataArchivedTimeline, instantTime)
+
+ val action = dataInstant.map(_.getAction).orNull
+ val state = dataInstant.map(_.getState.toString).orNull
+ val requestedTime = getFormattedDateForState(instantTime, HoodieInstant.State.REQUESTED, dataInstantInfoMap)
+ val inflightTime = getFormattedDateForState(instantTime, HoodieInstant.State.INFLIGHT, dataInstantInfoMap)
+ val completedTime = getFormattedDateForState(instantTime, HoodieInstant.State.COMPLETED, dataInstantInfoMap)
+
+ val mtAction = metadataInstant.map(_.getAction).orNull
+ val mtState = metadataInstant.map(_.getState.toString).orNull
+ val mtRequestedTime = getFormattedDateForState(instantTime, HoodieInstant.State.REQUESTED, metadataInstantInfoMap)
+ val mtInflightTime = getFormattedDateForState(instantTime, HoodieInstant.State.INFLIGHT, metadataInstantInfoMap)
+ val mtCompletedTime = getFormattedDateForState(instantTime, HoodieInstant.State.COMPLETED, metadataInstantInfoMap)
+
+ Row(
+ instantTime,
+ mtAction,
+ mtState,
+ mtRequestedTime,
+ mtInflightTime,
+ mtCompletedTime,
+ action,
+ state,
+ requestedTime,
+ inflightTime,
+ completedTime
+ )
+ }
+
+ private def findInstant(
+ activeTimeline: HoodieTimeline,
+ archivedTimeline: Option[HoodieTimeline],
+ instantTime: String): Option[HoodieInstant] = {
+
+ val activeInstant = activeTimeline.getInstants.iterator().asScala
+ .find(_.requestedTime() == instantTime)
+
+ activeInstant.orElse {
+ archivedTimeline.flatMap { archived =>
+ archived.getInstants.iterator().asScala
+ .find(_.requestedTime() == instantTime)
+ }
+ }
+ }
+
+ private case class HoodieInstantWithModTime(state: HoodieInstant.State,
+ action: String,
+ requestedTime: String,
+ completionTime: String,
+ modificationTimeMs: Long
+ ) {
+ def getModificationTime: Long = modificationTimeMs
+ }
+
+ private def buildInstantInfoFromTimeline(metaClient: HoodieTableMetaClient): Map[String, Map[HoodieInstant.State, HoodieInstantWithModTime]] = {
+ try {
+ val storage = metaClient.getStorage
+ val timelinePath = metaClient.getTimelinePath
+ val instantFileNameParser = metaClient.getInstantFileNameParser
+ val instantGenerator = metaClient.getInstantGenerator
+
+ val instantMap = scala.collection.mutable.Map[String, scala.collection.mutable.Map[HoodieInstant.State, HoodieInstantWithModTime]]()
+
+ val fileStream = HoodieTableMetaClient.scanFiles(storage, timelinePath, path => {
+ val extension = instantFileNameParser.getTimelineFileExtension(path.getName)
+ metaClient.getActiveTimeline.getValidExtensionsInActiveTimeline.contains(extension)
+ })
+
+ fileStream.forEach { storagePathInfo =>
+ try {
+ val instant = instantGenerator.createNewInstant(storagePathInfo)
+ val instantWithModTime = HoodieInstantWithModTime(
+ instant.getState,
+ instant.getAction,
+ instant.requestedTime(),
+ instant.getCompletionTime,
+ storagePathInfo.getModificationTime
+ )
+
+ instantMap.getOrElseUpdate(instant.requestedTime(), scala.collection.mutable.Map[HoodieInstant.State, HoodieInstantWithModTime]())
+ .put(instant.getState, instantWithModTime)
+ } catch {
+ case _: Exception => // Skip invalid files
+ }
+ }
+ instantMap.map { case (timestamp, stateMap) =>
+ timestamp -> stateMap.toMap
+ }.toMap
+ } catch {
+ case _: Exception => Map.empty[String, Map[HoodieInstant.State, HoodieInstantWithModTime]]
Review Comment:
Same here, should we log it?
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
Posted by "hudi-bot (via GitHub)" <gi...@apache.org>.
hudi-bot commented on PR #14303:
URL: https://github.com/apache/hudi/pull/14303#issuecomment-3599139698
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"status" : "FAILURE",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601",
"triggerID" : "e2f8428262d6ffaa7938bf1065d9e165cc00f9b5",
"triggerType" : "PUSH"
}, {
"hash" : "f2b08043f3fab58210980743f53c4aee94ddef14",
"status" : "PENDING",
"url" : "https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9804",
"triggerID" : "f2b08043f3fab58210980743f53c4aee94ddef14",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* e2f8428262d6ffaa7938bf1065d9e165cc00f9b5 Azure: [FAILURE](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9601)
* f2b08043f3fab58210980743f53c4aee94ddef14 Azure: [PENDING](https://dev.azure.com/apachehudi/a1a51da7-8592-47d4-88dc-fd67bed336bb/_build/results?buildId=9804)
<details>
<summary>Bot commands</summary>
@hudi-bot supports the following commands:
- `@hudi-bot run azure` re-run the last Azure build
</details>
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat: [HUDI-9775] Support for show_metadata_table_history with appropriate matching data table info [hudi]
Posted by "yihua (via GitHub)" <gi...@apache.org>.
yihua commented on PR #14303:
URL: https://github.com/apache/hudi/pull/14303#issuecomment-3649688369
@CTTY could you help review this PR?
--
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: commits-unsubscribe@hudi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org