Skip to content

Commit

Permalink
[Spark][3.2] Fix CommitInfo.inCommitTimestamp deserialization for ver…
Browse files Browse the repository at this point in the history
…y small timestamps (#3045)

<!--
Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, please read our contributor guidelines:
https://github.com/delta-io/delta/blob/master/CONTRIBUTING.md
2. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP]
Your PR title ...'.
  3. Be sure to keep the PR description updated to reflect all changes.
  4. Please write your PR title to summarize what this PR proposes.
5. If possible, provide a concise example to reproduce the issue for a
faster review.
6. If applicable, include the corresponding issue number in the PR title
and link it in the body.
-->

#### Which Delta project/connector is this regarding?
<!--
Please add the component selected below to the beginning of the pull
request title
For example: [Spark] Title of my pull request
-->

- [X] Spark
- [ ] Standalone
- [ ] Flink
- [ ] Kernel
- [ ] Other (fill in here)

## Description

<!--
- Describe what this PR changes.
- Describe why we need the change.
 
If this PR resolves an issue be sure to include "Resolves #XXX" to
correctly link and close the issue upon merge.
-->
Currently, if we deserialize a CommitInfo with a very small
inCommitTimestamp and then try to access this inCommitTimestamp, this
exception is thrown

```
java.lang.ClassCastException: class java.lang.Integer cannot be cast to class java.lang.Long
```
This PR fixes the CommitInfo so that the inCommitTimestamp field is
deserialized correctly.

## How was this patch tested?

<!--
If tests were added, say they were added here. Please make sure to test
the changes thoroughly including negative and positive cases if
possible.
If the changes were tested in any way other than unit tests, please
clarify how you tested step by step (ideally copy and paste-able, so
that other reviewers can test and check, and descendants can verify in
the future).
If the changes were not tested, please explain why.
-->
Added a new test case that was failing before the fix.

## Does this PR introduce _any_ user-facing changes?

<!--
If yes, please clarify the previous behavior and the change this PR
proposes - provide the console output, description and/or an example to
show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change
compared to the released Delta Lake versions or within the unreleased
branches such as master.
If no, write 'No'.
-->
No
  • Loading branch information
dhruvarya-db authored May 6, 2024
1 parent 6453fe5 commit 1ba4832
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,7 @@ case class CommitInfo(
// infer the commit version from the file name and fill in this field then.
@JsonDeserialize(contentAs = classOf[java.lang.Long])
version: Option[Long],
@JsonDeserialize(contentAs = classOf[java.lang.Long])
inCommitTimestamp: Option[Long],
timestamp: Timestamp,
userId: Option[String],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,25 @@ class ActionSerializerSuite extends QueryTest with SharedSparkSession with Delta
assert(Action.fromJson(json1) === expectedCommitInfo)
}

test("deserialization of CommitInfo with a very small ICT") {
val json1 =
"""{"commitInfo":{"inCommitTimestamp":123,"timestamp":123,"operation":"CONVERT",""" +
""""operationParameters":{},"readVersion":23,""" +
""""isolationLevel":"SnapshotIsolation","isBlindAppend":true,""" +
""""operationMetrics":{"m1":"v1","m2":"v2"},"userMetadata":"123"}}""".stripMargin
assert(Action.fromJson(json1).asInstanceOf[CommitInfo].inCommitTimestamp.get == 123L)
}

test("deserialization of CommitInfo with missing ICT") {
val json1 =
"""{"commitInfo":{"timestamp":123,"operation":"CONVERT",""" +
""""operationParameters":{},"readVersion":23,""" +
""""isolationLevel":"SnapshotIsolation","isBlindAppend":true,""" +
""""operationMetrics":{"m1":"v1","m2":"v2"},"userMetadata":"123"}}""".stripMargin
val ictOpt: Option[Long] = Action.fromJson(json1).asInstanceOf[CommitInfo].inCommitTimestamp
assert(ictOpt.isEmpty)
}

testActionSerDe(
"Protocol - json serialization/deserialization",
Protocol(minReaderVersion = 1, minWriterVersion = 2),
Expand Down

0 comments on commit 1ba4832

Please sign in to comment.