Repository: cassandra Updated Branches: refs/heads/trunk 1db54a126 -> 882c28230
Fix CommitLogReplayer exception for CDC data patch by Jay Zhuang; reviewed by Stefan Podkowinski for CASSANDRA-14066 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/882c2823 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/882c2823 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/882c2823 Branch: refs/heads/trunk Commit: 882c28230ef3b31bd17689d51e83ea624116c769 Parents: 1db54a1 Author: Jay Zhuang <jay.zhu...@yahoo.com> Authored: Tue Nov 21 15:49:48 2017 -0800 Committer: Stefan Podkowinski <stefan.podkowin...@1und1.de> Committed: Wed Dec 20 09:26:23 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/882c2823/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 15954c8..3d13787 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Fix CommitLogReplayer exception for CDC data (CASSANDRA-14066) * Fix cassandra-stress startup failure (CASSANDRA-14106) * Remove initialDirectories from CFS (CASSANDRA-13928) * Fix trivial log format error (CASSANDRA-14015) http://git-wip-us.apache.org/repos/asf/cassandra/blob/882c2823/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java index 7cb277e..ce185b6 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java @@ -152,7 +152,7 @@ public class CommitLogReplayer implements CommitLogReadHandler sawCDCMutation = false; commitLogReader.readCommitLogSegment(this, file, globalPosition, i == filteredLogs.size()); if (sawCDCMutation) - handleCDCReplayCompletion(clogs[i]); + handleCDCReplayCompletion(file); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
