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/834031cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/834031cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/834031cc Branch: refs/heads/trunk Commit: 834031cc01d555714c15341ddbbd25243118cf96 Parents: 965c774 6d0e95a Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Fri Jul 14 10:52:30 2017 -0700 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Fri Jul 14 10:53:16 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/rows/AbstractCell.java | 2 +- test/unit/org/apache/cassandra/db/CellTest.java | 78 +++++++++++++++++++- 3 files changed, 79 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/834031cc/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 44b8ce8,8abf1f4..087bacc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -99,6 -2,8 +99,7 @@@ * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) Merged from 3.0: -3.0.15 + * Purge tombstones created by expired cells (CASSANDRA-13643) * Make concat work with iterators that have different subsets of columns (CASSANDRA-13482) * Set test.runners based on cores and memory size (CASSANDRA-13078) * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) http://git-wip-us.apache.org/repos/asf/cassandra/blob/834031cc/src/java/org/apache/cassandra/db/rows/AbstractCell.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/834031cc/test/unit/org/apache/cassandra/db/CellTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/CellTest.java index febfa3c,d69617e..906da8a --- a/test/unit/org/apache/cassandra/db/CellTest.java +++ b/test/unit/org/apache/cassandra/db/CellTest.java @@@ -325,15 -395,20 +396,20 @@@ public class CellTes return BufferCell.live(cdef, timestamp, ByteBufferUtil.bytes(value)); } - private Cell expiring(CFMetaData cfm, String columnName, String value, long timestamp, int localExpirationTime) + private Cell expiring(TableMetadata cfm, String columnName, String value, long timestamp, int localExpirationTime) { + return expiring(cfm, columnName, value, timestamp, 1, localExpirationTime); + } + - private Cell expiring(CFMetaData cfm, String columnName, String value, long timestamp, int ttl, int localExpirationTime) ++ private Cell expiring(TableMetadata cfm, String columnName, String value, long timestamp, int ttl, int localExpirationTime) + { - ColumnDefinition cdef = cfm.getColumnDefinition(ByteBufferUtil.bytes(columnName)); + ColumnMetadata cdef = cfm.getColumn(ByteBufferUtil.bytes(columnName)); - return new BufferCell(cdef, timestamp, 1, localExpirationTime, ByteBufferUtil.bytes(value), null); + return new BufferCell(cdef, timestamp, ttl, localExpirationTime, ByteBufferUtil.bytes(value), null); } - private Cell deleted(CFMetaData cfm, String columnName, int localDeletionTime, long timestamp) + private Cell deleted(TableMetadata cfm, String columnName, int localDeletionTime, long timestamp) { - ColumnDefinition cdef = cfm.getColumnDefinition(ByteBufferUtil.bytes(columnName)); + ColumnMetadata cdef = cfm.getColumn(ByteBufferUtil.bytes(columnName)); return BufferCell.tombstone(cdef, timestamp, localDeletionTime); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
