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/4b736366 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b736366 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b736366 Branch: refs/heads/trunk Commit: 4b736366c2a958e67dffa12ad776d850ba370752 Parents: 9c3354e e018bec Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Thu Aug 10 15:48:09 2017 -0700 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Thu Aug 10 15:49:20 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/rows/AbstractCell.java | 10 +++++++++- test/unit/org/apache/cassandra/db/CounterCellTest.java | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b736366/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b736366/src/java/org/apache/cassandra/db/rows/AbstractCell.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b736366/test/unit/org/apache/cassandra/db/CounterCellTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/CounterCellTest.java index 8c1347d,74599c3..b10a9c7 --- a/test/unit/org/apache/cassandra/db/CounterCellTest.java +++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java @@@ -272,11 -272,11 +272,11 @@@ public class CounterCellTes Cell original = createCounterCellFromContext(cfs, col, state, 5); - ColumnDefinition cDef = cfs.metadata.getColumnDefinition(col); + ColumnMetadata cDef = cfs.metadata().getColumn(col); Cell cleared = BufferCell.live(cDef, 5, CounterContext.instance().clearAllLocal(state.context)); - CounterContext.instance().updateDigest(digest1, original.value()); - CounterContext.instance().updateDigest(digest2, cleared.value()); + original.digest(digest1); + cleared.digest(digest2); assert Arrays.equals(digest1.digest(), digest2.digest()); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org