You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2017/08/01 14:41:22 UTC
[1/6] cassandra git commit: Fix incorrect [2.1 <- 3.0] serialization
of counter cells created in 2.0
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 9dc896f4e -> ba7128977
refs/heads/cassandra-3.11 99196cb72 -> 92d1cfec2
refs/heads/trunk de60cf075 -> fbcec0cc4
Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0
Also fixes calculation of legacy counter update cells' serialized size.
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-13691
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba712897
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba712897
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba712897
Branch: refs/heads/cassandra-3.0
Commit: ba71289778369e71d9abbdb93cb6b91ba67f9c85
Parents: 9dc896f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jul 13 14:47:18 2017 -0700
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Tue Aug 1 15:24:55 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 +-
.../apache/cassandra/cql3/UpdateParameters.java | 7 ++-
.../org/apache/cassandra/db/LegacyLayout.java | 23 ++++++---
.../cassandra/db/context/CounterContext.java | 52 ++++++++++++++------
.../cassandra/thrift/CassandraServer.java | 4 +-
.../org/apache/cassandra/utils/CounterId.java | 3 +-
.../db/context/CounterContextTest.java | 34 ++++++++++++-
7 files changed, 98 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e3f5fe6..4038ac7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
* Fix invalid writetime for null cells (CASSANDRA-13711)
* Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
* Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
@@ -19,6 +20,7 @@
Merged from 2.1:
* Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700)
+
3.0.14
* Ensure int overflow doesn't occur when calculating large partition warning size (CASSANDRA-13172)
* Ensure consistent view of partition columns between coordinator and replica in ColumnFilter (CASSANDRA-13004)
@@ -45,6 +47,7 @@ Merged from 2.2:
* Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
+
3.0.13
* Make reading of range tombstones more reliable (CASSANDRA-12811)
* Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
@@ -170,7 +173,6 @@ Merged from 2.1:
* cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)
-
3.0.10
* Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
* Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index d902dec..8ff5344 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -162,12 +162,15 @@ public class UpdateParameters
// "counter update", which is a temporary state until we run into 'CounterMutation.updateWithCurrentValue()'
// which does the read-before-write and sets the proper CounterId, clock and updated value.
//
- // We thus create a "fake" local shard here. The CounterId/clock used don't matter as this is just a temporary
+ // We thus create a "fake" local shard here. The clock used doesn't matter as this is just a temporary
// state that will be replaced when processing the mutation in CounterMutation, but the reason we use a 'local'
// shard is due to the merging rules: if a user includes multiple updates to the same counter in a batch, those
// multiple updates will be merged in the PartitionUpdate *before* they even reach CounterMutation. So we need
// such update to be added together, and that's what a local shard gives us.
- builder.addCell(BufferCell.live(metadata, column, timestamp, CounterContext.instance().createLocal(increment)));
+ //
+ // We set counterid to a special value to differentiate between regular pre-2.0 local shards from pre-2.1 era
+ // and "counter update" temporary state cells. Please see CounterContext.createUpdate() for further details.
+ builder.addCell(BufferCell.live(metadata, column, timestamp, CounterContext.instance().createUpdate(increment)));
}
public void setComplexDeletionTime(ColumnDefinition column)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/db/LegacyLayout.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/LegacyLayout.java b/src/java/org/apache/cassandra/db/LegacyLayout.java
index 669fb1c..4f7bc22 100644
--- a/src/java/org/apache/cassandra/db/LegacyLayout.java
+++ b/src/java/org/apache/cassandra/db/LegacyLayout.java
@@ -511,12 +511,12 @@ public abstract class LegacyLayout
{
size += ByteBufferUtil.serializedSizeWithShortLength(cell.name.encode(partition.metadata()));
size += 1; // serialization flags
- if (cell.kind == LegacyLayout.LegacyCell.Kind.EXPIRING)
+ if (cell.isExpiring())
{
size += TypeSizes.sizeof(cell.ttl);
size += TypeSizes.sizeof(cell.localDeletionTime);
}
- else if (cell.kind == LegacyLayout.LegacyCell.Kind.DELETED)
+ else if (cell.isTombstone())
{
size += TypeSizes.sizeof(cell.timestamp);
// localDeletionTime replaces cell.value as the body
@@ -524,7 +524,14 @@ public abstract class LegacyLayout
size += TypeSizes.sizeof(cell.localDeletionTime);
continue;
}
- else if (cell.kind == LegacyLayout.LegacyCell.Kind.COUNTER)
+ else if (cell.isCounterUpdate())
+ {
+ size += TypeSizes.sizeof(cell.timestamp);
+ long count = CounterContext.instance().getLocalCount(cell.value);
+ size += ByteBufferUtil.serializedSizeWithLength(ByteBufferUtil.bytes(count));
+ continue;
+ }
+ else if (cell.isCounter())
{
size += TypeSizes.sizeof(Long.MIN_VALUE); // timestampOfLastDelete
}
@@ -1073,7 +1080,7 @@ public abstract class LegacyLayout
ByteBuffer value = ByteBufferUtil.readWithLength(in);
LegacyCellName name = decodeCellName(metadata, cellname, readAllAsDynamic);
return (mask & COUNTER_UPDATE_MASK) != 0
- ? new LegacyCell(LegacyCell.Kind.COUNTER, name, CounterContext.instance().createLocal(ByteBufferUtil.toLong(value)), ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
+ ? new LegacyCell(LegacyCell.Kind.COUNTER, name, CounterContext.instance().createUpdate(ByteBufferUtil.toLong(value)), ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
: ((mask & DELETION_MASK) == 0
? new LegacyCell(LegacyCell.Kind.REGULAR, name, value, ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
: new LegacyCell(LegacyCell.Kind.DELETED, name, ByteBufferUtil.EMPTY_BYTE_BUFFER, ts, ByteBufferUtil.toInt(value), Cell.NO_TTL));
@@ -1489,11 +1496,11 @@ public abstract class LegacyLayout
return new LegacyCell(Kind.DELETED, decodeCellName(metadata, superColumnName, name), ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp, nowInSec, LivenessInfo.NO_TTL);
}
- public static LegacyCell counter(CFMetaData metadata, ByteBuffer superColumnName, ByteBuffer name, long value)
+ public static LegacyCell counterUpdate(CFMetaData metadata, ByteBuffer superColumnName, ByteBuffer name, long value)
throws UnknownColumnException
{
// See UpdateParameters.addCounter() for more details on this
- ByteBuffer counterValue = CounterContext.instance().createLocal(value);
+ ByteBuffer counterValue = CounterContext.instance().createUpdate(value);
return counter(decodeCellName(metadata, superColumnName, name), counterValue);
}
@@ -1515,10 +1522,10 @@ public abstract class LegacyLayout
return 0;
}
- private boolean isCounterUpdate()
+ public boolean isCounterUpdate()
{
// See UpdateParameters.addCounter() for more details on this
- return isCounter() && CounterContext.instance().isLocal(value);
+ return isCounter() && CounterContext.instance().isUpdate(value);
}
public ClusteringPrefix clustering()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/db/context/CounterContext.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java
index e3f4dfd..29e5cfc 100644
--- a/src/java/org/apache/cassandra/db/context/CounterContext.java
+++ b/src/java/org/apache/cassandra/db/context/CounterContext.java
@@ -81,6 +81,14 @@ public class CounterContext
private static final int COUNT_LENGTH = TypeSizes.sizeof(Long.MAX_VALUE);
private static final int STEP_LENGTH = CounterId.LENGTH + CLOCK_LENGTH + COUNT_LENGTH;
+ /*
+ * A special hard-coded value we use for clock ids to differentiate between regular local shards
+ * and 'fake' local shards used to emulate pre-3.0 CounterUpdateCell-s in UpdateParameters.
+ *
+ * Important for handling counter writes and reads during rolling 2.1/2.2 -> 3.0 upgrades.
+ */
+ static final CounterId UPDATE_CLOCK_ID = CounterId.fromInt(0);
+
private static final Logger logger = LoggerFactory.getLogger(CounterContext.class);
public static enum Relationship
@@ -100,6 +108,35 @@ public class CounterContext
}
/**
+ * Creates a counter context with a single local shard with clock id of UPDATE_CLOCK_ID.
+ *
+ * This is only used in a PartitionUpdate until the update has gone through
+ * CounterMutation.apply(), at which point this special local shard will be replaced by a regular global one.
+ * It should never hit commitlog / memtable / disk, but can hit network.
+ *
+ * We use this so that if an update statement has multiple increments of the same counter we properly
+ * add them rather than keeping only one of them.
+ *
+ * NOTE: Before CASSANDRA-13691 we used a regular local shard without a hard-coded clock id value here.
+ * It was problematic, because it was possible to return a false positive, and on read path encode an old counter
+ * cell from 2.0 era with a regular local shard as a counter update, and to break the 2.1 coordinator.
+ */
+ public ByteBuffer createUpdate(long count)
+ {
+ ContextState state = ContextState.allocate(0, 1, 0);
+ state.writeLocal(UPDATE_CLOCK_ID, 1L, count);
+ return state.context;
+ }
+
+ /**
+ * Checks if a context is an update (see createUpdate() for justification).
+ */
+ public boolean isUpdate(ByteBuffer context)
+ {
+ return ContextState.wrap(context).getCounterId().equals(UPDATE_CLOCK_ID);
+ }
+
+ /**
* Creates a counter context with a single global, 2.1+ shard (a result of increment).
*/
public ByteBuffer createGlobal(CounterId id, long clock, long count)
@@ -111,12 +148,7 @@ public class CounterContext
/**
* Creates a counter context with a single local shard.
- * This is only used in a PartitionUpdate until the update has gone through
- * CounterMutation.apply(), at which point all the local shard are replaced by
- * global ones. In other words, local shards should never hit the disk or
- * memtables. And we use this so that if an update statement has multiple increment
- * of the same counter we properly add them rather than keeping only one of them.
- * (this is also used for tests of compatibility with pre-2.1 counters)
+ * For use by tests of compatibility with pre-2.1 counters only.
*/
public ByteBuffer createLocal(long count)
{
@@ -682,14 +714,6 @@ public class CounterContext
}
/**
- * Checks if a context is local
- */
- public boolean isLocal(ByteBuffer context)
- {
- return ContextState.wrap(context).isLocal();
- }
-
- /**
* Returns the clock and the count associated with the given counter id, or (0, 0) if no such shard is present.
*/
@VisibleForTesting
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 0dec94e..86caac3 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1016,7 +1016,7 @@ public class CassandraServer implements Cassandra.Iface
private LegacyLayout.LegacyCell toCounterLegacyCell(CFMetaData metadata, ByteBuffer superColumnName, CounterColumn column)
throws UnknownColumnException
{
- return LegacyLayout.LegacyCell.counter(metadata, superColumnName, column.name, column.value);
+ return LegacyLayout.LegacyCell.counterUpdate(metadata, superColumnName, column.name, column.value);
}
private void sortAndMerge(CFMetaData metadata, List<LegacyLayout.LegacyCell> cells, int nowInSec)
@@ -2169,7 +2169,7 @@ public class CassandraServer implements Cassandra.Iface
LegacyLayout.LegacyCellName name = LegacyLayout.decodeCellName(metadata, column_parent.super_column, column.name);
// See UpdateParameters.addCounter() for more details on this
- ByteBuffer value = CounterContext.instance().createLocal(column.value);
+ ByteBuffer value = CounterContext.instance().createUpdate(column.value);
CellPath path = name.collectionElement == null ? null : CellPath.create(name.collectionElement);
Cell cell = BufferCell.live(metadata, name.column, FBUtilities.timestampMicros(), value, path);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/utils/CounterId.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CounterId.java b/src/java/org/apache/cassandra/utils/CounterId.java
index 2552178..690d4aa 100644
--- a/src/java/org/apache/cassandra/utils/CounterId.java
+++ b/src/java/org/apache/cassandra/utils/CounterId.java
@@ -46,10 +46,11 @@ public class CounterId implements Comparable<CounterId>
}
/**
- * Function for test purposes, do not use otherwise.
* Pack an int in a valid CounterId so that the resulting ids respects the
* numerical ordering. Used for creating handcrafted but easy to
* understand contexts in unit tests (see CounterContextTest).
+ *
+ * Also used to generate a special ID for special-case update contexts (see CounterContext.createUpdate()).
*/
public static CounterId fromInt(int n)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
index 4f587c6..a8852f7 100644
--- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
+++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
@@ -28,17 +28,19 @@ import org.junit.Test;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ClockAndCount;
+import org.apache.cassandra.db.LegacyLayout.LegacyCell;
import org.apache.cassandra.db.context.CounterContext.Relationship;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CounterId;
-import static org.apache.cassandra.db.context.CounterContext.ContextState;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.apache.cassandra.db.context.CounterContext.ContextState;
+
public class CounterContextTest
{
private static final CounterContext cc = new CounterContext();
@@ -542,4 +544,34 @@ public class CounterContextTest
assertEquals(ClockAndCount.create(0L, 0L), cc.getClockAndCountOf(state.context, CounterId.fromInt(15)));
assertEquals(ClockAndCount.create(0L, 0L), cc.getClockAndCountOf(state.context, CounterId.fromInt(20)));
}
+
+ @Test // see CASSANDRA-13691
+ public void testCounterUpdate()
+ {
+ /*
+ * a context with just one 'update' shard - a local shard with a hardcoded value of CounterContext.UPDATE_CLOCK_ID
+ */
+
+ ByteBuffer updateContext = CounterContext.instance().createUpdate(10L);
+
+ assertEquals(ClockAndCount.create(1L, 10L), cc.getClockAndCountOf(updateContext, CounterContext.UPDATE_CLOCK_ID));
+ assertTrue(cc.isUpdate(updateContext));
+ LegacyCell updateCell = LegacyCell.counter(null, updateContext);
+ assertTrue(updateCell.isCounterUpdate());
+
+
+ /*
+ * a context with a regular local shard sorting first and a couple others in it - should *not* be identified as an update
+ */
+
+ ContextState notUpdateContextState = ContextState.allocate(1, 1, 1);
+ notUpdateContextState.writeLocal( CounterId.fromInt(1), 1L, 10L);
+ notUpdateContextState.writeRemote(CounterId.fromInt(2), 1L, 10L);
+ notUpdateContextState.writeGlobal(CounterId.fromInt(3), 1L, 10L);
+ ByteBuffer notUpdateContext = notUpdateContextState.context;
+
+ assertFalse(cc.isUpdate(notUpdateContext));
+ LegacyCell notUpdateCell = LegacyCell.counter(null, notUpdateContext);
+ assertFalse(notUpdateCell.isCounterUpdate());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by al...@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/fbcec0cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbcec0cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbcec0cc
Branch: refs/heads/trunk
Commit: fbcec0cc465dddc81134a15c42b292c35d3316b2
Parents: de60cf0 92d1cfe
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Tue Aug 1 15:40:23 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Tue Aug 1 15:40:23 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/cql3/UpdateParameters.java | 7 ++-
.../cassandra/db/context/CounterContext.java | 52 ++++++++++++++------
.../org/apache/cassandra/utils/CounterId.java | 3 +-
.../db/context/CounterContextTest.java | 29 ++++++++++-
5 files changed, 75 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbcec0cc/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbcec0cc/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 7f6ba22,25f04fb..8faf1c6
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@@ -165,10 -167,13 +165,13 @@@ public class UpdateParameter
// shard is due to the merging rules: if a user includes multiple updates to the same counter in a batch, those
// multiple updates will be merged in the PartitionUpdate *before* they even reach CounterMutation. So we need
// such update to be added together, and that's what a local shard gives us.
- builder.addCell(BufferCell.live(column, timestamp, CounterContext.instance().createLocal(increment)));
+ //
+ // We set counterid to a special value to differentiate between regular pre-2.0 local shards from pre-2.1 era
+ // and "counter update" temporary state cells. Please see CounterContext.createUpdate() for further details.
+ builder.addCell(BufferCell.live(column, timestamp, CounterContext.instance().createUpdate(increment)));
}
- public void setComplexDeletionTime(ColumnDefinition column)
+ public void setComplexDeletionTime(ColumnMetadata column)
{
builder.addComplexDeletion(column, deletionTime);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbcec0cc/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/context/CounterContextTest.java
index 72e9548,6994046..4600137
--- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
+++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
@@@ -542,4 -544,34 +543,30 @@@ public class CounterContextTes
assertEquals(ClockAndCount.create(0L, 0L), cc.getClockAndCountOf(state.context, CounterId.fromInt(15)));
assertEquals(ClockAndCount.create(0L, 0L), cc.getClockAndCountOf(state.context, CounterId.fromInt(20)));
}
+
+ @Test // see CASSANDRA-13691
+ public void testCounterUpdate()
+ {
+ /*
+ * a context with just one 'update' shard - a local shard with a hardcoded value of CounterContext.UPDATE_CLOCK_ID
+ */
+
+ ByteBuffer updateContext = CounterContext.instance().createUpdate(10L);
+
+ assertEquals(ClockAndCount.create(1L, 10L), cc.getClockAndCountOf(updateContext, CounterContext.UPDATE_CLOCK_ID));
+ assertTrue(cc.isUpdate(updateContext));
- LegacyCell updateCell = LegacyCell.counter(null, updateContext);
- assertTrue(updateCell.isCounterUpdate());
+
+
+ /*
+ * a context with a regular local shard sorting first and a couple others in it - should *not* be identified as an update
+ */
+
+ ContextState notUpdateContextState = ContextState.allocate(1, 1, 1);
+ notUpdateContextState.writeLocal( CounterId.fromInt(1), 1L, 10L);
+ notUpdateContextState.writeRemote(CounterId.fromInt(2), 1L, 10L);
+ notUpdateContextState.writeGlobal(CounterId.fromInt(3), 1L, 10L);
+ ByteBuffer notUpdateContext = notUpdateContextState.context;
+
+ assertFalse(cc.isUpdate(notUpdateContext));
- LegacyCell notUpdateCell = LegacyCell.counter(null, notUpdateContext);
- assertFalse(notUpdateCell.isCounterUpdate());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Fix incorrect [2.1 <- 3.0] serialization
of counter cells created in 2.0
Posted by al...@apache.org.
Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0
Also fixes calculation of legacy counter update cells' serialized size.
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-13691
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba712897
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba712897
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba712897
Branch: refs/heads/cassandra-3.11
Commit: ba71289778369e71d9abbdb93cb6b91ba67f9c85
Parents: 9dc896f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jul 13 14:47:18 2017 -0700
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Tue Aug 1 15:24:55 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 +-
.../apache/cassandra/cql3/UpdateParameters.java | 7 ++-
.../org/apache/cassandra/db/LegacyLayout.java | 23 ++++++---
.../cassandra/db/context/CounterContext.java | 52 ++++++++++++++------
.../cassandra/thrift/CassandraServer.java | 4 +-
.../org/apache/cassandra/utils/CounterId.java | 3 +-
.../db/context/CounterContextTest.java | 34 ++++++++++++-
7 files changed, 98 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e3f5fe6..4038ac7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
* Fix invalid writetime for null cells (CASSANDRA-13711)
* Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
* Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
@@ -19,6 +20,7 @@
Merged from 2.1:
* Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700)
+
3.0.14
* Ensure int overflow doesn't occur when calculating large partition warning size (CASSANDRA-13172)
* Ensure consistent view of partition columns between coordinator and replica in ColumnFilter (CASSANDRA-13004)
@@ -45,6 +47,7 @@ Merged from 2.2:
* Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
+
3.0.13
* Make reading of range tombstones more reliable (CASSANDRA-12811)
* Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
@@ -170,7 +173,6 @@ Merged from 2.1:
* cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)
-
3.0.10
* Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
* Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index d902dec..8ff5344 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -162,12 +162,15 @@ public class UpdateParameters
// "counter update", which is a temporary state until we run into 'CounterMutation.updateWithCurrentValue()'
// which does the read-before-write and sets the proper CounterId, clock and updated value.
//
- // We thus create a "fake" local shard here. The CounterId/clock used don't matter as this is just a temporary
+ // We thus create a "fake" local shard here. The clock used doesn't matter as this is just a temporary
// state that will be replaced when processing the mutation in CounterMutation, but the reason we use a 'local'
// shard is due to the merging rules: if a user includes multiple updates to the same counter in a batch, those
// multiple updates will be merged in the PartitionUpdate *before* they even reach CounterMutation. So we need
// such update to be added together, and that's what a local shard gives us.
- builder.addCell(BufferCell.live(metadata, column, timestamp, CounterContext.instance().createLocal(increment)));
+ //
+ // We set counterid to a special value to differentiate between regular pre-2.0 local shards from pre-2.1 era
+ // and "counter update" temporary state cells. Please see CounterContext.createUpdate() for further details.
+ builder.addCell(BufferCell.live(metadata, column, timestamp, CounterContext.instance().createUpdate(increment)));
}
public void setComplexDeletionTime(ColumnDefinition column)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/db/LegacyLayout.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/LegacyLayout.java b/src/java/org/apache/cassandra/db/LegacyLayout.java
index 669fb1c..4f7bc22 100644
--- a/src/java/org/apache/cassandra/db/LegacyLayout.java
+++ b/src/java/org/apache/cassandra/db/LegacyLayout.java
@@ -511,12 +511,12 @@ public abstract class LegacyLayout
{
size += ByteBufferUtil.serializedSizeWithShortLength(cell.name.encode(partition.metadata()));
size += 1; // serialization flags
- if (cell.kind == LegacyLayout.LegacyCell.Kind.EXPIRING)
+ if (cell.isExpiring())
{
size += TypeSizes.sizeof(cell.ttl);
size += TypeSizes.sizeof(cell.localDeletionTime);
}
- else if (cell.kind == LegacyLayout.LegacyCell.Kind.DELETED)
+ else if (cell.isTombstone())
{
size += TypeSizes.sizeof(cell.timestamp);
// localDeletionTime replaces cell.value as the body
@@ -524,7 +524,14 @@ public abstract class LegacyLayout
size += TypeSizes.sizeof(cell.localDeletionTime);
continue;
}
- else if (cell.kind == LegacyLayout.LegacyCell.Kind.COUNTER)
+ else if (cell.isCounterUpdate())
+ {
+ size += TypeSizes.sizeof(cell.timestamp);
+ long count = CounterContext.instance().getLocalCount(cell.value);
+ size += ByteBufferUtil.serializedSizeWithLength(ByteBufferUtil.bytes(count));
+ continue;
+ }
+ else if (cell.isCounter())
{
size += TypeSizes.sizeof(Long.MIN_VALUE); // timestampOfLastDelete
}
@@ -1073,7 +1080,7 @@ public abstract class LegacyLayout
ByteBuffer value = ByteBufferUtil.readWithLength(in);
LegacyCellName name = decodeCellName(metadata, cellname, readAllAsDynamic);
return (mask & COUNTER_UPDATE_MASK) != 0
- ? new LegacyCell(LegacyCell.Kind.COUNTER, name, CounterContext.instance().createLocal(ByteBufferUtil.toLong(value)), ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
+ ? new LegacyCell(LegacyCell.Kind.COUNTER, name, CounterContext.instance().createUpdate(ByteBufferUtil.toLong(value)), ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
: ((mask & DELETION_MASK) == 0
? new LegacyCell(LegacyCell.Kind.REGULAR, name, value, ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
: new LegacyCell(LegacyCell.Kind.DELETED, name, ByteBufferUtil.EMPTY_BYTE_BUFFER, ts, ByteBufferUtil.toInt(value), Cell.NO_TTL));
@@ -1489,11 +1496,11 @@ public abstract class LegacyLayout
return new LegacyCell(Kind.DELETED, decodeCellName(metadata, superColumnName, name), ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp, nowInSec, LivenessInfo.NO_TTL);
}
- public static LegacyCell counter(CFMetaData metadata, ByteBuffer superColumnName, ByteBuffer name, long value)
+ public static LegacyCell counterUpdate(CFMetaData metadata, ByteBuffer superColumnName, ByteBuffer name, long value)
throws UnknownColumnException
{
// See UpdateParameters.addCounter() for more details on this
- ByteBuffer counterValue = CounterContext.instance().createLocal(value);
+ ByteBuffer counterValue = CounterContext.instance().createUpdate(value);
return counter(decodeCellName(metadata, superColumnName, name), counterValue);
}
@@ -1515,10 +1522,10 @@ public abstract class LegacyLayout
return 0;
}
- private boolean isCounterUpdate()
+ public boolean isCounterUpdate()
{
// See UpdateParameters.addCounter() for more details on this
- return isCounter() && CounterContext.instance().isLocal(value);
+ return isCounter() && CounterContext.instance().isUpdate(value);
}
public ClusteringPrefix clustering()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/db/context/CounterContext.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java
index e3f4dfd..29e5cfc 100644
--- a/src/java/org/apache/cassandra/db/context/CounterContext.java
+++ b/src/java/org/apache/cassandra/db/context/CounterContext.java
@@ -81,6 +81,14 @@ public class CounterContext
private static final int COUNT_LENGTH = TypeSizes.sizeof(Long.MAX_VALUE);
private static final int STEP_LENGTH = CounterId.LENGTH + CLOCK_LENGTH + COUNT_LENGTH;
+ /*
+ * A special hard-coded value we use for clock ids to differentiate between regular local shards
+ * and 'fake' local shards used to emulate pre-3.0 CounterUpdateCell-s in UpdateParameters.
+ *
+ * Important for handling counter writes and reads during rolling 2.1/2.2 -> 3.0 upgrades.
+ */
+ static final CounterId UPDATE_CLOCK_ID = CounterId.fromInt(0);
+
private static final Logger logger = LoggerFactory.getLogger(CounterContext.class);
public static enum Relationship
@@ -100,6 +108,35 @@ public class CounterContext
}
/**
+ * Creates a counter context with a single local shard with clock id of UPDATE_CLOCK_ID.
+ *
+ * This is only used in a PartitionUpdate until the update has gone through
+ * CounterMutation.apply(), at which point this special local shard will be replaced by a regular global one.
+ * It should never hit commitlog / memtable / disk, but can hit network.
+ *
+ * We use this so that if an update statement has multiple increments of the same counter we properly
+ * add them rather than keeping only one of them.
+ *
+ * NOTE: Before CASSANDRA-13691 we used a regular local shard without a hard-coded clock id value here.
+ * It was problematic, because it was possible to return a false positive, and on read path encode an old counter
+ * cell from 2.0 era with a regular local shard as a counter update, and to break the 2.1 coordinator.
+ */
+ public ByteBuffer createUpdate(long count)
+ {
+ ContextState state = ContextState.allocate(0, 1, 0);
+ state.writeLocal(UPDATE_CLOCK_ID, 1L, count);
+ return state.context;
+ }
+
+ /**
+ * Checks if a context is an update (see createUpdate() for justification).
+ */
+ public boolean isUpdate(ByteBuffer context)
+ {
+ return ContextState.wrap(context).getCounterId().equals(UPDATE_CLOCK_ID);
+ }
+
+ /**
* Creates a counter context with a single global, 2.1+ shard (a result of increment).
*/
public ByteBuffer createGlobal(CounterId id, long clock, long count)
@@ -111,12 +148,7 @@ public class CounterContext
/**
* Creates a counter context with a single local shard.
- * This is only used in a PartitionUpdate until the update has gone through
- * CounterMutation.apply(), at which point all the local shard are replaced by
- * global ones. In other words, local shards should never hit the disk or
- * memtables. And we use this so that if an update statement has multiple increment
- * of the same counter we properly add them rather than keeping only one of them.
- * (this is also used for tests of compatibility with pre-2.1 counters)
+ * For use by tests of compatibility with pre-2.1 counters only.
*/
public ByteBuffer createLocal(long count)
{
@@ -682,14 +714,6 @@ public class CounterContext
}
/**
- * Checks if a context is local
- */
- public boolean isLocal(ByteBuffer context)
- {
- return ContextState.wrap(context).isLocal();
- }
-
- /**
* Returns the clock and the count associated with the given counter id, or (0, 0) if no such shard is present.
*/
@VisibleForTesting
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 0dec94e..86caac3 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1016,7 +1016,7 @@ public class CassandraServer implements Cassandra.Iface
private LegacyLayout.LegacyCell toCounterLegacyCell(CFMetaData metadata, ByteBuffer superColumnName, CounterColumn column)
throws UnknownColumnException
{
- return LegacyLayout.LegacyCell.counter(metadata, superColumnName, column.name, column.value);
+ return LegacyLayout.LegacyCell.counterUpdate(metadata, superColumnName, column.name, column.value);
}
private void sortAndMerge(CFMetaData metadata, List<LegacyLayout.LegacyCell> cells, int nowInSec)
@@ -2169,7 +2169,7 @@ public class CassandraServer implements Cassandra.Iface
LegacyLayout.LegacyCellName name = LegacyLayout.decodeCellName(metadata, column_parent.super_column, column.name);
// See UpdateParameters.addCounter() for more details on this
- ByteBuffer value = CounterContext.instance().createLocal(column.value);
+ ByteBuffer value = CounterContext.instance().createUpdate(column.value);
CellPath path = name.collectionElement == null ? null : CellPath.create(name.collectionElement);
Cell cell = BufferCell.live(metadata, name.column, FBUtilities.timestampMicros(), value, path);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/utils/CounterId.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CounterId.java b/src/java/org/apache/cassandra/utils/CounterId.java
index 2552178..690d4aa 100644
--- a/src/java/org/apache/cassandra/utils/CounterId.java
+++ b/src/java/org/apache/cassandra/utils/CounterId.java
@@ -46,10 +46,11 @@ public class CounterId implements Comparable<CounterId>
}
/**
- * Function for test purposes, do not use otherwise.
* Pack an int in a valid CounterId so that the resulting ids respects the
* numerical ordering. Used for creating handcrafted but easy to
* understand contexts in unit tests (see CounterContextTest).
+ *
+ * Also used to generate a special ID for special-case update contexts (see CounterContext.createUpdate()).
*/
public static CounterId fromInt(int n)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
index 4f587c6..a8852f7 100644
--- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
+++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
@@ -28,17 +28,19 @@ import org.junit.Test;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ClockAndCount;
+import org.apache.cassandra.db.LegacyLayout.LegacyCell;
import org.apache.cassandra.db.context.CounterContext.Relationship;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CounterId;
-import static org.apache.cassandra.db.context.CounterContext.ContextState;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.apache.cassandra.db.context.CounterContext.ContextState;
+
public class CounterContextTest
{
private static final CounterContext cc = new CounterContext();
@@ -542,4 +544,34 @@ public class CounterContextTest
assertEquals(ClockAndCount.create(0L, 0L), cc.getClockAndCountOf(state.context, CounterId.fromInt(15)));
assertEquals(ClockAndCount.create(0L, 0L), cc.getClockAndCountOf(state.context, CounterId.fromInt(20)));
}
+
+ @Test // see CASSANDRA-13691
+ public void testCounterUpdate()
+ {
+ /*
+ * a context with just one 'update' shard - a local shard with a hardcoded value of CounterContext.UPDATE_CLOCK_ID
+ */
+
+ ByteBuffer updateContext = CounterContext.instance().createUpdate(10L);
+
+ assertEquals(ClockAndCount.create(1L, 10L), cc.getClockAndCountOf(updateContext, CounterContext.UPDATE_CLOCK_ID));
+ assertTrue(cc.isUpdate(updateContext));
+ LegacyCell updateCell = LegacyCell.counter(null, updateContext);
+ assertTrue(updateCell.isCounterUpdate());
+
+
+ /*
+ * a context with a regular local shard sorting first and a couple others in it - should *not* be identified as an update
+ */
+
+ ContextState notUpdateContextState = ContextState.allocate(1, 1, 1);
+ notUpdateContextState.writeLocal( CounterId.fromInt(1), 1L, 10L);
+ notUpdateContextState.writeRemote(CounterId.fromInt(2), 1L, 10L);
+ notUpdateContextState.writeGlobal(CounterId.fromInt(3), 1L, 10L);
+ ByteBuffer notUpdateContext = notUpdateContextState.context;
+
+ assertFalse(cc.isUpdate(notUpdateContext));
+ LegacyCell notUpdateCell = LegacyCell.counter(null, notUpdateContext);
+ assertFalse(notUpdateCell.isCounterUpdate());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92d1cfec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92d1cfec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92d1cfec
Branch: refs/heads/trunk
Commit: 92d1cfec24f873d3ecea6c2591b8686284b915f8
Parents: 99196cb ba71289
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Tue Aug 1 15:34:00 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Tue Aug 1 15:34:00 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/cql3/UpdateParameters.java | 7 ++-
.../org/apache/cassandra/db/LegacyLayout.java | 23 ++++++---
.../cassandra/db/context/CounterContext.java | 52 ++++++++++++++------
.../cassandra/thrift/CassandraServer.java | 4 +-
.../org/apache/cassandra/utils/CounterId.java | 3 +-
.../db/context/CounterContextTest.java | 34 ++++++++++++-
7 files changed, 97 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9c595fc,4038ac7..3f8a316
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.15
+3.11.1
+ * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
+ * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
+ * 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:
+ * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
* Fix invalid writetime for null cells (CASSANDRA-13711)
* Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
* Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
@@@ -22,46 -20,8 +23,47 @@@ Merged from 2.2
Merged from 2.1:
* Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700)
+
-3.0.14
+3.11.0
+ * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
+ * Replace string comparison with regex/number checks in MessagingService test (CASSANDRA-13216)
+ * Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
+ * Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302)
+ * Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
+ * Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229)
+ * Fix duration type validation to prevent overflow (CASSANDRA-13218)
+ * Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228)
+ * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
+ * UDA fails without input rows (CASSANDRA-13399)
+ * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
+ * V5 protocol flags decoding broken (CASSANDRA-13443)
+ * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422)
+ * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329)
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+ * Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835)
+Merged from 3.0:
* Ensure int overflow doesn't occur when calculating large partition warning size (CASSANDRA-13172)
* Ensure consistent view of partition columns between coordinator and replica in ColumnFilter (CASSANDRA-13004)
* Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 88ffedd,8ff5344..25f04fb
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@@ -167,7 -167,10 +167,10 @@@ public class UpdateParameter
// shard is due to the merging rules: if a user includes multiple updates to the same counter in a batch, those
// multiple updates will be merged in the PartitionUpdate *before* they even reach CounterMutation. So we need
// such update to be added together, and that's what a local shard gives us.
- builder.addCell(BufferCell.live(column, timestamp, CounterContext.instance().createLocal(increment)));
+ //
+ // We set counterid to a special value to differentiate between regular pre-2.0 local shards from pre-2.1 era
+ // and "counter update" temporary state cells. Please see CounterContext.createUpdate() for further details.
- builder.addCell(BufferCell.live(metadata, column, timestamp, CounterContext.instance().createUpdate(increment)));
++ builder.addCell(BufferCell.live(column, timestamp, CounterContext.instance().createUpdate(increment)));
}
public void setComplexDeletionTime(ColumnDefinition column)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/src/java/org/apache/cassandra/db/LegacyLayout.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index 04a3e66,86caac3..e71f512
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -2195,9 -2169,9 +2195,9 @@@ public class CassandraServer implement
LegacyLayout.LegacyCellName name = LegacyLayout.decodeCellName(metadata, column_parent.super_column, column.name);
// See UpdateParameters.addCounter() for more details on this
- ByteBuffer value = CounterContext.instance().createLocal(column.value);
+ ByteBuffer value = CounterContext.instance().createUpdate(column.value);
CellPath path = name.collectionElement == null ? null : CellPath.create(name.collectionElement);
- Cell cell = BufferCell.live(metadata, name.column, FBUtilities.timestampMicros(), value, path);
+ Cell cell = BufferCell.live(name.column, FBUtilities.timestampMicros(), value, path);
PartitionUpdate update = PartitionUpdate.singleRowUpdate(metadata, key, BTreeRow.singleCellRow(name.clustering, cell));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Fix incorrect [2.1 <- 3.0] serialization
of counter cells created in 2.0
Posted by al...@apache.org.
Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0
Also fixes calculation of legacy counter update cells' serialized size.
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-13691
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba712897
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba712897
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba712897
Branch: refs/heads/trunk
Commit: ba71289778369e71d9abbdb93cb6b91ba67f9c85
Parents: 9dc896f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jul 13 14:47:18 2017 -0700
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Tue Aug 1 15:24:55 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 +-
.../apache/cassandra/cql3/UpdateParameters.java | 7 ++-
.../org/apache/cassandra/db/LegacyLayout.java | 23 ++++++---
.../cassandra/db/context/CounterContext.java | 52 ++++++++++++++------
.../cassandra/thrift/CassandraServer.java | 4 +-
.../org/apache/cassandra/utils/CounterId.java | 3 +-
.../db/context/CounterContextTest.java | 34 ++++++++++++-
7 files changed, 98 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e3f5fe6..4038ac7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
* Fix invalid writetime for null cells (CASSANDRA-13711)
* Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
* Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
@@ -19,6 +20,7 @@
Merged from 2.1:
* Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700)
+
3.0.14
* Ensure int overflow doesn't occur when calculating large partition warning size (CASSANDRA-13172)
* Ensure consistent view of partition columns between coordinator and replica in ColumnFilter (CASSANDRA-13004)
@@ -45,6 +47,7 @@ Merged from 2.2:
* Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
+
3.0.13
* Make reading of range tombstones more reliable (CASSANDRA-12811)
* Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
@@ -170,7 +173,6 @@ Merged from 2.1:
* cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)
-
3.0.10
* Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
* Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index d902dec..8ff5344 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -162,12 +162,15 @@ public class UpdateParameters
// "counter update", which is a temporary state until we run into 'CounterMutation.updateWithCurrentValue()'
// which does the read-before-write and sets the proper CounterId, clock and updated value.
//
- // We thus create a "fake" local shard here. The CounterId/clock used don't matter as this is just a temporary
+ // We thus create a "fake" local shard here. The clock used doesn't matter as this is just a temporary
// state that will be replaced when processing the mutation in CounterMutation, but the reason we use a 'local'
// shard is due to the merging rules: if a user includes multiple updates to the same counter in a batch, those
// multiple updates will be merged in the PartitionUpdate *before* they even reach CounterMutation. So we need
// such update to be added together, and that's what a local shard gives us.
- builder.addCell(BufferCell.live(metadata, column, timestamp, CounterContext.instance().createLocal(increment)));
+ //
+ // We set counterid to a special value to differentiate between regular pre-2.0 local shards from pre-2.1 era
+ // and "counter update" temporary state cells. Please see CounterContext.createUpdate() for further details.
+ builder.addCell(BufferCell.live(metadata, column, timestamp, CounterContext.instance().createUpdate(increment)));
}
public void setComplexDeletionTime(ColumnDefinition column)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/db/LegacyLayout.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/LegacyLayout.java b/src/java/org/apache/cassandra/db/LegacyLayout.java
index 669fb1c..4f7bc22 100644
--- a/src/java/org/apache/cassandra/db/LegacyLayout.java
+++ b/src/java/org/apache/cassandra/db/LegacyLayout.java
@@ -511,12 +511,12 @@ public abstract class LegacyLayout
{
size += ByteBufferUtil.serializedSizeWithShortLength(cell.name.encode(partition.metadata()));
size += 1; // serialization flags
- if (cell.kind == LegacyLayout.LegacyCell.Kind.EXPIRING)
+ if (cell.isExpiring())
{
size += TypeSizes.sizeof(cell.ttl);
size += TypeSizes.sizeof(cell.localDeletionTime);
}
- else if (cell.kind == LegacyLayout.LegacyCell.Kind.DELETED)
+ else if (cell.isTombstone())
{
size += TypeSizes.sizeof(cell.timestamp);
// localDeletionTime replaces cell.value as the body
@@ -524,7 +524,14 @@ public abstract class LegacyLayout
size += TypeSizes.sizeof(cell.localDeletionTime);
continue;
}
- else if (cell.kind == LegacyLayout.LegacyCell.Kind.COUNTER)
+ else if (cell.isCounterUpdate())
+ {
+ size += TypeSizes.sizeof(cell.timestamp);
+ long count = CounterContext.instance().getLocalCount(cell.value);
+ size += ByteBufferUtil.serializedSizeWithLength(ByteBufferUtil.bytes(count));
+ continue;
+ }
+ else if (cell.isCounter())
{
size += TypeSizes.sizeof(Long.MIN_VALUE); // timestampOfLastDelete
}
@@ -1073,7 +1080,7 @@ public abstract class LegacyLayout
ByteBuffer value = ByteBufferUtil.readWithLength(in);
LegacyCellName name = decodeCellName(metadata, cellname, readAllAsDynamic);
return (mask & COUNTER_UPDATE_MASK) != 0
- ? new LegacyCell(LegacyCell.Kind.COUNTER, name, CounterContext.instance().createLocal(ByteBufferUtil.toLong(value)), ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
+ ? new LegacyCell(LegacyCell.Kind.COUNTER, name, CounterContext.instance().createUpdate(ByteBufferUtil.toLong(value)), ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
: ((mask & DELETION_MASK) == 0
? new LegacyCell(LegacyCell.Kind.REGULAR, name, value, ts, Cell.NO_DELETION_TIME, Cell.NO_TTL)
: new LegacyCell(LegacyCell.Kind.DELETED, name, ByteBufferUtil.EMPTY_BYTE_BUFFER, ts, ByteBufferUtil.toInt(value), Cell.NO_TTL));
@@ -1489,11 +1496,11 @@ public abstract class LegacyLayout
return new LegacyCell(Kind.DELETED, decodeCellName(metadata, superColumnName, name), ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp, nowInSec, LivenessInfo.NO_TTL);
}
- public static LegacyCell counter(CFMetaData metadata, ByteBuffer superColumnName, ByteBuffer name, long value)
+ public static LegacyCell counterUpdate(CFMetaData metadata, ByteBuffer superColumnName, ByteBuffer name, long value)
throws UnknownColumnException
{
// See UpdateParameters.addCounter() for more details on this
- ByteBuffer counterValue = CounterContext.instance().createLocal(value);
+ ByteBuffer counterValue = CounterContext.instance().createUpdate(value);
return counter(decodeCellName(metadata, superColumnName, name), counterValue);
}
@@ -1515,10 +1522,10 @@ public abstract class LegacyLayout
return 0;
}
- private boolean isCounterUpdate()
+ public boolean isCounterUpdate()
{
// See UpdateParameters.addCounter() for more details on this
- return isCounter() && CounterContext.instance().isLocal(value);
+ return isCounter() && CounterContext.instance().isUpdate(value);
}
public ClusteringPrefix clustering()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/db/context/CounterContext.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java
index e3f4dfd..29e5cfc 100644
--- a/src/java/org/apache/cassandra/db/context/CounterContext.java
+++ b/src/java/org/apache/cassandra/db/context/CounterContext.java
@@ -81,6 +81,14 @@ public class CounterContext
private static final int COUNT_LENGTH = TypeSizes.sizeof(Long.MAX_VALUE);
private static final int STEP_LENGTH = CounterId.LENGTH + CLOCK_LENGTH + COUNT_LENGTH;
+ /*
+ * A special hard-coded value we use for clock ids to differentiate between regular local shards
+ * and 'fake' local shards used to emulate pre-3.0 CounterUpdateCell-s in UpdateParameters.
+ *
+ * Important for handling counter writes and reads during rolling 2.1/2.2 -> 3.0 upgrades.
+ */
+ static final CounterId UPDATE_CLOCK_ID = CounterId.fromInt(0);
+
private static final Logger logger = LoggerFactory.getLogger(CounterContext.class);
public static enum Relationship
@@ -100,6 +108,35 @@ public class CounterContext
}
/**
+ * Creates a counter context with a single local shard with clock id of UPDATE_CLOCK_ID.
+ *
+ * This is only used in a PartitionUpdate until the update has gone through
+ * CounterMutation.apply(), at which point this special local shard will be replaced by a regular global one.
+ * It should never hit commitlog / memtable / disk, but can hit network.
+ *
+ * We use this so that if an update statement has multiple increments of the same counter we properly
+ * add them rather than keeping only one of them.
+ *
+ * NOTE: Before CASSANDRA-13691 we used a regular local shard without a hard-coded clock id value here.
+ * It was problematic, because it was possible to return a false positive, and on read path encode an old counter
+ * cell from 2.0 era with a regular local shard as a counter update, and to break the 2.1 coordinator.
+ */
+ public ByteBuffer createUpdate(long count)
+ {
+ ContextState state = ContextState.allocate(0, 1, 0);
+ state.writeLocal(UPDATE_CLOCK_ID, 1L, count);
+ return state.context;
+ }
+
+ /**
+ * Checks if a context is an update (see createUpdate() for justification).
+ */
+ public boolean isUpdate(ByteBuffer context)
+ {
+ return ContextState.wrap(context).getCounterId().equals(UPDATE_CLOCK_ID);
+ }
+
+ /**
* Creates a counter context with a single global, 2.1+ shard (a result of increment).
*/
public ByteBuffer createGlobal(CounterId id, long clock, long count)
@@ -111,12 +148,7 @@ public class CounterContext
/**
* Creates a counter context with a single local shard.
- * This is only used in a PartitionUpdate until the update has gone through
- * CounterMutation.apply(), at which point all the local shard are replaced by
- * global ones. In other words, local shards should never hit the disk or
- * memtables. And we use this so that if an update statement has multiple increment
- * of the same counter we properly add them rather than keeping only one of them.
- * (this is also used for tests of compatibility with pre-2.1 counters)
+ * For use by tests of compatibility with pre-2.1 counters only.
*/
public ByteBuffer createLocal(long count)
{
@@ -682,14 +714,6 @@ public class CounterContext
}
/**
- * Checks if a context is local
- */
- public boolean isLocal(ByteBuffer context)
- {
- return ContextState.wrap(context).isLocal();
- }
-
- /**
* Returns the clock and the count associated with the given counter id, or (0, 0) if no such shard is present.
*/
@VisibleForTesting
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 0dec94e..86caac3 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1016,7 +1016,7 @@ public class CassandraServer implements Cassandra.Iface
private LegacyLayout.LegacyCell toCounterLegacyCell(CFMetaData metadata, ByteBuffer superColumnName, CounterColumn column)
throws UnknownColumnException
{
- return LegacyLayout.LegacyCell.counter(metadata, superColumnName, column.name, column.value);
+ return LegacyLayout.LegacyCell.counterUpdate(metadata, superColumnName, column.name, column.value);
}
private void sortAndMerge(CFMetaData metadata, List<LegacyLayout.LegacyCell> cells, int nowInSec)
@@ -2169,7 +2169,7 @@ public class CassandraServer implements Cassandra.Iface
LegacyLayout.LegacyCellName name = LegacyLayout.decodeCellName(metadata, column_parent.super_column, column.name);
// See UpdateParameters.addCounter() for more details on this
- ByteBuffer value = CounterContext.instance().createLocal(column.value);
+ ByteBuffer value = CounterContext.instance().createUpdate(column.value);
CellPath path = name.collectionElement == null ? null : CellPath.create(name.collectionElement);
Cell cell = BufferCell.live(metadata, name.column, FBUtilities.timestampMicros(), value, path);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/src/java/org/apache/cassandra/utils/CounterId.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CounterId.java b/src/java/org/apache/cassandra/utils/CounterId.java
index 2552178..690d4aa 100644
--- a/src/java/org/apache/cassandra/utils/CounterId.java
+++ b/src/java/org/apache/cassandra/utils/CounterId.java
@@ -46,10 +46,11 @@ public class CounterId implements Comparable<CounterId>
}
/**
- * Function for test purposes, do not use otherwise.
* Pack an int in a valid CounterId so that the resulting ids respects the
* numerical ordering. Used for creating handcrafted but easy to
* understand contexts in unit tests (see CounterContextTest).
+ *
+ * Also used to generate a special ID for special-case update contexts (see CounterContext.createUpdate()).
*/
public static CounterId fromInt(int n)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba712897/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
index 4f587c6..a8852f7 100644
--- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
+++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
@@ -28,17 +28,19 @@ import org.junit.Test;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ClockAndCount;
+import org.apache.cassandra.db.LegacyLayout.LegacyCell;
import org.apache.cassandra.db.context.CounterContext.Relationship;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CounterId;
-import static org.apache.cassandra.db.context.CounterContext.ContextState;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.apache.cassandra.db.context.CounterContext.ContextState;
+
public class CounterContextTest
{
private static final CounterContext cc = new CounterContext();
@@ -542,4 +544,34 @@ public class CounterContextTest
assertEquals(ClockAndCount.create(0L, 0L), cc.getClockAndCountOf(state.context, CounterId.fromInt(15)));
assertEquals(ClockAndCount.create(0L, 0L), cc.getClockAndCountOf(state.context, CounterId.fromInt(20)));
}
+
+ @Test // see CASSANDRA-13691
+ public void testCounterUpdate()
+ {
+ /*
+ * a context with just one 'update' shard - a local shard with a hardcoded value of CounterContext.UPDATE_CLOCK_ID
+ */
+
+ ByteBuffer updateContext = CounterContext.instance().createUpdate(10L);
+
+ assertEquals(ClockAndCount.create(1L, 10L), cc.getClockAndCountOf(updateContext, CounterContext.UPDATE_CLOCK_ID));
+ assertTrue(cc.isUpdate(updateContext));
+ LegacyCell updateCell = LegacyCell.counter(null, updateContext);
+ assertTrue(updateCell.isCounterUpdate());
+
+
+ /*
+ * a context with a regular local shard sorting first and a couple others in it - should *not* be identified as an update
+ */
+
+ ContextState notUpdateContextState = ContextState.allocate(1, 1, 1);
+ notUpdateContextState.writeLocal( CounterId.fromInt(1), 1L, 10L);
+ notUpdateContextState.writeRemote(CounterId.fromInt(2), 1L, 10L);
+ notUpdateContextState.writeGlobal(CounterId.fromInt(3), 1L, 10L);
+ ByteBuffer notUpdateContext = notUpdateContextState.context;
+
+ assertFalse(cc.isUpdate(notUpdateContext));
+ LegacyCell notUpdateCell = LegacyCell.counter(null, notUpdateContext);
+ assertFalse(notUpdateCell.isCounterUpdate());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92d1cfec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92d1cfec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92d1cfec
Branch: refs/heads/cassandra-3.11
Commit: 92d1cfec24f873d3ecea6c2591b8686284b915f8
Parents: 99196cb ba71289
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Tue Aug 1 15:34:00 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Tue Aug 1 15:34:00 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/cql3/UpdateParameters.java | 7 ++-
.../org/apache/cassandra/db/LegacyLayout.java | 23 ++++++---
.../cassandra/db/context/CounterContext.java | 52 ++++++++++++++------
.../cassandra/thrift/CassandraServer.java | 4 +-
.../org/apache/cassandra/utils/CounterId.java | 3 +-
.../db/context/CounterContextTest.java | 34 ++++++++++++-
7 files changed, 97 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9c595fc,4038ac7..3f8a316
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.15
+3.11.1
+ * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
+ * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
+ * 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:
+ * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691)
* Fix invalid writetime for null cells (CASSANDRA-13711)
* Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952)
* Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722)
@@@ -22,46 -20,8 +23,47 @@@ Merged from 2.2
Merged from 2.1:
* Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700)
+
-3.0.14
+3.11.0
+ * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
+ * Replace string comparison with regex/number checks in MessagingService test (CASSANDRA-13216)
+ * Fix formatting of duration columns in CQLSH (CASSANDRA-13549)
+ * Fix the problem with duplicated rows when using paging with SASI (CASSANDRA-13302)
+ * Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
+ * Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229)
+ * Fix duration type validation to prevent overflow (CASSANDRA-13218)
+ * Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228)
+ * Reject multiple values for a key in CQL grammar. (CASSANDRA-13369)
+ * UDA fails without input rows (CASSANDRA-13399)
+ * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
+ * V5 protocol flags decoding broken (CASSANDRA-13443)
+ * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422)
+ * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329)
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+ * Address message coalescing regression (CASSANDRA-12676)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835)
+Merged from 3.0:
* Ensure int overflow doesn't occur when calculating large partition warning size (CASSANDRA-13172)
* Ensure consistent view of partition columns between coordinator and replica in ColumnFilter (CASSANDRA-13004)
* Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/src/java/org/apache/cassandra/cql3/UpdateParameters.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 88ffedd,8ff5344..25f04fb
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@@ -167,7 -167,10 +167,10 @@@ public class UpdateParameter
// shard is due to the merging rules: if a user includes multiple updates to the same counter in a batch, those
// multiple updates will be merged in the PartitionUpdate *before* they even reach CounterMutation. So we need
// such update to be added together, and that's what a local shard gives us.
- builder.addCell(BufferCell.live(column, timestamp, CounterContext.instance().createLocal(increment)));
+ //
+ // We set counterid to a special value to differentiate between regular pre-2.0 local shards from pre-2.1 era
+ // and "counter update" temporary state cells. Please see CounterContext.createUpdate() for further details.
- builder.addCell(BufferCell.live(metadata, column, timestamp, CounterContext.instance().createUpdate(increment)));
++ builder.addCell(BufferCell.live(column, timestamp, CounterContext.instance().createUpdate(increment)));
}
public void setComplexDeletionTime(ColumnDefinition column)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/src/java/org/apache/cassandra/db/LegacyLayout.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index 04a3e66,86caac3..e71f512
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -2195,9 -2169,9 +2195,9 @@@ public class CassandraServer implement
LegacyLayout.LegacyCellName name = LegacyLayout.decodeCellName(metadata, column_parent.super_column, column.name);
// See UpdateParameters.addCounter() for more details on this
- ByteBuffer value = CounterContext.instance().createLocal(column.value);
+ ByteBuffer value = CounterContext.instance().createUpdate(column.value);
CellPath path = name.collectionElement == null ? null : CellPath.create(name.collectionElement);
- Cell cell = BufferCell.live(metadata, name.column, FBUtilities.timestampMicros(), value, path);
+ Cell cell = BufferCell.live(name.column, FBUtilities.timestampMicros(), value, path);
PartitionUpdate update = PartitionUpdate.singleRowUpdate(metadata, key, BTreeRow.singleCellRow(name.clustering, cell));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d1cfec/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org