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 2018/06/07 10:53:22 UTC
[1/3] cassandra git commit: ninja: Fix bad CASSANDRA-13698 merge from
3.0 to 3.11
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 02e9ddfad -> 7bb88deb4
refs/heads/trunk d3b6a67bb -> 84fb7fa6f
ninja: Fix bad CASSANDRA-13698 merge from 3.0 to 3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bb88deb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bb88deb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bb88deb
Branch: refs/heads/cassandra-3.11
Commit: 7bb88deb4c6387fd67114543986774c903860de9
Parents: 02e9ddf
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Jun 7 07:47:21 2018 -0300
Committer: Paulo Motta <pa...@gmail.com>
Committed: Thu Jun 7 07:51:09 2018 -0300
----------------------------------------------------------------------
.../org/apache/cassandra/db/compaction/CompactionsTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb88deb/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
index ad138bf..c1bddd1 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@ -336,8 +336,8 @@ public class CompactionsTest
{
RowUpdateBuilder deletedRowUpdateBuilder = new RowUpdateBuilder(table, 1, Util.dk(Integer.toString(dk)));
deletedRowUpdateBuilder.clustering("01").add("val", "a"); //Range tombstone covers this (timestamp 2 > 1)
- Clustering startClustering = new Clustering(ByteBufferUtil.bytes("0"));
- Clustering endClustering = new Clustering(ByteBufferUtil.bytes("b"));
+ Clustering startClustering = Clustering.make(ByteBufferUtil.bytes("0"));
+ Clustering endClustering = Clustering.make(ByteBufferUtil.bytes("b"));
deletedRowUpdateBuilder.addRangeTombstone(new RangeTombstone(Slice.make(startClustering, endClustering), new DeletionTime(2, (int) (System.currentTimeMillis() / 1000))));
deletedRowUpdateBuilder.build().applyUnsafe();
@@ -389,8 +389,8 @@ public class CompactionsTest
{
k.add(p.partitionKey());
final SinglePartitionReadCommand command = SinglePartitionReadCommand.create(cfs.metadata, FBUtilities.nowInSeconds(), ColumnFilter.all(cfs.metadata), RowFilter.NONE, DataLimits.NONE, p.partitionKey(), new ClusteringIndexSliceFilter(Slices.ALL, false));
- try (ReadOrderGroup orderGroup = command.startOrderGroup();
- PartitionIterator iterator = command.executeInternal(orderGroup))
+ try (ReadExecutionController executionController = command.executionController();
+ PartitionIterator iterator = command.executeInternal(executionController))
{
try (RowIterator rowIterator = iterator.next())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] 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/84fb7fa6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84fb7fa6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84fb7fa6
Branch: refs/heads/trunk
Commit: 84fb7fa6f1b2f2771ba77a64f398cddd00bac914
Parents: d3b6a67 7bb88de
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Jun 7 07:51:44 2018 -0300
Committer: Paulo Motta <pa...@gmail.com>
Committed: Thu Jun 7 07:51:44 2018 -0300
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: ninja: Fix bad CASSANDRA-13698 merge from
3.0 to 3.11
Posted by pa...@apache.org.
ninja: Fix bad CASSANDRA-13698 merge from 3.0 to 3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bb88deb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bb88deb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bb88deb
Branch: refs/heads/trunk
Commit: 7bb88deb4c6387fd67114543986774c903860de9
Parents: 02e9ddf
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Jun 7 07:47:21 2018 -0300
Committer: Paulo Motta <pa...@gmail.com>
Committed: Thu Jun 7 07:51:09 2018 -0300
----------------------------------------------------------------------
.../org/apache/cassandra/db/compaction/CompactionsTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb88deb/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
index ad138bf..c1bddd1 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@ -336,8 +336,8 @@ public class CompactionsTest
{
RowUpdateBuilder deletedRowUpdateBuilder = new RowUpdateBuilder(table, 1, Util.dk(Integer.toString(dk)));
deletedRowUpdateBuilder.clustering("01").add("val", "a"); //Range tombstone covers this (timestamp 2 > 1)
- Clustering startClustering = new Clustering(ByteBufferUtil.bytes("0"));
- Clustering endClustering = new Clustering(ByteBufferUtil.bytes("b"));
+ Clustering startClustering = Clustering.make(ByteBufferUtil.bytes("0"));
+ Clustering endClustering = Clustering.make(ByteBufferUtil.bytes("b"));
deletedRowUpdateBuilder.addRangeTombstone(new RangeTombstone(Slice.make(startClustering, endClustering), new DeletionTime(2, (int) (System.currentTimeMillis() / 1000))));
deletedRowUpdateBuilder.build().applyUnsafe();
@@ -389,8 +389,8 @@ public class CompactionsTest
{
k.add(p.partitionKey());
final SinglePartitionReadCommand command = SinglePartitionReadCommand.create(cfs.metadata, FBUtilities.nowInSeconds(), ColumnFilter.all(cfs.metadata), RowFilter.NONE, DataLimits.NONE, p.partitionKey(), new ClusteringIndexSliceFilter(Slices.ALL, false));
- try (ReadOrderGroup orderGroup = command.startOrderGroup();
- PartitionIterator iterator = command.executeInternal(orderGroup))
+ try (ReadExecutionController executionController = command.executionController();
+ PartitionIterator iterator = command.executeInternal(executionController))
{
try (RowIterator rowIterator = iterator.next())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org