You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/05/21 05:47:57 UTC
[1/3] git commit: fix DirectoriesTest for Windows patch by Josh
McKenzie; reviewed by jbellis for CASSANDRA-7251
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 cf60ca86a -> a42b4e584
refs/heads/trunk 406c3387d -> c89c37802
fix DirectoriesTest for Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7251
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a42b4e58
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a42b4e58
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a42b4e58
Branch: refs/heads/cassandra-2.1
Commit: a42b4e584842a3104652fa2c0092f9306f935f26
Parents: cf60ca8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue May 20 22:47:46 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue May 20 22:47:46 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a42b4e58/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 05e0beb..1b9409a 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -199,7 +199,8 @@ public class DirectoriesTest
dd.location.setWritable(false);
}
- CFMetaData cfm = new CFMetaData(KS, "bad", ColumnFamilyType.Standard, null);
+ // nested folders in /tmp is enough to fail on *nix but we need to pass the 255 char limit to get a failure on Windows and blacklist
+ CFMetaData cfm = new CFMetaData(KS, "badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbad", ColumnFamilyType.Standard, null);
Directories dir = new Directories(cfm);
for (File file : dir.getCFDirectories())
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c89c3780
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c89c3780
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c89c3780
Branch: refs/heads/trunk
Commit: c89c37802ab2ba1902b511323dafebce328e1f00
Parents: 406c338 a42b4e5
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue May 20 22:47:51 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue May 20 22:47:51 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: fix DirectoriesTest for Windows patch by Josh
McKenzie; reviewed by jbellis for CASSANDRA-7251
Posted by jb...@apache.org.
fix DirectoriesTest for Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7251
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a42b4e58
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a42b4e58
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a42b4e58
Branch: refs/heads/trunk
Commit: a42b4e584842a3104652fa2c0092f9306f935f26
Parents: cf60ca8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue May 20 22:47:46 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue May 20 22:47:46 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/DirectoriesTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a42b4e58/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 05e0beb..1b9409a 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -199,7 +199,8 @@ public class DirectoriesTest
dd.location.setWritable(false);
}
- CFMetaData cfm = new CFMetaData(KS, "bad", ColumnFamilyType.Standard, null);
+ // nested folders in /tmp is enough to fail on *nix but we need to pass the 255 char limit to get a failure on Windows and blacklist
+ CFMetaData cfm = new CFMetaData(KS, "badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbad", ColumnFamilyType.Standard, null);
Directories dir = new Directories(cfm);
for (File file : dir.getCFDirectories())