natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into trunk

This commit is contained in:
Sam Tunnicliffe 2015-10-28 17:15:10 +00:00
parent a4fe865d4f 5034f44957
commit 74ee6684ca
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -5,6 +5,7 @@
3.0
* Fix thrift cas operations with defined columns (CASSANDRA-10576)
* Fix PartitionUpdate.operationCount()for updates with static column operations (CASSANDRA-10606)
* Fix thrift get() queries with defined columns (CASSANDRA-10586)
* Fix marking of indexes as built and removed (CASSANDRA-10601)

40
src/java/org/apache/cassandra/thrift/CassandraServer.java
View File

@ -945,15 +945,11 @@ public class CassandraServer implements Cassandra.Iface
// Indexed column values cannot be larger than 64K. See CASSANDRA-3057/4240 for more details
Keyspace.open(metadata.ksName).getColumnFamilyStore(metadata.cfName).indexManager.validate(partitionUpdates);
FilteredPartition partitionExpected = null;
if (!expected.isEmpty())
partitionExpected = FilteredPartition.create(LegacyLayout.toRowIterator(metadata, dk, toLegacyCells(metadata, expected, nowInSec).iterator(), nowInSec));
schedule(DatabaseDescriptor.getWriteRpcTimeout());
try (RowIterator result = StorageProxy.cas(cState.getKeyspace(),
column_family,
dk,
new ThriftCASRequest(partitionExpected, partitionUpdates),
new ThriftCASRequest(toLegacyCells(metadata, expected, nowInSec), partitionUpdates, nowInSec),
ThriftConversion.fromThrift(serial_consistency_level),
ThriftConversion.fromThrift(commit_consistency_level),
cState))
@ -2509,21 +2505,22 @@ public class CassandraServer implements Cassandra.Iface
{
private final CFMetaData metadata;
private final DecoratedKey key;
private final FilteredPartition expected;
private final List<LegacyLayout.LegacyCell> expected;
private final PartitionUpdate updates;
private final int nowInSec;
private ThriftCASRequest(FilteredPartition expected, PartitionUpdate updates)
private ThriftCASRequest(List<LegacyLayout.LegacyCell> expected, PartitionUpdate updates, int nowInSec)
{
this.metadata = updates.metadata();
this.key = updates.partitionKey();
this.expected = expected;
this.updates = updates;
this.nowInSec = nowInSec;
}
public SinglePartitionReadCommand readCommand(int nowInSec)
{
if (expected == null || expected.isEmpty())
if (expected.isEmpty())
{
// We want to know if the partition exists, so just fetch a single cell.
ClusteringIndexSliceFilter filter = new ClusteringIndexSliceFilter(Slices.ALL, false);
@ -2533,9 +2530,13 @@ public class CassandraServer implements Cassandra.Iface
// Gather the clustering for the expected values and query those.
BTreeSet.Builder<Clustering> clusterings = BTreeSet.builder(metadata.comparator);
for (Row row : expected)
FilteredPartition expectedPartition =
FilteredPartition.create(LegacyLayout.toRowIterator(metadata, key, expected.iterator(), nowInSec));
for (Row row : expectedPartition)
clusterings.add(row.clustering());
PartitionColumns columns = expected.staticRow().isEmpty()
PartitionColumns columns = expectedPartition.staticRow().isEmpty()
? metadata.partitionColumns().withoutStatics()
: metadata.partitionColumns();
ClusteringIndexNamesFilter filter = new ClusteringIndexNamesFilter(clusterings.build(), false);
@ -2544,13 +2545,21 @@ public class CassandraServer implements Cassandra.Iface
public boolean appliesTo(FilteredPartition current)
{
if (expected == null || expected.isEmpty())
if (expected.isEmpty())
return current.isEmpty();
else if (current.isEmpty())
return false;
// Push the expected results through ThriftResultsMerger to translate any static
// columns into clusterings. The current partition is retrieved in the same so
// unless they're both handled the same, they won't match.
FilteredPartition expectedPartition =
FilteredPartition.create(
UnfilteredRowIterators.filter(
ThriftResultsMerger.maybeWrap(expectedToUnfilteredRowIterator(), nowInSec), nowInSec));
// Check that for everything we expected, the fetched values exists and correspond.
for (Row e : expected)
for (Row e : expectedPartition)
{
Row c = current.getRow(e.clustering());
if (c == null)
@ -2588,5 +2597,10 @@ public class CassandraServer implements Cassandra.Iface
{
return updates;
}
private UnfilteredRowIterator expectedToUnfilteredRowIterator()
{
return LegacyLayout.toUnfilteredRowIterator(metadata, key, LegacyLayout.LegacyDeletionInfo.live(), expected.iterator());
}
}
}