[HUDI-8550] Make Hudi 1.x write timeline to a dedicated timeline folder under .hoodie #12288
+739
−291
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danny0405
reviewed
Nov 19, 2024
| if (needsUpgradeOrDowngrade(metaClient)) { | ||
| // unclear what instant to use, since upgrade does have a given instant. | ||
| executeUsingTxnManager(Option.empty(), () -> tryUpgrade(metaClient, Option.empty())); | ||
| updatedMetaClient = createMetaClient(true); |
There was a problem hiding this comment.
We better update the options within tryUpgrade, like what we already do: reloadTableConfig, reloadActiveTimeline.
There was a problem hiding this comment.
The metaClient is locally passed to this method which in turn needs to be passed to startCommit. On upgrade, metaclient is stale (wrong layoutVetsion) and needs to be updated. This is the reason for the above change.
There was a problem hiding this comment.
Can we just refresh the timelineLayoutVersion and timelineLayout from the table config right after the table config are reloaded, so the refresh sequence become:
- refresh table config
- refresh timeline layout
- refresh timeline
Or we just remove the reload in tryUpgrade which is much simpler, and we need to take care all the calls of tryUpgrade.
danny0405
reviewed
Nov 19, 2024
hudi-common/src/main/java/org/apache/hudi/common/table/timeline/CommitMetadataSerDe.java
Outdated
Show resolved
Hide resolved
|
@danny0405 : Apart from the two comments, Are you ok with other changes ? |
Yes, overall looks good to me, I reviewed |
codope
reviewed
Nov 21, 2024
...mmon/src/main/java/org/apache/hudi/common/table/timeline/versioning/v2/ActiveTimelineV2.java
Outdated
Show resolved
Hide resolved
hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableMetaClient.java
Outdated
Show resolved
Hide resolved
|
@bvaradar Have not looked very closely. but can we also make sure the lsm timeline moves along with new folder.. Call it so over 1.1 or 1.2 I want to fully converge it to a single timeline. |
codope
reviewed
Nov 21, 2024
...-client-common/src/main/java/org/apache/hudi/table/upgrade/EightToSevenDowngradeHandler.java
Outdated
Show resolved
Hide resolved
codope
force-pushed
the
HUDI-8550-new_timeline_folder
branch
from
5a9c25f
to
a90e9ea
Compare
codope
reviewed
Nov 22, 2024
| @@ -711,7 +711,7 @@ class TestSpark3DDL extends HoodieSparkSqlTestBase { | |||
|
|
|||
| test("Test schema auto evolution") { | |||
| withTempDir { tmp => | |||
| Seq("COPY_ON_WRITE", "MERGE_ON_READ").foreach { tableType => | |||
| Seq("COPY_ON_WRITE").foreach { tableType => | |||
There was a problem hiding this comment.
Need to revisit this after fixing all other tests. For MOR, this test fails due to
Caused by: org.apache.parquet.io.ParquetDecodingException: Can not read value at 1 in block 0 in file file:/private/var/folders/s5/pqxf5ndx12qg6h0zgl2d9zxh0000gn/T/spark-83fab01d-7af8-4c22-9dee-8d840aa02e90/h1/americas/brazil/sao_paulo/c7c9ab23-56f7-45f4-bdbe-d7a8de9671bf-0_0-22-35_20241122094757341.parquet
at org.apache.parquet.hadoop.InternalParquetRecordReader.nextKeyValue(InternalParquetRecordReader.java:264)
at org.apache.parquet.hadoop.ParquetRecordReader.nextKeyValue(ParquetRecordReader.java:210)
at org.apache.spark.sql.execution.datasources.parquet.ParquetRowIndexUtil$RecordReaderWithRowIndexes.nextKeyValue(ParquetRowIndexUtil.scala:89)
at org.apache.spark.sql.execution.datasources.RecordReaderIterator.hasNext(RecordReaderIterator.scala:39)
at org.apache.spark.sql.execution.datasources.RecordReaderIterator$$anon$1.hasNext(RecordReaderIterator.scala:61)
at org.apache.hudi.util.CloseableInternalRowIterator.hasNext(CloseableInternalRowIterator.scala:50)
at org.apache.hudi.common.table.read.HoodieKeyBasedFileGroupRecordBuffer.doHasNext(HoodieKeyBasedFileGroupRecordBuffer.java:134)
at org.apache.hudi.common.table.read.HoodieBaseFileGroupRecordBuffer.hasNext(HoodieBaseFileGroupRecordBuffer.java:149)
at org.apache.hudi.common.table.read.HoodieFileGroupReader.hasNext(HoodieFileGroupReader.java:235)
at org.apache.hudi.common.table.read.HoodieFileGroupReader$HoodieFileGroupReaderIterator.hasNext(HoodieFileGroupReader.java:289)
at org.apache.spark.sql.execution.datasources.parquet.HoodieFileGroupReaderBasedParquetFileFormat$$anon$1.hasNext(HoodieFileGroupReaderBasedParquetFileFormat.scala:273)
at org.apache.spark.sql.execution.datasources.FileScanRDD$$anon$1.hasNext(FileScanRDD.scala:129)
at org.apache.spark.sql.execution.datasources.FileScanRDD$$anon$1.nextIterator(FileScanRDD.scala:283)
... 22 more
Caused by: java.lang.ClassCastException: org.apache.spark.sql.catalyst.expressions.MutableAny cannot be cast to org.apache.spark.sql.catalyst.expressions.MutableDouble
at org.apache.spark.sql.catalyst.expressions.SpecificInternalRow.setDouble(SpecificInternalRow.scala:284)
at org.apache.spark.sql.execution.datasources.parquet.ParquetRowConverter$RowUpdater.setDouble(ParquetRowConverter.scala:185)
at org.apache.spark.sql.execution.datasources.parquet.ParquetPrimitiveConverter.addDouble(ParquetRowConverter.scala:96)
at org.apache.parquet.column.impl.ColumnReaderBase$2$2.writeValue(ColumnReaderBase.java:269)
at org.apache.parquet.column.impl.ColumnReaderBase.writeCurrentValueToConverter(ColumnReaderBase.java:440)
at org.apache.parquet.column.impl.ColumnReaderImpl.writeCurrentValueToConverter(ColumnReaderImpl.java:30)
at org.apache.parquet.io.RecordReaderImplementation.read(RecordReaderImplementation.java:406)
at org.apache.parquet.hadoop.InternalParquetRecordReader.nextKeyValue(InternalParquetRecordReader.java:234)
... 34 more
github-actions
bot
added
size:XL
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change Logs
Hudi 1.x to use dedicated timeline folder under .hoodie
Impact
Timeline folder to move to a dedicated folder.
Risk level (write none, low medium or high below)
none
Documentation Update
none
ticket number here and follow the instruction to make
changes to the website.
Contributor's checklist