Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc37e618 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc37e618 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc37e618 Branch: refs/heads/trunk Commit: fc37e618bb879717777e5df82be1104ba7bec83e Parents: 3efcdc5 03df4c7 Author: Yuki Morishita <yu...@apache.org> Authored: Fri Apr 1 12:45:48 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Apr 1 12:45:48 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/lifecycle/LogAwareFileLister.java | 23 ------- .../apache/cassandra/io/sstable/Descriptor.java | 20 +++++-- .../db/lifecycle/LogTransactionTest.java | 63 +++++++++++++++----- .../cassandra/io/sstable/DescriptorTest.java | 40 +++++++++---- 5 files changed, 90 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc37e618/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc37e618/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java index 59958bb,45b5844..9defa8d --- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java @@@ -514,12 -515,12 +515,12 @@@ public class LogTransactionTest extend // test listing Assert.assertEquals(sstables[0].getAllFilePaths().stream().map(File::new).collect(Collectors.toSet()), - LogAwareFileLister.getTemporaryFiles(dataFolder1)); + getTemporaryFiles(dataFolder1)); Assert.assertEquals(sstables[2].getAllFilePaths().stream().map(File::new).collect(Collectors.toSet()), - LogAwareFileLister.getTemporaryFiles(dataFolder2)); + getTemporaryFiles(dataFolder2)); // normally called at startup - LogTransaction.removeUnfinishedLeftovers(Arrays.asList(dataFolder1, dataFolder2)); + assertTrue(LogTransaction.removeUnfinishedLeftovers(Arrays.asList(dataFolder1, dataFolder2))); // new tables should be only table left assertFiles(dataFolder1.getPath(), new HashSet<>(sstables[1].getAllFilePaths())); @@@ -565,12 -566,12 +566,12 @@@ // test listing Assert.assertEquals(sstables[1].getAllFilePaths().stream().map(File::new).collect(Collectors.toSet()), - LogAwareFileLister.getTemporaryFiles(dataFolder1)); + getTemporaryFiles(dataFolder1)); Assert.assertEquals(sstables[3].getAllFilePaths().stream().map(File::new).collect(Collectors.toSet()), - LogAwareFileLister.getTemporaryFiles(dataFolder2)); + getTemporaryFiles(dataFolder2)); // normally called at startup - LogTransaction.removeUnfinishedLeftovers(Arrays.asList(dataFolder1, dataFolder2)); + assertTrue(LogTransaction.removeUnfinishedLeftovers(Arrays.asList(dataFolder1, dataFolder2))); // old tables should be only table left assertFiles(dataFolder1.getPath(), new HashSet<>(sstables[0].getAllFilePaths()));
