Skip to content

[Spark] Update the comparison as it could be same but not not greater #4760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[Spark] Update the comparison as it could be same but not not greater #4760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70e2f5e
Update DeltaHistoryManager.scala
lisa2lisa Jun 13, 2025
bd1173c
Update DeltaHistoryManager.scala
lisa2lisa Jun 13, 2025
d410787
Update DeltaHistoryManager.java
lisa2lisa Jun 13, 2025
6e35fef
Merge branch 'master' into master
lisa2lisa Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion connectors/standalone/src/main/scala/io/delta/standalone/internal/DeltaHistoryManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ private[internal] case class DeltaHistoryManager(deltaLog: DeltaLogImpl) extends
while (i < length - 1) {
val prevTimestamp = commits(i).getTimestamp
assert(commits(i).getVersion < commits(i + 1).getVersion, "Unordered commits provided.")
if (prevTimestamp >= commits(i + 1).getTimestamp) {
if (prevTimestamp > commits(i + 1).getTimestamp) {
logWarning(s"Found Delta commit ${commits(i).getVersion} with a timestamp $prevTimestamp " +
s"which is greater than the next commit timestamp ${commits(i + 1).getTimestamp}.")
commits(i + 1) = commits(i + 1).withTimestamp(prevTimestamp + 1).asInstanceOf[T]
Expand Down
2 changes: 1 addition & 1 deletion kernel/kernel-api/src/main/java/io/delta/kernel/internal/DeltaHistoryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ private static List<Commit> monotonizeCommitTimestamps(CloseableIterator<Commit>
while (commits.hasNext()) {
Commit newElem = commits.next();
assert (prevVersion < newElem.version); // Verify commits are ordered
if (prevTimestamp >= newElem.timestamp) {
if (prevTimestamp > newElem.timestamp) {
logger.warn(
"Found Delta commit {} with a timestamp {} which is greater than the next "
+ "commit timestamp {}.",
Expand Down
2 changes: 1 addition & 1 deletion spark/src/main/scala/org/apache/spark/sql/delta/DeltaHistoryManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ object DeltaHistoryManager extends DeltaLogging {
while (i < length - 1) {
val prevTimestamp = commits(i).getTimestamp
assert(commits(i).getVersion < commits(i + 1).getVersion, "Unordered commits provided.")
if (prevTimestamp >= commits(i + 1).getTimestamp) {
if (prevTimestamp > commits(i + 1).getTimestamp) {
logWarning(log"Found Delta commit ${MDC(DeltaLogKeys.VERSION, commits(i).getVersion)} " +
log"with a timestamp ${MDC(DeltaLogKeys.TIMESTAMP, prevTimestamp)} " +
log"which is greater than the next commit timestamp " +
Expand Down
Loading