Merge branch 'cassandra-5.0' into trunk

Author: krummas

CHANGES.txt

@@ -354,6 +354,7 @@ Merged from 4.1:
  * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
  * Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
 Merged from 4.0:
+ * ArrayIndexOutOfBoundsException with repaired data tracking and counters (CASSANDRA-20871)
  * Fix cleanup of old incremental repair sessions in case of owned token range changes or a table deleting (CASSANDRA-20877)
  * Fix memory leak in BufferPoolAllocator when a capacity needs to be extended (CASSANDRA-20753)
  * Leveled Compaction doesn't validate maxBytesForLevel when the table is altered/created (CASSANDRA-20570)

src/java/org/apache/cassandra/db/Digest.java

@@ -69,6 +69,11 @@ public <V> Digest updateWithCounterContext(V context, ValueAccessor<V> accessor)
                 // for the purposes of repaired data tracking on the read path, exclude
                 // contexts with legacy shards as these may be irrevocably different on
                 // different replicas
+
+                // see super.updateWithCounterContext + CountersTest.testEmptyContext - counter context can be empty
+                if (accessor.isEmpty(context))
+                    return this;
+
                 if (CounterContext.instance().hasLegacyShards(context, accessor))
                     return this;
 

test/distributed/org/apache/cassandra/distributed/test/CountersTest.java

@@ -18,11 +18,17 @@
 
 package org.apache.cassandra.distributed.test;
 
+import java.io.IOException;
+import java.util.Iterator;
+
 import org.junit.Test;
 
+import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.distributed.api.ConsistencyLevel;
 import org.apache.cassandra.distributed.api.ICoordinator;
+import org.apache.cassandra.io.sstable.Descriptor;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
 
 import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
 import static org.apache.cassandra.distributed.api.Feature.NATIVE_PROTOCOL;
@@ -75,4 +81,47 @@ private static void testUpdateCounter(boolean droppedCompactStorage) throws Thro
             }
         }
     }
+
+    @Test
+    public void testEmptyContext() throws IOException
+    {
+        try (Cluster cluster = init(Cluster.build(3)
+                                           .withConfig(c -> c.with(GOSSIP, NATIVE_PROTOCOL)
+                                                             .set("repaired_data_tracking_for_partition_reads_enabled", true)
+                                                             .set("repaired_data_tracking_for_range_reads_enabled", true))
+                                           .start()))
+        {
+            cluster.schemaChange(withKeyspace("CREATE TABLE %s.t (a ascii, b ascii, c counter, d counter, PRIMARY KEY(a, b))"));
+            cluster.get(1).executeInternal(withKeyspace("UPDATE %s.t SET c = c + 1, d = d + 1 WHERE a = 'a1' AND b = 'b1'"));
+            cluster.get(2).executeInternal(withKeyspace("UPDATE %s.t SET c = c + 2, d = d + 2 WHERE a = 'a1' AND b = 'b1'"));
+            cluster.get(3).executeInternal(withKeyspace("UPDATE %s.t SET c = c + 3, d = d + 3 WHERE a = 'a1' AND b = 'b1'"));
+
+            cluster.forEach(i -> i.flush(KEYSPACE));
+
+            cluster.forEach(i -> i.runOnInstance(() -> {
+                Iterator<SSTableReader> sstables = Keyspace.open(KEYSPACE)
+                                                           .getColumnFamilyStore("t")
+                                                           .getLiveSSTables()
+                                                           .iterator();
+                while (sstables.hasNext())
+                {
+                    SSTableReader sstable = sstables.next();
+                    Descriptor descriptor = sstable.descriptor;
+                    try
+                    {
+                        descriptor.getMetadataSerializer()
+                                  .mutateRepairMetadata(descriptor, System.currentTimeMillis(), null, false);
+                        sstable.reloadSSTableMetadata();
+                    }
+                    catch (IOException e)
+                    {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }));
+            cluster.coordinator(1).execute(withKeyspace("select a,d from %s.t where a = 'a1'"), ConsistencyLevel.ALL);
+            cluster.coordinator(2).execute(withKeyspace("select a,d from %s.t where a = 'a1'"), ConsistencyLevel.QUORUM);
+            cluster.coordinator(3).execute(withKeyspace("select a,d from %s.t where a = 'a1'"), ConsistencyLevel.QUORUM);
+        }
+    }
 }