Repository: cassandra Updated Branches: refs/heads/trunk ce643ff99 -> 04389ad5e
simplify Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04389ad5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04389ad5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04389ad5 Branch: refs/heads/trunk Commit: 04389ad5ef879ae809db925bf46bad60b60fa454 Parents: ce643ff Author: Dave Brosius <[email protected]> Authored: Sun Mar 29 21:35:20 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Mar 29 21:35:20 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Directories.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04389ad5/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java index a5be956..76171f0 100644 --- a/src/java/org/apache/cassandra/db/Directories.java +++ b/src/java/org/apache/cassandra/db/Directories.java @@ -193,10 +193,11 @@ public class Directories this.dataPaths = new File[dataDirectories.length]; // If upgraded from version less than 2.1, use existing directories + String oldSSTableRelativePath = join(metadata.ksName, metadata.cfName); for (int i = 0; i < dataDirectories.length; ++i) { // check if old SSTable directory exists - dataPaths[i] = new File(dataDirectories[i].location, join(metadata.ksName, metadata.cfName)); + dataPaths[i] = new File(dataDirectories[i].location, oldSSTableRelativePath); } boolean olderDirectoryExists = Iterables.any(Arrays.asList(dataPaths), new Predicate<File>() { @@ -208,8 +209,10 @@ public class Directories if (!olderDirectoryExists) { // use 2.1-style path names + + String newSSTableRelativePath = join(metadata.ksName, directoryName); for (int i = 0; i < dataDirectories.length; ++i) - dataPaths[i] = new File(dataDirectories[i].location, join(metadata.ksName, directoryName)); + dataPaths[i] = new File(dataDirectories[i].location, newSSTableRelativePath); } for (File dir : dataPaths)
