You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2017/11/30 23:19:57 UTC
[1/4] cassandra git commit: ninja: fix bad #14079 commit (add
removeUnsafe method used by AbstractCompactionStrategyTest)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 c253ed4fa -> d2e4ce489
refs/heads/trunk a01019d2c -> 88b244a13
ninja: fix bad #14079 commit (add removeUnsafe method used by AbstractCompactionStrategyTest)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2e4ce48
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2e4ce48
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2e4ce48
Branch: refs/heads/cassandra-3.11
Commit: d2e4ce48959bc56d9c366de20cd4c0f3c9bdf16b
Parents: c253ed4
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Dec 1 10:08:30 2017 +1100
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Dec 1 10:18:29 2017 +1100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/lifecycle/Tracker.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2e4ce48/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/lifecycle/Tracker.java b/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
index 6136f79..47efbce 100644
--- a/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
@@ -505,4 +505,12 @@ public class Tracker
{
return view.get();
}
+
+ @VisibleForTesting
+ public void removeUnsafe(Set<SSTableReader> toRemove)
+ {
+ Pair<View, View> result = apply(view -> {
+ return updateLiveSet(toRemove, emptySet()).apply(view);
+ });
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/4] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by pa...@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/f81e57e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f81e57e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f81e57e4
Branch: refs/heads/trunk
Commit: f81e57e4f6503260f9ba3a36d5d096ed8d97607f
Parents: a01019d d2e4ce4
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Dec 1 10:18:43 2017 +1100
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Dec 1 10:18:43 2017 +1100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/lifecycle/Tracker.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f81e57e4/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/4] cassandra git commit: ninja: fix bad #14079 merge (Fix
AbstractCompactionStrategyTest TableMetadataRef -> TableMetadata)
Posted by pa...@apache.org.
ninja: fix bad #14079 merge (Fix AbstractCompactionStrategyTest TableMetadataRef -> TableMetadata)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b244a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b244a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b244a1
Branch: refs/heads/trunk
Commit: 88b244a1380c44d36861b6d0be9c78c968d292c2
Parents: f81e57e
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Dec 1 10:13:59 2017 +1100
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Dec 1 10:19:24 2017 +1100
----------------------------------------------------------------------
.../cassandra/db/compaction/AbstractCompactionStrategyTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b244a1/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java
index 481b394..b77589d 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java
@@ -134,7 +134,7 @@ public class AbstractCompactionStrategyTest
long timestamp = System.currentTimeMillis();
DecoratedKey dk = Util.dk(String.format("%03d", key));
ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(table);
- new RowUpdateBuilder(cfs.metadata, timestamp, dk.getKey())
+ new RowUpdateBuilder(cfs.metadata(), timestamp, dk.getKey())
.clustering(String.valueOf(key))
.add("val", "val")
.build()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/4] cassandra git commit: ninja: fix bad #14079 commit (add
removeUnsafe method used by AbstractCompactionStrategyTest)
Posted by pa...@apache.org.
ninja: fix bad #14079 commit (add removeUnsafe method used by AbstractCompactionStrategyTest)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2e4ce48
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2e4ce48
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2e4ce48
Branch: refs/heads/trunk
Commit: d2e4ce48959bc56d9c366de20cd4c0f3c9bdf16b
Parents: c253ed4
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Dec 1 10:08:30 2017 +1100
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Dec 1 10:18:29 2017 +1100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/lifecycle/Tracker.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2e4ce48/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/lifecycle/Tracker.java b/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
index 6136f79..47efbce 100644
--- a/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
@@ -505,4 +505,12 @@ public class Tracker
{
return view.get();
}
+
+ @VisibleForTesting
+ public void removeUnsafe(Set<SSTableReader> toRemove)
+ {
+ Pair<View, View> result = apply(view -> {
+ return updateLiveSet(toRemove, emptySet()).apply(view);
+ });
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org