You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2017/03/04 23:40:44 UTC
[01/10] cassandra git commit:
org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 288d243d8 -> 44fefeffa
refs/heads/cassandra-3.0 e3968cfd1 -> 77d45ea53
refs/heads/cassandra-3.11 92b7322bb -> 7f5dc696f
refs/heads/trunk 979b19b7c -> 1b552658b
org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
patch by mkjellman, reviewed by jasobrown for CASSANDRA-13231
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44fefeff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44fefeff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44fefeff
Branch: refs/heads/cassandra-2.2
Commit: 44fefeffa53cf95223c4c7b6f79afaafe9b93e2e
Parents: 288d243
Author: Michael Kjellman <kj...@apple.com>
Authored: Sat Mar 4 04:57:34 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:37:19 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44fefeff/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 008e343..bc5b7bf 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -137,7 +137,7 @@ public class DirectoriesTest
}
@Test
- public void testStandardDirs()
+ public void testStandardDirs() throws IOException
{
for (CFMetaData cfm : CFM)
{
@@ -146,10 +146,10 @@ public class DirectoriesTest
Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, Descriptor.Type.FINAL);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[04/10] cassandra git commit:
org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
Posted by ja...@apache.org.
org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
patch by mkjellman, reviewed by jasobrown for CASSANDRA-13231
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44fefeff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44fefeff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44fefeff
Branch: refs/heads/trunk
Commit: 44fefeffa53cf95223c4c7b6f79afaafe9b93e2e
Parents: 288d243
Author: Michael Kjellman <kj...@apple.com>
Authored: Sat Mar 4 04:57:34 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:37:19 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44fefeff/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 008e343..bc5b7bf 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -137,7 +137,7 @@ public class DirectoriesTest
}
@Test
- public void testStandardDirs()
+ public void testStandardDirs() throws IOException
{
for (CFMetaData cfm : CFM)
{
@@ -146,10 +146,10 @@ public class DirectoriesTest
Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, Descriptor.Type.FINAL);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77d45ea5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77d45ea5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77d45ea5
Branch: refs/heads/cassandra-3.11
Commit: 77d45ea53ebabd92c02e1da8c143a2826b0cbd5d
Parents: e3968cf 44fefef
Author: Jason Brown <ja...@gmail.com>
Authored: Sat Mar 4 15:37:38 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:38:20 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d45ea5/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index f8d01a8,bc5b7bf..7c4ff7a
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -152,12 -144,12 +152,12 @@@ public class DirectoriesTes
Directories directories = new Directories(cfm);
assertEquals(cfDir(cfm), directories.getDirectoryForNewSSTables());
- Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, Descriptor.Type.FINAL);
+ Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77d45ea5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77d45ea5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77d45ea5
Branch: refs/heads/cassandra-3.0
Commit: 77d45ea53ebabd92c02e1da8c143a2826b0cbd5d
Parents: e3968cf 44fefef
Author: Jason Brown <ja...@gmail.com>
Authored: Sat Mar 4 15:37:38 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:38:20 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d45ea5/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index f8d01a8,bc5b7bf..7c4ff7a
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -152,12 -144,12 +152,12 @@@ public class DirectoriesTes
Directories directories = new Directories(cfm);
assertEquals(cfDir(cfm), directories.getDirectoryForNewSSTables());
- Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, Descriptor.Type.FINAL);
+ Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[03/10] cassandra git commit:
org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
Posted by ja...@apache.org.
org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
patch by mkjellman, reviewed by jasobrown for CASSANDRA-13231
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44fefeff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44fefeff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44fefeff
Branch: refs/heads/cassandra-3.11
Commit: 44fefeffa53cf95223c4c7b6f79afaafe9b93e2e
Parents: 288d243
Author: Michael Kjellman <kj...@apple.com>
Authored: Sat Mar 4 04:57:34 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:37:19 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44fefeff/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 008e343..bc5b7bf 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -137,7 +137,7 @@ public class DirectoriesTest
}
@Test
- public void testStandardDirs()
+ public void testStandardDirs() throws IOException
{
for (CFMetaData cfm : CFM)
{
@@ -146,10 +146,10 @@ public class DirectoriesTest
Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, Descriptor.Type.FINAL);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77d45ea5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77d45ea5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77d45ea5
Branch: refs/heads/trunk
Commit: 77d45ea53ebabd92c02e1da8c143a2826b0cbd5d
Parents: e3968cf 44fefef
Author: Jason Brown <ja...@gmail.com>
Authored: Sat Mar 4 15:37:38 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:38:20 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d45ea5/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index f8d01a8,bc5b7bf..7c4ff7a
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -152,12 -144,12 +152,12 @@@ public class DirectoriesTes
Directories directories = new Directories(cfm);
assertEquals(cfDir(cfm), directories.getDirectoryForNewSSTables());
- Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, Descriptor.Type.FINAL);
+ Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f5dc696
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f5dc696
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f5dc696
Branch: refs/heads/cassandra-3.11
Commit: 7f5dc696f6658d2e0a40c24276e858a1cf30ce85
Parents: 92b7322 77d45ea
Author: Jason Brown <ja...@gmail.com>
Authored: Sat Mar 4 15:38:39 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:39:11 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f5dc696/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 5841c36,7c4ff7a..7e800e6
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -156,12 -152,12 +156,12 @@@ public class DirectoriesTes
Directories directories = new Directories(cfm);
assertEquals(cfDir(cfm), directories.getDirectoryForNewSSTables());
- Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1);
+ Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, SSTableFormat.Type.BIG);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[02/10] cassandra git commit:
org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
Posted by ja...@apache.org.
org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
patch by mkjellman, reviewed by jasobrown for CASSANDRA-13231
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44fefeff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44fefeff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44fefeff
Branch: refs/heads/cassandra-3.0
Commit: 44fefeffa53cf95223c4c7b6f79afaafe9b93e2e
Parents: 288d243
Author: Michael Kjellman <kj...@apple.com>
Authored: Sat Mar 4 04:57:34 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:37:19 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44fefeff/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 008e343..bc5b7bf 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -137,7 +137,7 @@ public class DirectoriesTest
}
@Test
- public void testStandardDirs()
+ public void testStandardDirs() throws IOException
{
for (CFMetaData cfm : CFM)
{
@@ -146,10 +146,10 @@ public class DirectoriesTest
Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, Descriptor.Type.FINAL);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f5dc696
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f5dc696
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f5dc696
Branch: refs/heads/trunk
Commit: 7f5dc696f6658d2e0a40c24276e858a1cf30ce85
Parents: 92b7322 77d45ea
Author: Jason Brown <ja...@gmail.com>
Authored: Sat Mar 4 15:38:39 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:39:11 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f5dc696/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 5841c36,7c4ff7a..7e800e6
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -156,12 -152,12 +156,12 @@@ public class DirectoriesTes
Directories directories = new Directories(cfm);
assertEquals(cfDir(cfm), directories.getDirectoryForNewSSTables());
- Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1);
+ Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, SSTableFormat.Type.BIG);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b552658
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b552658
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b552658
Branch: refs/heads/trunk
Commit: 1b552658bdf132b3f8921f2fa22d8d3fdcf2a2b2
Parents: 979b19b 7f5dc69
Author: Jason Brown <ja...@gmail.com>
Authored: Sat Mar 4 15:39:28 2017 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Sat Mar 4 15:39:59 2017 -0800
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b552658/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 904354a,7e800e6..ffd4d3e
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -147,19 -149,19 +147,19 @@@ public class DirectoriesTes
}
@Test
- public void testStandardDirs()
+ public void testStandardDirs() throws IOException
{
- for (CFMetaData cfm : CFM)
+ for (TableMetadata cfm : CFM)
{
Directories directories = new Directories(cfm);
assertEquals(cfDir(cfm), directories.getDirectoryForNewSSTables());
- Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, SSTableFormat.Type.BIG);
+ Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.name, 1, SSTableFormat.Type.BIG);
File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42"));
+ assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42"));
File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc));
}
}