You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/07/25 17:59:06 UTC
[01/10] git commit: fix test for 2.0
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 d9cc6c1bf -> 60e56d4be
refs/heads/cassandra-2.1 34c030b3e -> b6d24bb99
refs/heads/cassandra-2.1.0 821d7a72d -> 66577d6c2
refs/heads/trunk 1440caea1 -> dcf9585f8
fix test for 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60e56d4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e56d4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e56d4b
Branch: refs/heads/cassandra-2.0
Commit: 60e56d4bebdd7889df88274540d58159b17a3364
Parents: d9cc6c1
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:37 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60e56d4b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index cc24111..f3e8fa7 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -137,7 +137,7 @@ public class RecoveryManagerTest extends SchemaLoader
Date date = CommitLogArchiver.format.parse("2112:12:12 12:12:12");
long timeMS = date.getTime();
- Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
+ Keyspace keyspace1 = Keyspace.open("Keyspace1");
DecoratedKey dk = Util.dk("dkey");
// Col 0 and 9 are the only ones to be recovered
@@ -149,9 +149,9 @@ public class RecoveryManagerTest extends SchemaLoader
else
ts = TimeUnit.MILLISECONDS.toMicros(timeMS + (i * 1000));
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
cf.addColumn(column("name-" + i, "value", ts));
- Mutation rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
+ RowMutation rm = new RowMutation("Keyspace1", dk.key, cf);
rm.apply();
}
[02/10] git commit: fix test for 2.0
Posted by br...@apache.org.
fix test for 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60e56d4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e56d4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e56d4b
Branch: refs/heads/cassandra-2.1.0
Commit: 60e56d4bebdd7889df88274540d58159b17a3364
Parents: d9cc6c1
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:37 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60e56d4b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index cc24111..f3e8fa7 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -137,7 +137,7 @@ public class RecoveryManagerTest extends SchemaLoader
Date date = CommitLogArchiver.format.parse("2112:12:12 12:12:12");
long timeMS = date.getTime();
- Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
+ Keyspace keyspace1 = Keyspace.open("Keyspace1");
DecoratedKey dk = Util.dk("dkey");
// Col 0 and 9 are the only ones to be recovered
@@ -149,9 +149,9 @@ public class RecoveryManagerTest extends SchemaLoader
else
ts = TimeUnit.MILLISECONDS.toMicros(timeMS + (i * 1000));
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
cf.addColumn(column("name-" + i, "value", ts));
- Mutation rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
+ RowMutation rm = new RowMutation("Keyspace1", dk.key, cf);
rm.apply();
}
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6d24bb9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6d24bb9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6d24bb9
Branch: refs/heads/trunk
Commit: b6d24bb992d89bf9a26cf370bfc1fafe9d69bd9b
Parents: 34c030b 66577d6
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:53 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:53 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66577d6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66577d6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66577d6c
Branch: refs/heads/cassandra-2.1
Commit: 66577d6c22666580dc8cbf9f5567cc5afc832447
Parents: 821d7a7 60e56d4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:46 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:46 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66577d6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66577d6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66577d6c
Branch: refs/heads/trunk
Commit: 66577d6c22666580dc8cbf9f5567cc5afc832447
Parents: 821d7a7 60e56d4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:46 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:46 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66577d6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66577d6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66577d6c
Branch: refs/heads/cassandra-2.1.0
Commit: 66577d6c22666580dc8cbf9f5567cc5afc832447
Parents: 821d7a7 60e56d4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:46 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:46 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6d24bb9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6d24bb9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6d24bb9
Branch: refs/heads/cassandra-2.1
Commit: b6d24bb992d89bf9a26cf370bfc1fafe9d69bd9b
Parents: 34c030b 66577d6
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:53 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:53 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/10] git commit: fix test for 2.0
Posted by br...@apache.org.
fix test for 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60e56d4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e56d4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e56d4b
Branch: refs/heads/trunk
Commit: 60e56d4bebdd7889df88274540d58159b17a3364
Parents: d9cc6c1
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:37 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60e56d4b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index cc24111..f3e8fa7 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -137,7 +137,7 @@ public class RecoveryManagerTest extends SchemaLoader
Date date = CommitLogArchiver.format.parse("2112:12:12 12:12:12");
long timeMS = date.getTime();
- Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
+ Keyspace keyspace1 = Keyspace.open("Keyspace1");
DecoratedKey dk = Util.dk("dkey");
// Col 0 and 9 are the only ones to be recovered
@@ -149,9 +149,9 @@ public class RecoveryManagerTest extends SchemaLoader
else
ts = TimeUnit.MILLISECONDS.toMicros(timeMS + (i * 1000));
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
cf.addColumn(column("name-" + i, "value", ts));
- Mutation rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
+ RowMutation rm = new RowMutation("Keyspace1", dk.key, cf);
rm.apply();
}
[03/10] git commit: fix test for 2.0
Posted by br...@apache.org.
fix test for 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60e56d4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e56d4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e56d4b
Branch: refs/heads/cassandra-2.1
Commit: 60e56d4bebdd7889df88274540d58159b17a3364
Parents: d9cc6c1
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:37 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60e56d4b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index cc24111..f3e8fa7 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -137,7 +137,7 @@ public class RecoveryManagerTest extends SchemaLoader
Date date = CommitLogArchiver.format.parse("2112:12:12 12:12:12");
long timeMS = date.getTime();
- Keyspace keyspace1 = Keyspace.open(KEYSPACE1);
+ Keyspace keyspace1 = Keyspace.open("Keyspace1");
DecoratedKey dk = Util.dk("dkey");
// Col 0 and 9 are the only ones to be recovered
@@ -149,9 +149,9 @@ public class RecoveryManagerTest extends SchemaLoader
else
ts = TimeUnit.MILLISECONDS.toMicros(timeMS + (i * 1000));
- ColumnFamily cf = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1");
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create("Keyspace1", "Standard1");
cf.addColumn(column("name-" + i, "value", ts));
- Mutation rm = new Mutation(KEYSPACE1, dk.getKey(), cf);
+ RowMutation rm = new RowMutation("Keyspace1", dk.key, cf);
rm.apply();
}
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/dcf9585f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dcf9585f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dcf9585f
Branch: refs/heads/trunk
Commit: dcf9585f8d885f165ed6581b532457f07ca922f4
Parents: 1440cae b6d24bb
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 10:58:59 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 10:58:59 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------