This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 094180ba070dd30d2c89a98289c05796d0d03a91
Merge: 9635e55 c2f201f
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Fri Jan 10 11:41:50 2020 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
.../cassandra/db/partitions/PartitionUpdate.java | 9 +++++++++
.../db/partition/PartitionUpdateTest.java | 23 ++++++++++++++++++++++
3 files changed, 33 insertions(+)
diff --cc CHANGES.txt
index d8563c7,620eb35..408048b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.20
+3.11.6
+ * Fix nodetool compactionstats showing extra pending task for TWCS - patch
implemented (CASSANDRA-15409)
+ * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075)
+ * Fix LegacyLayout to have same behavior as 2.x when handling unknown column
names (CASSANDRA-15081)
+ * Update nodetool help stop output (CASSANDRA-15401)
+Merged from 3.0:
+ * Include updates to static column in mutation size calculations
(CASSANDRA-15293)
* Fix point-in-time recoevery ignoring timestamp of updates to static
columns (CASSANDRA-15292)
* GC logs are also put under $CASSANDRA_LOG_DIR (CASSANDRA-14306)
* Fix sstabledump's position key value when partitions have multiple rows
(CASSANDRA-14721)
diff --cc test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java
index bfa9796,7dff91f..0330b65
--- a/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java
+++ b/test/unit/org/apache/cassandra/db/partition/PartitionUpdateTest.java
@@@ -49,6 -52,27 +49,29 @@@ public class PartitionUpdateTest extend
}
@Test
+ public void testMutationSize()
+ {
+ createTable("CREATE TABLE %s (key text, clustering int, a int, s int
static, PRIMARY KEY(key, clustering))");
+ CFMetaData cfm = currentTableMetadata();
+
- PartitionUpdate update = new RowUpdateBuilder(cfm,
FBUtilities.timestampMicros(), "key0").add("s", 1).buildUpdate();
- int size1 = update.dataSize();
- Assert.assertEquals(20, size1);
++ UpdateBuilder builder = UpdateBuilder.create(cfm, "key0");
++ builder.newRow().add("s", 1);
++ builder.newRow(1).add("a", 2);
++ int size1 = builder.build().dataSize();
++ Assert.assertEquals(44, size1);
+
- update = new RowUpdateBuilder(cfm, FBUtilities.timestampMicros(),
"key0").clustering(1).add("a", 2).buildUpdate();
- int size2 = update.dataSize();
++ builder = UpdateBuilder.create(cfm, "key0");
++ builder.newRow(1).add("a", 2);
++ int size2 = builder.build().dataSize();
+ Assert.assertTrue(size1 != size2);
+
- update = new RowUpdateBuilder(cfm, FBUtilities.timestampMicros(),
"key0").buildUpdate();
- int size3 = update.dataSize();
- Assert.assertTrue(size1 != size3);
++ builder = UpdateBuilder.create(cfm, "key0");
++ int size3 = builder.build().dataSize();
+ Assert.assertTrue(size2 != size3);
+
+ }
+
+ @Test
public void testOperationCountWithCompactTable()
{
createTable("CREATE TABLE %s (key text PRIMARY KEY, a int) WITH
COMPACT STORAGE");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
