Merge branch 'cassandra-4.0' into cassandra-4.1

Author: smiklosovic

CHANGES.txt

@@ -5,6 +5,7 @@
  * IntrusiveStack.accumulate is not accumulating correctly (CASSANDRA-20670)
  * Add nodetool get/setguardrailsconfig commands (CASSANDRA-19552)
 Merged from 4.0:
+ * Fix IndexOutOfBoundsException in sstablemetadata tool when a range tombstone is a max clustering value (CASSANDRA-20855)
  * Update Jackson to 2.19.2 (CASSANDRA-20848)
  * Update commons-lang3 to 3.18.0 (CASSANDRA-20849)
  * Add NativeTransportMaxConcurrentConnectionsPerIp to StorageProxyMBean (CASSANDRA-20642)

src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java

@@ -356,21 +356,9 @@ private void printSStableMetadata(String fname, boolean scan) throws IOException
             if (validation != null && header != null)
                 printMinMaxToken(descriptor, FBUtilities.newPartitioner(descriptor), header.getKeyType());
 
-            if (header != null && header.getClusteringTypes().size() == stats.minClusteringValues.size())
-            {
-                List<AbstractType<?>> clusteringTypes = header.getClusteringTypes();
-                List<ByteBuffer> minClusteringValues = stats.minClusteringValues;
-                List<ByteBuffer> maxClusteringValues = stats.maxClusteringValues;
-                String[] minValues = new String[clusteringTypes.size()];
-                String[] maxValues = new String[clusteringTypes.size()];
-                for (int i = 0; i < clusteringTypes.size(); i++)
-                {
-                    minValues[i] = clusteringTypes.get(i).getString(minClusteringValues.get(i));
-                    maxValues[i] = clusteringTypes.get(i).getString(maxClusteringValues.get(i));
-                }
-                field("minClusteringValues", Arrays.toString(minValues));
-                field("maxClusteringValues", Arrays.toString(maxValues));
-            }
+            printClusteringValues(header, "minClusteringValues", stats.minClusteringValues);
+            printClusteringValues(header, "maxClusteringValues", stats.maxClusteringValues);
+
             field("Estimated droppable tombstones",
                   stats.getEstimatedDroppableTombstoneRatio((int) (currentTimeMillis() / 1000) - this.gc));
             field("SSTable Level", stats.sstableLevel);
@@ -437,6 +425,21 @@ private void printSStableMetadata(String fname, boolean scan) throws IOException
         }
     }
 
+    private void printClusteringValues(SerializationHeader.Component header, String name, List<ByteBuffer> clusteringValues)
+    {
+        if (header != null && header.getClusteringTypes().size() >= clusteringValues.size())
+        {
+            List<AbstractType<?>> clusteringTypes = header.getClusteringTypes();
+            int size = Math.min(clusteringTypes.size(), clusteringValues.size());
+            String[] values = new String[size];
+            for (int i = 0; i < size; i++)
+            {
+                values[i] = clusteringTypes.get(i).getString(clusteringValues.get(i));
+            }
+            field(name, Arrays.toString(values));
+        }
+    }
+
     private void field(String field, Object value)
     {
         field(field, value, null);

test/data/sstable_metadata/CASSANDRA_20855/nb-1-big-CompressionInfo.db

@@ -0,0 +1 @@
+3617993137

test/data/sstable_metadata/CASSANDRA_20855/nb-1-big-Data.db

@@ -0,0 +1,8 @@
+Data.db
+TOC.txt
+Digest.crc32
+Summary.db
+Filter.db
+Statistics.db
+CompressionInfo.db
+Index.db